summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Nullify deleted pointers.archshift2014-06-191-0/+1
|
* Merge branch 'master' into GlobalFixesHowaner2014-06-175-13/+11
|\
| * Fixed mob loading, part of #1058Tiger Wang2014-06-041-1/+1
| |
| * Merge branch 'master' into chunksparsing/structsTycho2014-05-244-18/+228
| |\
| * | Renamed cChunkBuffer to cChunkDataTycho2014-05-211-1/+1
| | |
| * | Fixed issue with types not being defined for an unused parameterTycho2014-05-182-2/+2
| | |
| * | Merge branch 'master' into chunksparsing/structsTycho2014-05-109-79/+142
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/Chunk.h
| * \ \ Merge branch 'master' into chunksparsing/structsTycho2014-05-031-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp
| * \ \ \ Merge branch 'master' into chunksparsing/structsTycho2014-05-013-11/+27
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into chunksparsing/structsTycho2014-04-2710-37/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| * | | | | | Implemented Chunk Sparsing with segmentsTycho2014-04-264-11/+9
| | | | | | |
* | | | | | | 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
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #998 from mc-server/StatManagerMattes D2014-05-182-0/+201
|\ \ \ \ \ \ | | | | | | | | | | | | | | Statistic Manager
| * | | | | | Fixesandrew2014-05-132-3/+8
| | | | | | |
| * | | | | | Fixed stat serializationandrew2014-05-111-5/+22
| | | | | | |
| * | | | | | Statistic Managerandrew2014-05-112-0/+179
| | |_|_|_|/ | |/| | | |
* | | | | | More switch warnings.archshift2014-05-121-0/+7
| | | | | |
* | | | | | Fixed a few more switch warnings.archshift2014-05-121-17/+20
| | | | | |
* | | | | | Fixed a warning and a complaint about a never-read variable.archshift2014-05-111-1/+0
|/ / / / /
* | | | | Merge pull request #992 from mc-server/coverity_fixesMattes D2014-05-092-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Coverity fixes
| * | | | | Range Check on schematic sizeworktycho2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | Fixes CID 55830
| * | | | | Check the height and width values read.worktycho2014-05-091-0/+8
| | | | | | | | | | | | | | | | | | Fixes CID 55831
* | | | | | Fixed size_t in FireworksSerializer.Mattes D2014-05-091-2/+2
| | | | | |
* | | | | | Fixed message formatting.Mattes D2014-05-091-2/+2
| | | | | |
* | | | | | Even more size_t fixes.Mattes D2014-05-091-4/+4
| | | | | |
* | | | | | More size_t fixes.Mattes D2014-05-092-6/+6
| | | | | |
* | | | | | Build fixes after the last size_t batch.Mattes D2014-05-096-15/+15
| | | | | |
* | | | | | Fixed MSVC 64-bit build warnings.Mattes D2014-05-095-36/+38
|/ / / / /
* | | | | Merge pull request #989 from Howaner/AnvilMattes D2014-05-072-12/+59
|\ \ \ \ \ | | | | | | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
| * | | | | Change m_RepairCost to int.Howaner2014-05-072-2/+2
| | | | | |
| * | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-072-12/+59
| | |_|_|/ | |/| | |
* / | | | Fix MagmaCube save.Howaner2014-05-072-3/+9
|/ / / /
* | | / Fixed warnings in FastNBT.madmaxoft2014-05-011-2/+2
| |_|/ |/| |
* | | Anvil saver pads data to 4K boundaries.madmaxoft2014-05-011-0/+5
| | | | | | | | | | | | Fixes #524.
* | | Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-282-2/+2
|\ \ \ | | | | | | | | Add entity invulnerable
| * | | Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-282-9/+2
| | | | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| * | | Changed the old invulnerable methods from the wither to the new.Howaner2014-04-262-2/+9
| | | |
| * | | FixesHowaner2014-04-262-2/+2
| | |/ | |/|
* | | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-282-3/+7
|\ \ \ | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files.
| * | | Fixed projectile source filenames, indentationsarchshift2014-04-282-7/+7
| | | |
| * | | Moved cGhastFireballEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| * | | Moved cFireChargeEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| * | | Moved cThrownSnowballEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| * | | Moved cThrownEnderPearl out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| * | | Moved cThrownEggEntity out of ProjectileEntity.harchshift2014-04-271-1/+1
| | | |
| * | | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-272-2/+2
| | | |
* | | | Merge pull request #948 from jfhumann/staticFixesMattes D2014-04-271-1/+9
|\ \ \ \ | |/ / / |/| | | Fixes motivated by Coverity #1
| * | | Fix for minor resource leak (CID 43616)jfhumann2014-04-261-1/+9
| | | |
* | | | Further refactored, Reverted Minecart changearchshift2014-04-261-4/+4
| | | | | | | | | | | | | | | | Other small changes.
* | | | Removed unused assignments.archshift2014-04-261-1/+0
| | | |
* | | | Merge remote-tracking branch 'upstream/master'archshift2014-04-251-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| | | |
* | | | Small changes; warning fixing.archshift2014-04-251-4/+4
|/ / /
* | | Fixed class capitalization for the cave spider.archshift2014-04-241-1/+1
| | |
* | | Fixed references to renamed files.archshift2014-04-241-1/+1
|/ /
* | Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-182-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| * | Rewrote redstone powering to use power levelsTiger Wang2014-04-152-2/+2
| | |
* | | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-183-4/+4
|/ /
* | Removed check for enqueuing a chunk that is already enqueued to be loadedTycho2014-04-081-1/+1
| | | | | | | | | | This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing and removes an expensive iteration whilst holding the queue lock
* | Fixed silly Clang's warnings in FastNBT.madmaxoft2014-04-041-28/+28
|/
* Merge branch 'MacFixes'Tycho2014-04-021-1/+1
|\ | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp
| * Added one more missing newline.Samuel Barney2014-03-251-1/+1
| |
* | Added schematic string serializer self-test.madmaxoft2014-04-021-0/+33
| |
* | BlockArea: Switched internal coords to Vector3i.madmaxoft2014-03-251-5/+5
| |
* | Merge pull request #833 from mc-server/EnderCrystalMattes D2014-03-254-0/+35
|\ \ | |/ |/| Ender crystals
| * Ender crystalsandrew2014-03-254-0/+35
| |
* | Wither invulnerabilityandrew2014-03-243-3/+19
|/
* Fixed a crash in firework rockets.madmaxoft2014-03-171-2/+8
| | | | Fixes #816.
* Merge pull request #809 from Howaner/BlockEntitysMattes D2014-03-164-31/+240
|\ | | | | More entity saving.
| * Add anvil direction.Howaner2014-03-161-1/+9
| |
| * Remove old debug messages.Howaner2014-03-151-3/+0
| |
| * Merge branch 'master' into BlockEntitysHowaner2014-03-159-24/+404
| |\
| * | Add item frame saving.Howaner2014-03-154-2/+130
| | |
| * | Add health and age load to pickup's.Howaner2014-03-152-6/+20
| | |
| * | Add ExpOrb saving.Howaner2014-03-154-28/+90
| | |
* | | Add new leaves to all classes.Howaner2014-03-161-0/+1
| |/ |/|
* | Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-5/+5
| |
* | Merge branch 'Werror' into warningsTycho2014-03-122-1/+24
|\ \ | | | | | | | | | | | | Conflicts: src/Globals.h
| * \ Merge branch 'master' into WerrorTycho2014-03-122-1/+24
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp
| | * \ Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-121-1/+1
| | |\ \
| | | * | Unified Vector classesandrew2014-03-111-1/+1
| | | | |
| | * | | Renamed cBlockArea Offset to WEOffset.madmaxoft2014-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | Even in getters / setters.
| | * | | Merge branch 'master' into cBlockArea_Offsetmadmaxoft2014-03-127-5/+406
| | |\| |
| | * | | Renamed m_Offset to m_WEOffsetSTRWarrior2014-03-111-3/+3
| | | | |
| | * | | This allows a blockarea to have an Offset.STRWarrior2014-03-101-0/+23
| | | | |
* | | | | Fixed a load of format string errorsTycho2014-03-111-5/+5
|/ / / /
* | | | Fixed xofts issuesTycho2014-03-102-1/+5
| | | |
* | | | Removed Some unnessicary macrosTycho2014-03-101-2/+2
| | | |
* | | | Use string.reserve to avoid the need to do inplace byteswapTycho2014-03-101-10/+6
| | | |
* | | | Removed unused macro from WSSCompactTycho2014-03-101-1/+0
| | | |
* | | | Fixed alignment issues in Fireworks SerializerTycho2014-03-101-7/+7
| | | |
* | | | Merge branch 'master' into WerrorTycho2014-03-107-5/+406
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed MSVC2008 compilation.madmaxoft2014-03-101-4/+4
| | | |
| * | | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-094-1/+44
| |\ \ \ | | | |/ | | |/| Add TNT load/save
| | * | Merge branch 'master' into BlockEntitysHowaner2014-03-082-32/+134
| | |\|
| | * | Change TNT Fuse to ticksHowaner2014-03-082-3/+2
| | | |
| | * | Add TNT Save/Load and add Netbeans projects to .gitignoreHowaner2014-03-084-1/+45
| | | |
| * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-099-49/+282
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | | Hexified coloursTiger Wang2014-03-091-16/+16
| | | |
| * | | Fixed data length issuesTiger Wang2014-03-091-2/+3
| | | |
| * | | Demonstrated issues with GetDataLength()Tiger Wang2014-03-092-5/+11
| | | |
| * | | Fixed compileTiger Wang2014-02-272-3/+2
| | | |
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-275-4/+356
| | | | | | | | | | | | | | | | + Added fireworks
* | | | Its a const not a macroTycho2014-03-091-1/+1
| | | |
* | | | Take 5Tycho2014-03-091-1/+1
| | | |
* | | | Take 4Tycho2014-03-091-1/+1
| | | |
* | | | Unsigned types take 3Tycho2014-03-091-1/+1
| | | |
* | | | Fix gcc error attempt 2Tycho2014-03-091-1/+1
| | | |
* | | | Fixed gcc errorTycho2014-03-091-1/+1
| |/ / |/| |
* | | Fixed cBlockArea schematic string saving signature.madmaxoft2014-03-072-6/+5
| | |
* | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-075-3/+91
|\ \ \ | | |/ | |/| Add Flower Pots
| * | Add Flower PotsHowaner2014-03-075-3/+91
| | |
* | | Added cBlockArea serialization to string.madmaxoft2014-03-072-32/+135
|/ / | | | | | | Fixes #665.
* | Added more documentation for FastNBT parser.madmaxoft2014-03-021-3/+45
| |
* | Shortened enumsandrew2014-03-011-7/+7
| |
* | Improved comments in float size check.madmaxoft2014-03-011-2/+2
| |
* | Better fix for the 32-bit float reading.madmaxoft2014-02-281-4/+5
|/
* Fixed a gcc warning in FastNBT.h.madmaxoft2014-02-261-2/+11
|
* Merge pull request #710 from TheJumper/masterMattes D2014-02-243-0/+198
|\ | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
| * Fixed Formatting, Added DropChances and CanPickUpLoot attributes to MonstersTheJumper2014-02-233-0/+198
| |
| * Rename SkullEntity to MobHeadEntityHowaner2014-02-234-18/+18
| |
| * Add Heads completelyHowaner2014-02-231-1/+1
| |
| * Add Skulls/HeadsHowaner2014-02-234-5/+64
| |
* | Fixed MCServer not compiling with C++03 compilersSTRWarrior2014-02-241-2/+2
| |
* | Maps: Improvementsandrew2014-02-231-1/+5
| |
* | Manual merge (Fixed conflicts)andrew2014-02-204-5/+66
|\ \
| * \ Merge pull request #697 from Howaner/SkullMattes D2014-02-194-5/+64
| |\ \ | | |/ | |/| Add Skulls/Heads to MCServer
| | * Rename SkullEntity to MobHeadEntityHowaner2014-02-194-18/+18
| | |
| | * Add Heads completelyHowaner2014-02-181-1/+1
| | |
| | * Add Skulls/HeadsHowaner2014-02-174-5/+64
| | |
| * | 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!)
* | Documented cMapandrew2014-02-191-0/+2
| |
* | Map item handler; Fixed several bugsandrew2014-02-172-4/+14
| |
* | Send map when selectedandrew2014-02-141-3/+6
| |
* | IDCount Serializationandrew2014-02-132-1/+103
| |
* | Implementation of in-game mapsandrew2014-02-132-0/+241
|/
* Fixed #573STRWarrior2014-02-121-4/+4
|
* Fixed compile and some warnings in MSVSTiger Wang2014-02-091-2/+2
|
* Partial fix for #130Tiger Wang2014-02-031-0/+1
|
* Added saving of angry flag.Kirill Kirilenko2014-02-022-0/+7
|
* Fixed sitting tag.Kirill Kirilenko2014-02-022-5/+5
|
* Added saving of collar's color.Kirill Kirilenko2014-02-012-4/+11
|
* Added reading saved state of the wolf (sitting or standing).Kirill Kirilenko2014-01-311-0/+6
|
* Inversed condition.STRWarrior2014-01-311-1/+1
|
* Wolf: If Owner tag is missing a normal ownerless wolf will spawn.STRWarrior2014-01-311-9/+6
|
* Fixed bad variable.STRWarrior2014-01-301-1/+1
|
* Check if the tag is found.STRWarrior2014-01-301-0/+5
|
* Fixes #606STRWarrior2014-01-302-2/+9
|
* Item-loading now checks for weird bytes.madmaxoft2014-01-261-3/+9
|
* Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-252-0/+201
|\ | | | | More Interfaces to decouple Generator from the rest of the code
| * Fixed exportsTycho2014-01-251-4/+1
| |
| * Fixed spelling errorTycho2014-01-222-1/+1
| |
| * Added manual bindings for moved functionsTycho2014-01-221-2/+4
| |
| * formatting changesTycho2014-01-222-6/+26
| |
| * Merge branch 'master' into GeneratingBenchmarkTycho2014-01-223-1/+442
| |\ | | | | | | | | | | | | Conflicts: src/World.h
| * | Actually implemented interfacesTycho2014-01-202-21/+28
| | |
| * | Moved Schematic file methods to seperate classTycho2014-01-202-0/+175
| | |
* | | Fixed a few compile-time and runtime warnings in ScoreboardSerializer.madmaxoft2014-01-241-8/+4
| | |
* | | Fixed crash with failed entity-loading.madmaxoft2014-01-241-2/+7
| | | | | | | | | | | | | | | | | | This should fix issues reported in: http://forum.mc-server.org/showthread.php?tid=1328 http://forum.mc-server.org/showthread.php?tid=1308
* | | Fixed scoreboard.dat structureandrew2014-01-231-5/+6
| | |
* | | Fixed scoreboard serializationandrew2014-01-231-35/+26
| | |
* | | Improved code safety for the Compact world storage.Mattes D2014-01-231-104/+72
| | | | | | | | | | | | That was a huge chunk of smelly code.
* | | Command block fixes 2andrew2014-01-232-17/+40
| |/ |/|
* | cWorld now saves/loads the scoreboardandrew2014-01-221-5/+10
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-214-2/+109
|\|
| * Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-194-2/+109
| |\ | | | | | | Enchantments fix
| | * Switched EnchantmentSerilizer to namespaceTycho2014-01-194-10/+11
| | |
| | * Spilt Writing of Enchantments to seperate classTycho2014-01-194-2/+108
| | | | | | | | | | | | | | | | | | | | | 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
* | | Scoreboard protocol supportandrew2014-01-211-0/+4
| | |
* | | Scoreboard serializationandrew2014-01-201-5/+72
| | |
* | | Scoreboard deserializationandrew2014-01-203-1/+366
|/ /
* | Parse the MC|AdvCdm plugin messageandrew2014-01-181-1/+1
| |
* | Command blocks: Execute()andrew2014-01-181-1/+1
| |
* | Command block (de)serializationandrew2014-01-184-18/+80
|/
* Added user setting compression factorTycho2014-01-176-18/+25
|
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-1/+1
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-1/+1
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+1
| |
* | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-171-1/+1
| |
* | Removed obsoleted functionsTiger Wang2014-01-162-2/+2
|/
* Fixed a few MSVC warnings.madmaxoft2014-01-071-5/+8
|
* Fixed wrong enqueueing.madmaxoft2014-01-061-2/+9
| | | | Fixes #505.
* Merge branch 'master' into threadsafequeueTycho Bickerstaff2014-01-022-8/+8
|\
| * More memory alignment fixes.madmaxoft2014-01-021-3/+3
| | | | | | | | Ref.: #420.
| * Fixed unaligned memory access in FastNBT.madmaxoft2014-01-021-5/+5
| | | | | | | | This should fix #420.
* | fixed a few remaining issues with worldstorageTycho Bickerstaff2014-01-022-24/+6
| |
* | rewrote queue not to use promises for waitsTycho Bickerstaff2014-01-022-15/+9
| |
* | refactored chunk Queue to seperate classTycho Bickerstaff2013-12-312-97/+67
| |
* | added link dependency between WorldStorage and OSSupportTycho Bickerstaff2013-12-221-0/+2
|/
* Preliminary mobile entity savingTiger Wang2013-12-253-12/+788
| | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-204-7/+15
|\
| * Attempt at fixing cChunkDef::Height signedness.madmaxoft2013-12-202-3/+11
| |
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-202-4/+4
| |
* | moved Worldstorage to globsTycho Bickerstaff2013-12-111-1/+5
| |
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* Moved json includes to where they are really needed.madmaxoft2013-11-282-1/+1
|
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-272-2/+2
|
* Fixed the remaining derpsAlexander Harkness2013-11-273-4/+4
|
* Further attempts to fix compileTiger Wang2013-11-253-4/+4
|
* Attempt to fix compilationTiger Wang2013-11-243-4/+4
|
* Moved source to srcAlexander Harkness2013-11-2410-0/+4925