Masy98
3591edd47e
Fixed sorting
2014-10-01 19:26:36 +02:00
Masy98
0d2a041a69
Fixed Red Sandstone and Prismarine drops
2014-10-01 19:13:59 +02:00
Howaner
425df6b694
Fixed 1.8 dirt types
2014-09-30 20:31:27 +02:00
Mattes D
2c5b0f2378
Merge pull request #1415 from Masy98/blocks
...
Added 1.8 Blocks and Items
2014-09-26 22:24:45 +02:00
Masy98
9106a8c29b
Moved curly brace to seperate line
2014-09-26 19:45:03 +02:00
Tycho
a3f940f47c
Removed more unessicary includes
2014-09-26 18:13:19 +01:00
Masy98
2feee3b316
Merge branch 'master' into blocks
...
Conflicts:
src/Items/ItemHandler.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-26 18:32:31 +02:00
Tycho
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Tycho
045d54e0e2
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
Howaner
92e7e5c615
Merge branch 'master' into 1.8-Protocol
2014-09-14 14:16:17 +02:00
Tiger Wang
fdabfd77e2
Improved cBlockHandler::DropBlock
2014-09-13 22:49:27 +01:00
Mattes D
5b63a7fe98
Merge pull request #1353 from mc-server/Effects
...
Added speed entity effect.
2014-09-13 17:05:59 +02:00
Howaner
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
Howaner
96e03fc3ea
Added extra mushroom handler.
2014-09-12 19:34:19 +02:00
Howaner
1223a24d3c
Merge branch 'master' into Effects
2014-09-12 19:13:46 +02:00
Howaner
fcf558173e
Fixed farmland issues.
2014-09-12 19:07:20 +02:00
Howaner
80b0631c43
Only place farmland if no block is upper than dirt/grass.
2014-09-12 18:21:11 +02:00
Howaner
a40eb93c33
Added hoe interact sound.
2014-09-12 18:15:49 +02:00
Masy98
7f42ba9fc1
Fixed 1.8 Item stacking and block harvesting
2014-09-12 16:48:37 +02:00
Howaner
d07ef85ee3
Spawn exp if you break a mob spawner.
2014-09-12 16:41:23 +02:00
Howaner
3f000deb3b
Disabled mobspawner itemdrop.
2014-09-12 15:59:46 +02:00
Howaner
f2c5d8a761
Fixed many right click issues.
2014-09-12 13:19:33 +02:00
Masy98
d4641576c0
Added new doors in ItemDoor.h
2014-09-11 16:33:52 +02:00
Masy98
a01994389d
Fixed mutton name in Sheep.cpp
2014-09-11 16:24:16 +02:00
Masy98
b185e7f4e6
Fixed mutton name in ItemHandler
2014-09-11 16:11:03 +02:00
Masy98
8c3cd18cdd
Added 1.8 food to the food list
2014-09-11 15:57:36 +02:00
archshift
19067b27de
In 1.8, carrots and potatoes yield one less hunger point.
2014-09-03 16:18:58 -07:00
madmaxoft
1cc65b6264
Fixed style and alpha-sorting.
2014-09-03 10:29:10 +02:00
archshift
34d6f0713e
Added mutton, which sheep now drop when killed
2014-09-02 23:21:08 -07:00
Howaner
d3b8100a7b
Merge branch 'master' into Effects
2014-09-02 20:03:42 +02:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
Howaner
0fdb177208
Fixed potion removing in creative mode.
2014-08-30 12:46:26 +02:00
Tiger Wang
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang
114b14faad
Removed unused code
2014-08-29 13:44:01 +01:00
Howaner
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
Jaume Aloy
596203e692
Fixes
...
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
2014-08-19 17:57:32 +02:00
Jaume Aloy
d3fd63c9eb
Added some Enchantments
...
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
2014-08-19 12:38:15 +02:00
archshift
d2d0ffee21
Fixed unsigned long comparison to size_t
2014-08-04 19:43:33 -07:00
Howaner
2e43eaaba7
Changed arrow comment.
2014-08-04 22:30:13 +02:00
Howaner
434ea542e1
Added arrow consuming on shooting
2014-08-04 21:48:33 +02:00
Mattes D
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
Howaner
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
Howaner
bffad50436
Fixed water from ice and removed packed ice drop.
2014-07-31 18:41:48 +02:00
madmaxoft
fd4ee20b2a
Hotfixed compilation problems.
2014-07-27 23:15:51 +02:00
Mattes D
0814a977f8
Merge pull request #1236 from Howaner/Inventory2
...
Fix item durability.
2014-07-27 21:39:39 +02:00
Howaner
c2a2aea9f8
Derp.
2014-07-26 17:09:59 +02:00
Howaner
4de8f5ca29
Rename function.
2014-07-26 13:26:14 +02:00
Howaner
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
archshift
60d4a16514
Fixed indentations, removed redundant init code in SplashPotionEntity.cpp
2014-07-26 03:48:16 -07:00
