summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage/NBTChunkSerializer.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-1/+2
|\ | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * NBTChunkSerializer.cpp: Added break after serializing the splash potionarchshift2014-07-201-0/+1
| |
| * Splash potions: Renamed PotionParticleType to PotionColor for clarityarchshift2014-07-191-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-30/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * More trailing whitespace fixes.madmaxoft2014-07-171-1/+1
| |
| * Normalized comments.madmaxoft2014-07-171-1/+1
| | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
| * Restructured cSplashPotionEntity code.madmaxoft2014-07-151-1/+1
| | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType.
| * Merge branch 'master' into potionsmadmaxoft2014-07-151-15/+17
| |\
| | * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-15/+17
| | |\ | | | | | | | | Implemented trapped chests & others
| | | * cNBTChunkSerializer: Fixed alignment.madmaxoft2014-07-121-14/+14
| | | |
| | | * Suggestions and bug fixTiger Wang2014-07-121-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | * Fixed hoppers pushing/pulling to/from (trapped)chests that do not form a double-chest with the chest type directly connected to said hopper; thank you, @madmaxoft
| | | * SuggestionsTiger Wang2014-07-111-4/+4
| | | |
| | | * Made things consistentTiger Wang2014-07-081-2/+4
| | | |
| | | * Implemented trapped chests & othersTiger Wang2014-07-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | | Added splash potions to NBT serialization and retrievalarchshift2014-07-121-0/+11
| |/ /
| * | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-091-16/+12
| |\ \ | | |/ | |/| Fixes to projectiles and the undead
| | * Various fixedTiger Wang2014-07-041-7/+4
| | | | | | | | | | | | | | | * Fixed potential invalid pointer dereferencing, fixes #1117 * Fixed ender pearls not being loaded properly
| | * SuggestionsTiger Wang2014-07-021-9/+8
| | |
| * | Removed unneeded codeTiger Wang2014-06-301-14/+1
| | |
| * | Properly implemented enderchestsTiger Wang2014-06-291-0/+14
| | |
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into portalsTiger Wang2014-06-241-2/+1
|\| |
| * | Add entity health saving.Howaner2014-06-241-2/+1
| |/
* | Merge branch 'master' into portalsTiger Wang2014-06-211-6/+1
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Merge branch 'master' into GlobalFixesHowaner2014-06-171-2/+1
| |\
| * | The motion is already set in AddBasicEntity()Howaner2014-06-171-5/+0
| | |
| * | Code improvementsHowaner2014-05-281-1/+0
| | |
| * | Add throw sound and fix arrow server crash.Howaner2014-05-281-0/+1
| | |
* | | Health of monsters is now savedTiger Wang2014-06-041-0/+1
| |/ |/|
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-241-17/+27
|\|
| * More switch warnings.archshift2014-05-121-0/+7
| |
| * Fixed a few more switch warnings.archshift2014-05-121-17/+20
| |
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-101-7/+32
|\| | | | | | | | | Conflicts: src/Chunk.h
| * Merge pull request #989 from Howaner/AnvilMattes D2014-05-071-6/+31
| |\ | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
| | * Change m_RepairCost to int.Howaner2014-05-071-1/+1
| | |
| | * Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-071-6/+31
| | |
| * | Fix MagmaCube save.Howaner2014-05-071-1/+1
| |/
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-011-6/+6
|\|
| * Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-281-1/+1
| |\ | | | | | | Add entity invulnerable
| | * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-281-8/+1
| | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| | * Changed the old invulnerable methods from the wither to the new.Howaner2014-04-261-1/+8
| | |
| | * FixesHowaner2014-04-261-1/+1
| | |
| * | Fixed projectile source filenames, indentationsarchshift2014-04-281-1/+1
| | |
| * | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-271-1/+1
| | |
| * | Further refactored, Reverted Minecart changearchshift2014-04-261-4/+4
| | | | | | | | | | | | Other small changes.
| * | Small changes; warning fixing.archshift2014-04-251-4/+4
| |/
* | Merge branch 'master' into chunksparsing/structsTycho2014-04-271-1/+1
|\| | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| * Fixed references to renamed files.archshift2014-04-241-1/+1
| |
* | Implemented Chunk Sparsing with segmentsTycho2014-04-261-2/+1
|/
* Merge pull request #833 from mc-server/EnderCrystalMattes D2014-03-251-0/+13
|\ | | | | Ender crystals
| * Ender crystalsandrew2014-03-251-0/+13
| |
* | Wither invulnerabilityandrew2014-03-241-1/+7
|/
* Merge branch 'master' into BlockEntitysHowaner2014-03-151-3/+11
|\
| * Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-1/+14
| |\ | | | | | | Add TNT load/save
| * \ Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-0/+15
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-3/+11
| | | | | | | | | | | | | | | | + Added fireworks
* | | | Add item frame saving.Howaner2014-03-151-2/+38
| | | |
* | | | Add health and age load to pickup's.Howaner2014-03-151-5/+5
| | | |
* | | | Add ExpOrb saving.Howaner2014-03-151-1/+16
| |_|/ |/| |
* | | Change TNT Fuse to ticksHowaner2014-03-081-1/+1
| | |
* | | Add TNT Save/Load and add Netbeans projects to .gitignoreHowaner2014-03-081-1/+14
| |/ |/|
* | Add Flower PotsHowaner2014-03-071-0/+15
|/
* Fixed Formatting, Added DropChances and CanPickUpLoot attributes to MonstersTheJumper2014-02-231-0/+8
|
* Rename SkullEntity to MobHeadEntityHowaner2014-02-231-7/+7
|
* Add Skulls/HeadsHowaner2014-02-231-5/+21
|
* Merge branch 'master' into itemframesTiger Wang2014-02-181-0/+1
|\ | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| * Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+1
| | | | | | | | + Implemented paintings
* | Implemented item frames, a part of #689Tiger Wang2014-02-181-0/+1
|/ | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
* Partial fix for #130Tiger Wang2014-02-031-0/+1
|
* Added saving of angry flag.Kirill Kirilenko2014-02-021-0/+1
|
* Fixed sitting tag.Kirill Kirilenko2014-02-021-1/+1
|
* Added saving of collar's color.Kirill Kirilenko2014-02-011-1/+2
|
* Fixes #606STRWarrior2014-01-301-2/+2
|
* Command block fixes 2andrew2014-01-231-9/+10
|
* Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-191-1/+2
|\ | | | | Enchantments fix
| * Switched EnchantmentSerilizer to namespaceTycho2014-01-191-1/+1
| |
| * Spilt Writing of Enchantments to seperate classTycho2014-01-191-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 messageandrew2014-01-181-1/+1
| |
* | Command block (de)serializationandrew2014-01-181-10/+27
|/
* Removed internal cEntity::GetRot() usage.madmaxoft2014-01-171-1/+1
|
* Removed obsoleted functionsTiger Wang2014-01-161-1/+1
|
* Preliminary mobile entity savingTiger Wang2013-12-251-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).madmaxoft2013-12-201-1/+1
|
* Moved source to srcAlexander Harkness2013-11-241-0/+533