summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Made -Weverything an error.tycho2015-05-242-8/+12
|
* Make -Werror disabling file onlytycho2015-05-195-13/+21
| | | | Ad fix a load of warnings
* CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-098-14/+14
|
* More style checking.Mattes D2015-05-095-11/+11
| | | | Spaces around some operators are checked.
* cSetChunkData constructor explicitly requires std::move() instead ofWoazboat2015-04-271-1/+1
| | | | unsafely stealing data
* cPainting saving implementedTiger Wang2015-03-144-14/+47
| | | | Additionally, it now inherits from cHangingEntity.
* Fixed confusion over Item Frame directionsTiger Wang2015-03-132-55/+11
|
* Flower pots: In 1.8 items are saved with the name and not the id.Howaner2015-02-181-5/+12
|
* WSSAnvil: Fixed chunk data padding.Mattes D2015-02-081-2/+5
| | | | | When the chunk data fit perfectly into the old space, an extra 4 KiB of padding zeroes were written, overwriting the next chunk. Fixes #1730.
* Fixed negative return values in SchematicFileSerializer.Matyas Dolak2015-01-231-1/+3
| | | | Fixes CID 103165.
* Fixed warnings in FastNBT.cpp.Mattes D2015-01-201-39/+40
|
* WSSAnvil: Added clamping to entity coords.Mattes D2014-12-211-3/+3
| | | | Fixes CID 72854.
* FastNBT: Added a sanity check for number of list items.Mattes D2014-12-211-1/+8
| | | | Fixes CID 55812.
* Added RabbitsMasy982014-12-203-0/+27
|
* Added Entity GuardianMasy982014-12-183-0/+27
|
* Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-112-17/+47
|\ | | | | Prepare chunk
| * Added a cWorld:PrepareChunk function.Mattes D2014-12-102-17/+47
| | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function.
* | Cosmetic touchups.Mattes D2014-12-111-4/+5
| | | | | | | | Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
* | Merge remote-tracking branch 'planetx/master'Mattes D2014-12-112-5/+33
|\ \ | |/ |/|
| * Check to see if header write out is requiredplanetx2014-12-081-17/+15
| |
| * Added timestamp to merged files WSSAnvilplanetx2014-12-081-1/+1
| |
| * Added timestamp to merged files WSSAnvilplanetx2014-12-081-62/+62
| |
| * Added timestamp to new files WSSAnvilplanetx2014-12-082-79/+149
| |
| * Added Timestamp info to chunks in WSSAnvilplanetx2014-12-072-87/+47
| |
* | Merge pull request #1555 from mc-server/c++11Mattes D2014-12-072-6/+6
|\ \ | | | | | | C++11
| * | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-061-10/+21
| |\| | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp
| * | Merged branch 'origin/master' into c++11.Mattes D2014-12-044-14/+89
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-232-2/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * \ \ \ Merged branch 'master' into c++11.Mattes D2014-10-232-29/+40
| |\ \ \ \
| * | | | | Replace &*[0] accesses with .data()Tiger Wang2014-10-212-6/+6
| | | | | |
| * | | | | En masse NULL -> nullptr replaceTiger Wang2014-10-205-53/+53
| | | | | |
* | | | | | Replaced most auto_ptr with unique_ptr.Mattes D2014-12-061-61/+61
| |_|_|_|/ |/| | | |
* | | | | BasicStyle: Added missing braces to control statements.Mattes D2014-12-051-10/+21
| |_|_|/ |/| | |
* | | | MobSpawner fixes.Howaner2014-12-011-1/+1
| | | |
* | | | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-291-1/+1
| | | |
* | | | Merge branch 'master' into MobSpawnerHowaner2014-11-291-2/+8
|\ \ \ \
| * | | | WSSAnvil: Fixed bad code in arrow loading.Mattes D2014-11-261-2/+8
| | |_|/ | |/| |
* | | | Finished mob spawner implementation.Howaner2014-11-183-2/+54
| | | |
* | | | Merge branch 'master' into MobSpawnerHowaner2014-11-188-1312/+135
|\| | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core
| * | | Fixed 1.8 world item format reading.Howaner2014-10-291-2/+19
| | | |
| * | | Fixed compile (typos).Alexander Harkness2014-10-271-2/+2
| | | |
| * | | Another one.#Alexander Harkness2014-10-271-0/+22
| | |/ | |/|
| * | En masse NULL -> nullptr replaceTiger Wang2014-10-235-53/+53
| | |
| * | cItemFrame: Fixed a forgotten rename.Mattes D2014-10-211-1/+1
| | |
| * | Properly exported cItemFrame and cHangingEntity to Lua.Mattes D2014-10-212-28/+39
| |/
| * Removed WSSCompactTiger Wang2014-09-304-1227/+0
| |
| * Merge remote-tracking branch 'origin/master' into chestcartsTiger Wang2014-09-277-75/+175
| |\ | | | | | | | | | | | | Conflicts: src/Entities/Minecart.cpp
| * | Implemented Chest MinecartsTiger Wang2014-09-131-1/+1
| | |
* | | Merge branch 'master' into MobSpawnerHowaner2014-09-267-75/+175
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h
| * | Merge pull request #1456 from Howaner/FixesMattes D2014-09-262-11/+11
| |\ \ | | | | | | | | Fixed player custom names in 1.8 and added type checking to map loading
| | * \ Merge branch 'master' into FixesHowaner2014-09-261-41/+41
| | |\ \
| | * | | Added type checking to map loading.Howaner2014-09-262-11/+11
| | | | |
| * | | | Fixed UNUSED macro so that it doesn't require type knowledge.madmaxoft2014-09-261-4/+4
| | |/ / | |/| | | | | | | | | | Introduced new UNUSED_VAR macro that is used when type knowledge is available (for local variables).
| * | | Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-261-41/+41
| |\ \ \ | | |/ / | |/| | Added test mocking to IncrementalRedstoneSimulator
| | * | Merge branch 'master' into redstoneTestsTycho2014-09-254-11/+94
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| | * | | Added first test to show the object can be createdTycho2014-09-171-41/+41
| | | |/ | | |/|
| * | | Anvil: Arrow Tile tags are a short in VanillaHowaner2014-09-252-7/+24
| | | |
| * | | Fixed hanging direction bugs.Howaner2014-09-251-1/+1
| | |/ | |/|
| * | derpHowaner2014-09-241-4/+4
| | |
| * | Don't create two entity lists.Howaner2014-09-242-7/+14
| | |
| * | Merge branch 'master' into WorldLoaderHowaner2014-09-242-4/+18
| |\ \
| | * | Anvil: Wolf collar color is a byte in Vanilla.madmaxoft2014-09-232-4/+18
| | | | | | | | | | | | | | | | | | | | Kept the old Int reading for compatibility reasons. Ref.: #1448
| * | | Merge branch 'master' into WorldLoaderHowaner2014-09-231-3/+3
| |\| |
| | * | Fixed a crash in WSSAnvil.madmaxoft2014-09-231-3/+3
| | | | | | | | | | | | | | | | Reported as #1448.
| * | | MCServer world compatiblity with vanilla and mcedit.Howaner2014-09-233-5/+52
| |/ /
| * | Merge branch 'master' into EntityCustomNameHowaner2014-09-236-100/+93
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h
| | * | Fixed cParsedNBT::FindTagByPath().madmaxoft2014-09-201-1/+1
| | |/ | | | | | | | | | There was an off-by-one error in the name handling.
| * | Added CustomName saving.Howaner2014-09-022-0/+15
| | |
* | | Implemented mob spawner.Howaner2014-09-192-12/+29
| |/ |/|
* | Added Y-wise asserts to signs.Mattes D2014-09-061-0/+2
| | | | | | | | This should help detect #1313's second case.
* | Anvil: Fixed an off-by-one error in the loader.Mattes D2014-09-061-1/+1
| | | | | | | | Fixes #1307.
* | Fixed scoreboard loader type checks.Mattes D2014-09-061-10/+10
| | | | | | | | Fixes scoreboard loading error reported on the Dropper map in #1307.
* | WorldStorage no longer queues chunks into generator.Mattes D2014-09-052-49/+13
| |
* | Fixed loading empty chunks.Mattes D2014-09-051-1/+7
| | | | | | | | Reported on the Dropper map in #1307.
* | Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-5/+6
| | | | | | | | This fixes #1370.
* | Anvil: Fixed loading block entities with invalid Y coord.Mattes D2014-09-051-1/+1
| |
* | Anvil: Cleanly refuse to store data that is too large.madmaxoft2014-09-041-1/+7
| | | | | | | | Each chunk in MCA needs to be less than 1 MiB compressed; chunks that are larger will be refused with a log message.
* | Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-033-24/+22
|\ \ | | | | | | remove y-coord from chunks
| * | commitLO1ZB2014-09-031-1/+1
| | |
| * | hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-031-1/+1
| | |
| * | remove y-coord from chunksLO1ZB2014-08-283-24/+22
| | |
* | | Anvil: switched inflate to stream mode.madmaxoft2014-09-031-18/+6
| | | | | | | | | | | | This removes the fixed-size buffer which could have caused #1307 and #1366.
* | | Clang wants volatile...madmaxoft2014-09-021-1/+1
| | |
* | | Added strict error reporting to chunk loading.madmaxoft2014-09-021-1/+29
| |/ |/| | | | | This should help with #1307.
* | Merge branch 'master' into fixesmadmaxoft2014-08-302-214/+255
|\ \
| * | WSSAnvil: Removed leftover debugging code.madmaxoft2014-08-301-4/+0
| | |
| * | Rewritten block entity loading.Mattes D2014-08-292-212/+257
| |/ | | | | | | | | | | Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked. The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't. Fixes #1354.
* | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-291-0/+4
|\| | | | | | | | | Conflicts: src/Server.cpp
| * Added initializers for class members.Mattes D2014-08-211-0/+4
| | | | | | | | As reported by Coverity, these weren't initialized.
* | Removed unused codeTiger Wang2014-08-291-1/+0
|/
* CheckBasicStyle: multi-level indent change.madmaxoft2014-08-041-3/+5
|
* Refactored case-conversion functions.madmaxoft2014-08-041-1/+6
| | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
* Anvil: Wolf owner not saved if not present.madmaxoft2014-08-041-2/+8
|
* Wolf uses UUID for owner.madmaxoft2014-08-033-14/+69
| | | | Fixes #1277.
* Fixed a ToLua warning - operator = not supported.madmaxoft2014-08-031-1/+1
|
* Renamed "select..." methods to "set..." and better IsValidEffect() function.Howaner2014-07-311-2/+2
|
* Renamed functions and added beacon json saving.Howaner2014-07-313-4/+24
|
* Added beacon load/save.Howaner2014-07-304-1/+71
|
* Slight cleanup after portalsTiger Wang2014-07-292-7/+1
|
* Merge branch 'master' into portalsTiger Wang2014-07-294-8/+10
|\ | | | | | | | | Conflicts: src/World.h
| * Moved potion static functions to EntityEffect to create splash potions through worldarchshift2014-07-261-1/+1
| |
| * Removed redundant semicolons and re-added warningarchshift2014-07-242-3/+3
| |
| * Added a queue for setting chunk data.madmaxoft2014-07-242-4/+6
| | | | | | | | Fixes #1196.
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-227-67/+98
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-212-52/+58
| |
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-18/+18
| |
| * NBTChunkSerializer.cpp: Added break after serializing the splash potionarchshift2014-07-201-0/+1
| |
| * Code style: Fixed braces on separate lines.madmaxoft2014-07-191-2/+3
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-193-5/+5
| |
| * Merge pull request #1214 from mc-server/anti-globMattes D2014-07-191-6/+29
| |\ | | | | | | CMake - Explicitly lists all source files
| | * Subdirs: Only add_library if not using MSVCarchshift2014-07-191-2/+4
| | |
| | * WorldStorage/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+26
| | |
| * | Splash potions: Renamed PotionParticleType to PotionColor for clarityarchshift2014-07-192-2/+2
| |/
* | Merge branch 'master' into portalsTiger Wang2014-07-1814-131/+160
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed tabs used for alignment.madmaxoft2014-07-171-4/+3
| |
| * More trailing whitespace fixes.madmaxoft2014-07-171-1/+1
| |
| * Basic style fixes.madmaxoft2014-07-177-22/+22
| |
| * Normalized comments.madmaxoft2014-07-179-31/+31
| | | | | | | | | | 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-152-2/+2
| | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType.
| * Merge branch 'master' into potionsmadmaxoft2014-07-155-25/+38
| |\
| | * Merge branch 'master' into SheepHowaner2014-07-137-71/+53
| | |\
| | | * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-135-21/+27
| | | |\ | | | | | | | | | | 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-075-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| | * | | Code fixes.Howaner2014-06-291-1/+1
| | | | |
| | * | | Save IsSheared from Sheep.Howaner2014-06-281-4/+11
| | | | |
| * | | | Added splash potions to NBT serialization and retrievalarchshift2014-07-124-0/+41
| | |/ / | |/| |
| * | | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-092-18/+21
| |\ \ \ | | |_|/ | |/| | 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-022-11/+17
| | | |
| * | | Removed world-saving log messages.madmaxoft2014-07-042-33/+5
| | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518
| * | | Removed unneeded codeTiger Wang2014-06-304-38/+1
| | | |
| * | | Properly implemented enderchestsTiger Wang2014-06-294-0/+38
| | |/ | |/|
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into portalsTiger Wang2014-06-242-16/+8
|\| |
| * | Add entity health saving.Howaner2014-06-242-16/+8
| |/
* | Merge branch 'master' into portalsTiger Wang2014-06-213-6/+5
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * MCA saver marks chunks as populated.madmaxoft2014-06-201-0/+3
| | | | | | | | Fixes #140.
| * Nullify deleted pointers.archshift2014-06-191-0/+1
| |
| * Merge branch 'master' into GlobalFixesHowaner2014-06-175-13/+11
| |\
| * | 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
| | |
* | | Time and weather is saved, part of #1058Tiger Wang2014-06-041-3/+10
| | | | | | | | | | | | Also fixed unreliability in Health and LootPickup loading.
* | | Health of monsters is now savedTiger Wang2014-06-042-0/+2
| |/ |/|
* | Fixed mob loading, part of #1058Tiger Wang2014-06-041-1/+1
| |
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-244-18/+228
|\|
| * 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
| |/
* | 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 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
| |/
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-031-2/+2
|\| | | | | | | | | Conflicts: src/Chunk.cpp
| * Fixed warnings in FastNBT.madmaxoft2014-05-011-2/+2
| |
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-013-11/+27
|\|
| * 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
| |\ \ \ | | | |/ | | |/|
| * | | Small changes; warning fixing.archshift2014-04-251-4/+4
| | | |
* | | | Merge branch 'master' into chunksparsing/structsTycho2014-04-2710-37/+38
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| * | | Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| |/ /
| * | 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
| |
* | Implemented Chunk Sparsing with segmentsTycho2014-04-264-11/+9
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:11:19 +0100