1
0
Fork 0
Commit Graph

60 Commits

Author SHA1 Message Date
Tiger Wang 89a26cc786 Suggestions 2014-07-02 21:07:34 +01:00
Howaner c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner 46b84aa8b6 The motion is already set in AddBasicEntity() 2014-06-17 01:17:35 +02:00
Howaner 142fa83124 Code improvements 2014-05-28 19:32:20 +02:00
Howaner e7a7c45c36 Add throw sound and fix arrow server crash. 2014-05-28 16:39:59 +02:00
Tycho 4ab8288116 Merge branch 'master' into chunksparsing/structs 2014-05-24 12:44:49 +01:00
archshift 3a5e04d118 More switch warnings. 2014-05-11 16:54:42 -07:00
archshift 3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07:00
Tycho d478e3cfb1 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.h
2014-05-10 05:05:44 -07:00
Mattes D d1b719885d Merge pull request #989 from Howaner/Anvil
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
2014-05-07 22:18:53 +02:00
Howaner fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner 80bcc43c7b Fix MagmaCube save. 2014-05-07 12:43:21 +02:00
Howaner d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
Tycho 8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07:00
Mattes D 709015369d Merge pull request #940 from Howaner/GlobalFixes
Add entity invulnerable
2014-04-28 20:58:15 +02:00
Howaner 26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new."
This reverts commit d50f8f6f11.
2014-04-28 13:51:22 +02:00
archshift 9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
Tycho 57b8ee9163 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift 477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Tycho e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
archshift aef2c8ec62 Further refactored, Reverted Minecart change
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00
Howaner 49f6819829 Fixes 2014-04-26 16:44:15 +02:00
archshift 62e5234535 Small changes; warning fixing. 2014-04-24 20:25:03 -07:00
archshift 06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
Mattes D cac5149974 Merge pull request #833 from mc-server/EnderCrystal
Ender crystals
2014-03-25 21:02:23 +01:00
andrew 2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
andrew 6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
Howaner 8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner 7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00
Howaner 28898f710b Add ExpOrb saving. 2014-03-15 00:32:49 +01:00
Tiger Wang 09c5542123 Merge pull request #768 from Howaner/BlockEntitys
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Howaner b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
Howaner f5e374be41 Add TNT Save/Load and add Netbeans projects to .gitignore 2014-03-08 10:25:46 +01:00
Howaner 787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
Tiger Wang baf2d88921 Implemented ballistic missiles (fireworks)
+ Added fireworks
2014-02-26 23:33:52 +00:00
TheJumper 2cc597372a Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters 2014-02-23 19:50:51 +01:00
Howaner 1f726b7d9d Rename SkullEntity to MobHeadEntity 2014-02-23 19:50:50 +01:00
Howaner ab2eba17ec Add Skulls/Heads 2014-02-23 19:50:50 +01:00
Tiger Wang a686656253 Merge branch 'master' into itemframes
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Tiger Wang 320cc74f0a Implemented paintings, fixes #689
+ Implemented paintings
2014-02-18 00:16:03 +00:00
Tiger Wang 464ec47eb7 Implemented item frames, a part of #689
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
2014-02-17 23:00:03 +00:00
Tiger Wang d82f3102e5 Partial fix for #130 2014-02-03 22:26:16 +00:00
Kirill Kirilenko a134fd45cf Added saving of angry flag. 2014-02-02 14:28:42 +04:00
Kirill Kirilenko a1c36c18e0 Fixed sitting tag. 2014-02-02 13:56:55 +04:00
Kirill Kirilenko 0259aed8be Added saving of collar's color. 2014-02-01 20:16:42 +04:00
STRWarrior 419778a306 Fixes #606 2014-01-30 21:39:31 +01:00
andrew 4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02:00