Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -2/+1 |
|\ | |||||
| * | Add entity health saving. | Howaner | 2014-06-24 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -6/+1 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 1 | -2/+1 |
| |\ | |||||
| * | | The motion is already set in AddBasicEntity() | Howaner | 2014-06-17 | 1 | -5/+0 |
| | | | |||||
| * | | Code improvements | Howaner | 2014-05-28 | 1 | -1/+0 |
| | | | |||||
| * | | Add throw sound and fix arrow server crash. | Howaner | 2014-05-28 | 1 | -0/+1 |
| | | | |||||
* | | | Health of monsters is now saved | Tiger Wang | 2014-06-04 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-24 | 1 | -17/+27 |
|\| | |||||
| * | More switch warnings. | archshift | 2014-05-12 | 1 | -0/+7 |
| | | |||||
| * | Fixed a few more switch warnings. | archshift | 2014-05-12 | 1 | -17/+20 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 1 | -7/+32 |
|\| | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | Merge pull request #989 from Howaner/Anvil | Mattes D | 2014-05-07 | 1 | -6/+31 |
| |\ | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ... | ||||
| | * | Change m_RepairCost to int. | Howaner | 2014-05-07 | 1 | -1/+1 |
| | | | |||||
| | * | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 1 | -6/+31 |
| | | | |||||
| * | | Fix MagmaCube save. | Howaner | 2014-05-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 1 | -6/+6 |
|\| | |||||
| * | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 1 | -1/+1 |
| |\ | | | | | | | Add entity invulnerable | ||||
| | * | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 1 | -8/+1 |
| | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| | * | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 1 | -1/+8 |
| | | | |||||
| | * | Fixes | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 1 | -1/+1 |
| | | | |||||
| * | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 1 | -4/+4 |
| | | | | | | | | | | | | Other small changes. | ||||
| * | | Small changes; warning fixing. | archshift | 2014-04-25 | 1 | -4/+4 |
| |/ | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 1 | -1/+1 |
|\| | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | Fixed references to renamed files. | archshift | 2014-04-24 | 1 | -1/+1 |
| | | |||||
* | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #833 from mc-server/EnderCrystal | Mattes D | 2014-03-25 | 1 | -0/+13 |
|\ | | | | | Ender crystals | ||||
| * | Ender crystals | andrew | 2014-03-25 | 1 | -0/+13 |
| | | |||||
* | | Wither invulnerability | andrew | 2014-03-24 | 1 | -1/+7 |
|/ | |||||
* | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-15 | 1 | -3/+11 |
|\ | |||||
| * | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -1/+14 |
| |\ | | | | | | | Add TNT load/save | ||||
| * \ | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -0/+15 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | Add item frame saving. | Howaner | 2014-03-15 | 1 | -2/+38 |
| | | | | |||||
* | | | | Add health and age load to pickup's. | Howaner | 2014-03-15 | 1 | -5/+5 |
| | | | | |||||
* | | | | Add ExpOrb saving. | Howaner | 2014-03-15 | 1 | -1/+16 |
| |_|/ |/| | | |||||
* | | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -1/+1 |
| | | | |||||
* | | | Add TNT Save/Load and add Netbeans projects to .gitignore | Howaner | 2014-03-08 | 1 | -1/+14 |
| |/ |/| | |||||
* | | Add Flower Pots | Howaner | 2014-03-07 | 1 | -0/+15 |
|/ | |||||
* | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 1 | -0/+8 |
| | |||||
* | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-23 | 1 | -7/+7 |
| | |||||
* | Add Skulls/Heads | Howaner | 2014-02-23 | 1 | -5/+21 |
| | |||||
* | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| * | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+1 |
| | | | | | | | | + Implemented paintings | ||||
* | | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 1 | -0/+1 |
|/ | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
* | Partial fix for #130 | Tiger Wang | 2014-02-03 | 1 | -0/+1 |
| | |||||
* | Added saving of angry flag. | Kirill Kirilenko | 2014-02-02 | 1 | -0/+1 |
| | |||||
* | Fixed sitting tag. | Kirill Kirilenko | 2014-02-02 | 1 | -1/+1 |
| | |||||
* | Added saving of collar's color. | Kirill Kirilenko | 2014-02-01 | 1 | -1/+2 |
| | |||||
* | Fixes #606 | STRWarrior | 2014-01-30 | 1 | -2/+2 |
| | |||||
* | Command block fixes 2 | andrew | 2014-01-23 | 1 | -9/+10 |
| | |||||
* | Merge pull request #569 from worktycho/EnchantmentsFix | Mattes D | 2014-01-19 | 1 | -1/+2 |
|\ | | | | | Enchantments fix | ||||
| * | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 1 | -1/+1 |
| | | |||||
| * | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | Created a new class cEnchantmentSerializer to serilize Enchantments to NBT. This breaks a dependecy chain between cChunkGenerator and cWorld. cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments so having it seperate reduces the spread of the frein modifier | ||||
* | | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 1 | -1/+1 |
| | | |||||
* | | Command block (de)serialization | andrew | 2014-01-18 | 1 | -10/+27 |
|/ | |||||
* | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 1 | -1/+1 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | |||||
* | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 1 | -5/+133 |
| | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
* | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+533 |