Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manage block entity lifetime with unique_ptr (#4080) | peterbell10 | 2020-04-03 | 2 | -53/+51 |
| | |||||
* | Pulled the BlockID and BlockInfo headers from Globals.h. (#4591) | Mattes D | 2020-04-03 | 5 | -11/+20 |
| | | | | | | | | | The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values | ||||
* | Refactored more of Entities and BlockEntities to use Vector3. (#4403) | Mattes D | 2019-09-29 | 2 | -120/+121 |
| | |||||
* | NBTChunkSerializer: Cleaned up interface. | Mattes D | 2019-09-24 | 3 | -950/+889 |
| | | | | | | Removed dependency on cChunkDataCallback. Moved all the serializing code into a worker class. Changed the serialization into a single-call action. | ||||
* | Separated chunk generator from world / plugin interfaces. | Mattes D | 2019-09-06 | 1 | -2/+2 |
| | | | | The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests. | ||||
* | Fix building with clang 8.0 (#4346) | Bond-009 | 2019-08-11 | 1 | -4/+6 |
| | |||||
* | Add a formatting function for Vector3 (#4282) | peterbell10 | 2018-09-24 | 1 | -7/+7 |
| | | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG | ||||
* | Force all headers other than "Globals.h" to be included with relative paths (#4269) | peterbell10 | 2018-08-29 | 6 | -9/+6 |
| | | | | | | | Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work. | ||||
* | CheckBasicStyle: Check number of empty lines between functions (#4267) | peterbell10 | 2018-07-26 | 3 | -3/+9 |
| | | | | Add check for number of empty lines between functions and fix the corresponding failures | ||||
* | cIsThread: Reset m_ShouldTerminate after the thread has stopped (#4258) | peterbell10 | 2018-07-22 | 1 | -1/+1 |
| | | | | | This allows threads to be restarted after stopping. Fixes #4257 | ||||
* | Prefer static_cast to reinterpret_cast (#4223) | peterbell10 | 2018-05-02 | 1 | -49/+49 |
| | | | | | | | * Change reinterpret_cast -> static_cast wherever possible * Remove more unnecessary `const_cast`s. reinterpret_casts should be avoided for the same reason as c-style casts - they don't do any type-checking. reinterpret_cast was mainly being used for down-casting in inheritance hierarchies but static_cast works just as well while also making sure that there is actually an inheritance relationship there. | ||||
* | Deal with covered switches consistently (#4161) | peterbell10 | 2018-02-05 | 2 | -50/+41 |
| | | | | | | | * Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message() | ||||
* | Add the fmt library (#4065) | peterbell10 | 2018-01-03 | 5 | -13/+12 |
| | | | | | | | * Replaces AppendVPrintf with fmt::sprintf * fmt::ArgList now used as a type safe alternative to varargs. * Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu. * Adds FLOG functions to log with fmt's native formatting style. | ||||
* | Store Health as a float (#4073) | Fabian | 2017-11-22 | 2 | -3/+22 |
| | | | | | | | | | | | | | | | | | | * Fix #4024 * Fix clang error * Add comment * Fix behaviour * Save Health as float * Changed m_Health to float * Remove redundant static_cast * Fix casts | ||||
* | cWorld Threads: Seperate initialization and thread start. | peterbell10 | 2017-10-21 | 2 | -5/+4 |
| | | | | Prevents nullptr dereferences before Start has been called. | ||||
* | Removed UTF-8 BOM (#4033) | Lukas Pioch | 2017-09-19 | 2 | -2/+2 |
| | |||||
* | Fix switch warnings (#4013) | peterbell10 | 2017-09-14 | 3 | -52/+54 |
| | | | | | | | | | | | | | | | * Fix switch warnings * Fix a variety of -Wswitch and -Wswitch-enum warnings * Remove unneeded -Wno-error flags * Reorganise some eMonsterType switches * Alpha sort eMonsterType cases in WriteMobMetadata and in cNBTChunkSerializer::AddMonsterEntity * List all mob types in protocol 1.12 and NBTChunkSerializer * cStructGenTrees::GetNumTrees: remove switch default * cWSSAnvil::LoadOldMinecartFromNBT: Log unhandled minecart type | ||||
* | cBlockArea: use unique_ptr | peterbell10 | 2017-09-11 | 1 | -4/+4 |
| | |||||
* | Made world data paths adjustable, and added API to temporarily disable saving chunks to disk. (#3912) | Lane Kolbly | 2017-09-07 | 1 | -3/+3 |
| | |||||
* | Switched player statistic store to save with UUID filenames. (#4002) | Lane Kolbly | 2017-09-07 | 2 | -4/+10 |
| | |||||
* | Changed some int parameters to vector parameters (#3937) | Bond-009 | 2017-09-07 | 1 | -2/+2 |
| | |||||
* | Implement anvil chunk sparsing | peterbell10 | 2017-08-26 | 3 | -26/+25 |
| | |||||
* | Add cUUID class (#3871) | peterbell10 | 2017-08-25 | 3 | -26/+25 |
| | |||||
* | Minor changes (#3909) | mathiascode | 2017-08-24 | 1 | -1/+1 |
| | |||||
* | Fully implemented leashes (#3798) | Pablo Beltrán | 2017-08-21 | 4 | -2/+119 |
| | |||||
* | Represent cItem::m_Lore as an AStringVector (#3882) | peterbell10 | 2017-08-18 | 2 | -5/+22 |
| | | | | | | | | * Replace cItem::m_Lore with AStringVector * Reword deprecation warning * Fix lua bindings | ||||
* | Merge pull request #3489 from cuberite/EntityOwnership | Tiger Wang | 2017-08-18 | 1 | -53/+53 |
|\ | | | | | * Changed entity ownership model to use smart pointers | ||||
| * | Changed entity ownership model to use smart pointers | Tiger Wang | 2017-08-07 | 1 | -53/+53 |
| | | |||||
* | | Replaced includes with forward declarations | Lukas Pioch | 2017-08-13 | 1 | -2/+1 |
|/ | |||||
* | Removed unneeded includes (#3902) | Lukas Pioch | 2017-08-06 | 1 | -1/+0 |
| | |||||
* | Remove double includes part 2 (#3890) | peterbell10 | 2017-08-03 | 3 | -11/+0 |
| | |||||
* | Removed unused forward declarations (#3888) | Lukas Pioch | 2017-08-03 | 2 | -6/+0 |
| | |||||
* | Fix BSD build | peterbell10 | 2017-08-02 | 1 | -0/+1 |
| | |||||
* | Removed double includes (#3885) | Lukas Pioch | 2017-08-02 | 1 | -2/+0 |
| | |||||
* | cParsedNBT: Improved error reporting (#3876) | peterbell10 | 2017-07-30 | 2 | -55/+206 |
| | | | | | | * cParsedNBT: Improved error reporting * Fix typos | ||||
* | Remove smart pointer macros | peterbell10 | 2017-07-21 | 1 | -1/+1 |
| | |||||
* | Added basic ocelot behavior (#3829) | Bond-009 | 2017-07-12 | 3 | -13/+51 |
| | |||||
* | Added bed entity (#3823) | Lukas Pioch | 2017-07-07 | 4 | -0/+45 |
| | | | | | | | | | | * Added bed entity * Export cBedEntity to lua * Set color of bed through item damage value * Added bed entity to APIDoc * NBT: Added loading and saving * Crafting recipes for the colored beds | ||||
* | Load entities from old and new names | Lukas Pioch | 2017-06-23 | 2 | -224/+150 |
| | |||||
* | Anvil storage: load block entities from both old and new name-styles. (#3784) | Mattes D | 2017-06-21 | 2 | -80/+129 |
| | | | | * WSSAnvil: Load the sign text from JSON, too. | ||||
* | BlockEntities: Support cloning self. | Mattes D | 2017-06-16 | 2 | -78/+81 |
| | |||||
* | Exported boat | Lukas Pioch | 2017-05-24 | 2 | -1/+8 |
| | | | | | | | - NBT: Added saving / loading of material - Added the material in the item handler of the boat - Drop the correct boat if destroyed - APIDoc: Added desc and functions | ||||
* | Store cChunk::m_BlockEntities in a map (#3717) | peterbell10 | 2017-05-22 | 2 | -4/+7 |
| | | | | | | * Store block entities in a map from block index * Cleanup ForEachBlockEntity * Cleanup DoWithBlockEntityAt | ||||
* | Clang 5.0 fixes | Lukas Pioch | 2017-05-21 | 2 | -2/+2 |
| | | | | | - Added override keyword - Removed inherited member variables | ||||
* | Corrected brewingstand and added support for fuel | Lukas Pioch | 2017-05-08 | 2 | -2/+11 |
| | |||||
* | NBT: Corrected firework loading | Lukas Pioch | 2017-03-22 | 1 | -2/+2 |
| | |||||
* | Fixed minecart destruction using deallocated memory. | Mattes D | 2016-12-15 | 1 | -0/+2 |
| | |||||
* | Fixed TrappedChest saving. (#3423) | Mattes D | 2016-11-07 | 2 | -5/+16 |
| | | | Vanilla uses "Chest" in NBT for trapped chests. | ||||
* | Use cChunkDef::Height for Y coord comparison where applicable. | Moritz Borcherding | 2016-09-27 | 2 | -2/+2 |
| | |||||
* | Fixed type-casting-related warnings. | Mattes D | 2016-08-24 | 4 | -18/+21 |
| | |||||
* | CMake: Remove needless minimum version specifications. | Mattes D | 2016-07-18 | 1 | -2/+0 |
| | |||||
* | SelfTests: Moved SchematicFileSerializer test into a separate project. | Mattes D | 2016-06-18 | 1 | -36/+0 |
| | |||||
* | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 14 | -289/+289 |
| | |||||
* | MCServer to Cuberite | Mathias | 2016-01-29 | 1 | -1/+1 |
| | |||||
* | Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8 | bibo38 | 2016-01-11 | 2 | -4/+54 |
| | | | | | | The NBT format now carries the texture data and transmit it to the client. See: http://minecraft.gamepedia.com/Head#Block_entity Related to #2674 | ||||
* | Renamed leftover strings to Cuberite / Server, as needed. | Mattes D | 2016-01-01 | 1 | -1/+1 |
| | | | | Also upgraded the user setting file for MSVC to 2013. | ||||
* | Fix off by two error in ReadString | worktycho | 2015-12-18 | 1 | -1/+1 |
| | |||||
* | Check for invalid tags when reading a compound tag | tycho | 2015-12-18 | 1 | -2/+6 |
| | |||||
* | Fixed String Parsing crash bug | tycho | 2015-12-18 | 1 | -5/+1 |
| | | | | Check string length against actual remaining data, not an abitary constant | ||||
* | Test for correct coordinates when fishing | Gargaj | 2015-12-10 | 1 | -0/+1 |
| | | | | Fun fact: this was able to actually deadlock the server depending on where you were standing :) | ||||
* | changed mob age from char to int | Julian Laubstein | 2015-11-16 | 2 | -28/+82 |
| | |||||
* | Implemented brewing | Lukas Pioch | 2015-11-03 | 4 | -0/+71 |
| | |||||
* | Update Loops required for JsonCPP | Lukas Pioch | 2015-10-26 | 1 | -2/+2 |
| | |||||
* | Fixed a race condition between chunk loader and generator. | Mattes D | 2015-10-04 | 2 | -32/+10 |
| | | | | | | When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded. Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not. | ||||
* | Namechange to Cuberite | Mattes D | 2015-09-25 | 2 | -2/+2 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 6 | -21/+29 |
| | |||||
* | Chunks that fail to load are offloaded to extra files. | Mattes D | 2015-07-31 | 2 | -61/+107 |
| | | | | Ref.: #1970 | ||||
* | Added reason parameter to load failures. | Mattes D | 2015-07-31 | 1 | -13/+13 |
| | |||||
* | Moved AString reading hack to cFile. | Mattes D | 2015-07-31 | 1 | -16/+17 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 6 | -165/+161 |
| | |||||
* | Added Rabbit Metadata values. | bibo38 | 2015-07-17 | 2 | -44/+60 |
| | | | | | Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation. Fixes #1867 | ||||
* | Merge pull request #2340 from hallucino/ageable-mobs | NiLSPACE | 2015-07-15 | 2 | -12/+100 |
|\ | | | | | Support ageable mobs | ||||
| * | Support ageable mobs | Hallucino | 2015-07-14 | 2 | -12/+100 |
| | | | | | | | | Move ageable stuff in Monster directly | ||||
* | | Changing the shared_ptr/unique_ptr constructors to the make_shared/make_unique functions | bibo38 | 2015-07-12 | 1 | -64/+64 |
|/ | |||||
* | Fixes compilation failures on MacOSX 10.10 | Samuel Barney | 2015-07-09 | 2 | -36/+36 |
| | | | | | * Replace old c-style casts with c++ casts * Added `-Wno-error=old-style-cast` to Protocol18x.cpp | ||||
* | Externalized cPrefabPiecePool self-test. | Mattes D | 2015-06-19 | 2 | -14/+16 |
| | |||||
* | Fixed log files' timestamps | Tiger Wang | 2015-06-14 | 1 | -2/+2 |
| | | | | | Also made Release mode log less technical information about the world storage threads. | ||||
* | SelfTests are registered and executed after logging framework init. | Mattes D | 2015-06-11 | 1 | -0/+6 |
| | | | | Fixes #2228. | ||||
* | Fixes multiple furnace issues, including from loading world storage | HaoTNN | 2015-06-03 | 1 | -2/+3 |
| | |||||
* | Fixed warnings in MSVC. | Mattes D | 2015-06-02 | 1 | -0/+3 |
| | | | | It complained about undefined return values or using uninitialized variables. | ||||
* | Disable -Werror for warnings in tests. | tycho | 2015-05-24 | 1 | -1/+1 |
| | |||||
* | Made -Weverything an error. | tycho | 2015-05-24 | 2 | -8/+12 |
| | |||||
* | Make -Werror disabling file only | tycho | 2015-05-19 | 5 | -13/+21 |
| | | | | Ad fix a load of warnings | ||||
* | CheckBasicStyle: checks spaces around * and &. | Mattes D | 2015-05-09 | 8 | -14/+14 |
| | |||||
* | More style checking. | Mattes D | 2015-05-09 | 5 | -11/+11 |
| | | | | Spaces around some operators are checked. | ||||
* | cSetChunkData constructor explicitly requires std::move() instead of | Woazboat | 2015-04-27 | 1 | -1/+1 |
| | | | | unsafely stealing data | ||||
* | cPainting saving implemented | Tiger Wang | 2015-03-14 | 4 | -14/+47 |
| | | | | Additionally, it now inherits from cHangingEntity. | ||||
* | Fixed confusion over Item Frame directions | Tiger Wang | 2015-03-13 | 2 | -55/+11 |
| | |||||
* | Flower pots: In 1.8 items are saved with the name and not the id. | Howaner | 2015-02-18 | 1 | -5/+12 |
| | |||||
* | WSSAnvil: Fixed chunk data padding. | Mattes D | 2015-02-08 | 1 | -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 Dolak | 2015-01-23 | 1 | -1/+3 |
| | | | | Fixes CID 103165. | ||||
* | Fixed warnings in FastNBT.cpp. | Mattes D | 2015-01-20 | 1 | -39/+40 |
| | |||||
* | WSSAnvil: Added clamping to entity coords. | Mattes D | 2014-12-21 | 1 | -3/+3 |
| | | | | Fixes CID 72854. | ||||
* | FastNBT: Added a sanity check for number of list items. | Mattes D | 2014-12-21 | 1 | -1/+8 |
| | | | | Fixes CID 55812. | ||||
* | Added Rabbits | Masy98 | 2014-12-20 | 3 | -0/+27 |
| | |||||
* | Added Entity Guardian | Masy98 | 2014-12-18 | 3 | -0/+27 |
| | |||||
* | Merge pull request #1657 from mc-server/PrepareChunk | Mattes D | 2014-12-11 | 2 | -17/+47 |
|\ | | | | | Prepare chunk | ||||
| * | Added a cWorld:PrepareChunk function. | Mattes D | 2014-12-10 | 2 | -17/+47 |
| | | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function. | ||||
* | | Cosmetic touchups. | Mattes D | 2014-12-11 | 1 | -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 D | 2014-12-11 | 2 | -5/+33 |
|\ \ | |/ |/| | |||||
| * | Check to see if header write out is required | planetx | 2014-12-08 | 1 | -17/+15 |
| | | |||||
| * | Added timestamp to merged files WSSAnvil | planetx | 2014-12-08 | 1 | -1/+1 |
| | | |||||
| * | Added timestamp to merged files WSSAnvil | planetx | 2014-12-08 | 1 | -62/+62 |
| | | |||||
| * | Added timestamp to new files WSSAnvil | planetx | 2014-12-08 | 2 | -79/+149 |
| | | |||||
| * | Added Timestamp info to chunks in WSSAnvil | planetx | 2014-12-07 | 2 | -87/+47 |
| | | |||||
* | | Merge pull request #1555 from mc-server/c++11 | Mattes D | 2014-12-07 | 2 | -6/+6 |
|\ \ | | | | | | | C++11 | ||||
| * | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-12-06 | 1 | -10/+21 |
| |\| | | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp | ||||
| * | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 4 | -14/+89 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 2 | -2/+41 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| * \ \ \ | Merged branch 'master' into c++11. | Mattes D | 2014-10-23 | 2 | -29/+40 |
| |\ \ \ \ | |||||
| * | | | | | Replace &*[0] accesses with .data() | Tiger Wang | 2014-10-21 | 2 | -6/+6 |
| | | | | | | |||||
| * | | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 5 | -53/+53 |
| | | | | | | |||||
* | | | | | | Replaced most auto_ptr with unique_ptr. | Mattes D | 2014-12-06 | 1 | -61/+61 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 1 | -10/+21 |
| |_|_|/ |/| | | | |||||
* | | | | MobSpawner fixes. | Howaner | 2014-12-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. | Howaner | 2014-11-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-29 | 1 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | WSSAnvil: Fixed bad code in arrow loading. | Mattes D | 2014-11-26 | 1 | -2/+8 |
| | |_|/ | |/| | | |||||
* | | | | Finished mob spawner implementation. | Howaner | 2014-11-18 | 3 | -2/+54 |
| | | | | |||||
* | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-18 | 8 | -1312/+135 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core | ||||
| * | | | Fixed 1.8 world item format reading. | Howaner | 2014-10-29 | 1 | -2/+19 |
| | | | | |||||
| * | | | Fixed compile (typos). | Alexander Harkness | 2014-10-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Another one.# | Alexander Harkness | 2014-10-27 | 1 | -0/+22 |
| | |/ | |/| | |||||
| * | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 5 | -53/+53 |
| | | | |||||
| * | | cItemFrame: Fixed a forgotten rename. | Mattes D | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | Properly exported cItemFrame and cHangingEntity to Lua. | Mattes D | 2014-10-21 | 2 | -28/+39 |
| |/ | |||||
| * | Removed WSSCompact | Tiger Wang | 2014-09-30 | 4 | -1227/+0 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into chestcarts | Tiger Wang | 2014-09-27 | 7 | -75/+175 |
| |\ | | | | | | | | | | | | | Conflicts: src/Entities/Minecart.cpp | ||||
| * | | Implemented Chest Minecarts | Tiger Wang | 2014-09-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into MobSpawner | Howaner | 2014-09-26 | 7 | -75/+175 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h | ||||
| * | | Merge pull request #1456 from Howaner/Fixes | Mattes D | 2014-09-26 | 2 | -11/+11 |
| |\ \ | | | | | | | | | Fixed player custom names in 1.8 and added type checking to map loading | ||||
| | * \ | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 1 | -41/+41 |
| | |\ \ | |||||
| | * | | | Added type checking to map loading. | Howaner | 2014-09-26 | 2 | -11/+11 |
| | | | | | |||||
| * | | | | Fixed UNUSED macro so that it doesn't require type knowledge. | madmaxoft | 2014-09-26 | 1 | -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/redstoneTests | worktycho | 2014-09-26 | 1 | -41/+41 |
| |\ \ \ | | |/ / | |/| | | Added test mocking to IncrementalRedstoneSimulator | ||||
| | * | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 4 | -11/+94 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| | * | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -41/+41 |
| | | |/ | | |/| | |||||
| * | | | Anvil: Arrow Tile tags are a short in Vanilla | Howaner | 2014-09-25 | 2 | -7/+24 |
| | | | | |||||
| * | | | Fixed hanging direction bugs. | Howaner | 2014-09-25 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | derp | Howaner | 2014-09-24 | 1 | -4/+4 |
| | | | |||||
| * | | Don't create two entity lists. | Howaner | 2014-09-24 | 2 | -7/+14 |
| | | | |||||
| * | | Merge branch 'master' into WorldLoader | Howaner | 2014-09-24 | 2 | -4/+18 |
| |\ \ | |||||
| | * | | Anvil: Wolf collar color is a byte in Vanilla. | madmaxoft | 2014-09-23 | 2 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | Kept the old Int reading for compatibility reasons. Ref.: #1448 | ||||
| * | | | Merge branch 'master' into WorldLoader | Howaner | 2014-09-23 | 1 | -3/+3 |
| |\| | | |||||
| | * | | Fixed a crash in WSSAnvil. | madmaxoft | 2014-09-23 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Reported as #1448. | ||||
| * | | | MCServer world compatiblity with vanilla and mcedit. | Howaner | 2014-09-23 | 3 | -5/+52 |
| |/ / | |||||
| * | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 6 | -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(). | madmaxoft | 2014-09-20 | 1 | -1/+1 |
| | |/ | | | | | | | | | | There was an off-by-one error in the name handling. | ||||
| * | | Added CustomName saving. | Howaner | 2014-09-02 | 2 | -0/+15 |
| | | | |||||
* | | | Implemented mob spawner. | Howaner | 2014-09-19 | 2 | -12/+29 |
| |/ |/| | |||||
* | | Added Y-wise asserts to signs. | Mattes D | 2014-09-06 | 1 | -0/+2 |
| | | | | | | | | This should help detect #1313's second case. | ||||
* | | Anvil: Fixed an off-by-one error in the loader. | Mattes D | 2014-09-06 | 1 | -1/+1 |
| | | | | | | | | Fixes #1307. | ||||
* | | Fixed scoreboard loader type checks. | Mattes D | 2014-09-06 | 1 | -10/+10 |
| | | | | | | | | Fixes scoreboard loading error reported on the Dropper map in #1307. | ||||
* | | WorldStorage no longer queues chunks into generator. | Mattes D | 2014-09-05 | 2 | -49/+13 |
| | | |||||
* | | Fixed loading empty chunks. | Mattes D | 2014-09-05 | 1 | -1/+7 |
| | | | | | | | | Reported on the Dropper map in #1307. | ||||
* | | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 1 | -5/+6 |
| | | | | | | | | This fixes #1370. | ||||
* | | Anvil: Fixed loading block entities with invalid Y coord. | Mattes D | 2014-09-05 | 1 | -1/+1 |
| | | |||||
* | | Anvil: Cleanly refuse to store data that is too large. | madmaxoft | 2014-09-04 | 1 | -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_RelY | Mattes D | 2014-09-03 | 3 | -24/+22 |
|\ \ | | | | | | | remove y-coord from chunks | ||||
| * | | commit | LO1ZB | 2014-09-03 | 1 | -1/+1 |
| | | | |||||
| * | | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 1 | -1/+1 |
| | | | |||||
| * | | remove y-coord from chunks | LO1ZB | 2014-08-28 | 3 | -24/+22 |
| | | | |||||
* | | | Anvil: switched inflate to stream mode. | madmaxoft | 2014-09-03 | 1 | -18/+6 |
| | | | | | | | | | | | | This removes the fixed-size buffer which could have caused #1307 and #1366. | ||||
* | | | Clang wants volatile... | madmaxoft | 2014-09-02 | 1 | -1/+1 |
| | | | |||||
* | | | Added strict error reporting to chunk loading. | madmaxoft | 2014-09-02 | 1 | -1/+29 |
| |/ |/| | | | | | This should help with #1307. | ||||
* | | Merge branch 'master' into fixes | madmaxoft | 2014-08-30 | 2 | -214/+255 |
|\ \ | |||||
| * | | WSSAnvil: Removed leftover debugging code. | madmaxoft | 2014-08-30 | 1 | -4/+0 |
| | | | |||||
| * | | Rewritten block entity loading. | Mattes D | 2014-08-29 | 2 | -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/MCServer | Tiger Wang | 2014-08-29 | 1 | -0/+4 |
|\| | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | Added initializers for class members. | Mattes D | 2014-08-21 | 1 | -0/+4 |
| | | | | | | | | As reported by Coverity, these weren't initialized. | ||||
* | | Removed unused code | Tiger Wang | 2014-08-29 | 1 | -1/+0 |
|/ | |||||
* | CheckBasicStyle: multi-level indent change. | madmaxoft | 2014-08-04 | 1 | -3/+5 |
| | |||||
* | Refactored case-conversion functions. | madmaxoft | 2014-08-04 | 1 | -1/+6 |
| | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place. | ||||
* | Anvil: Wolf owner not saved if not present. | madmaxoft | 2014-08-04 | 1 | -2/+8 |
| | |||||
* | Wolf uses UUID for owner. | madmaxoft | 2014-08-03 | 3 | -14/+69 |
| | | | | Fixes #1277. | ||||
* | Fixed a ToLua warning - operator = not supported. | madmaxoft | 2014-08-03 | 1 | -1/+1 |
| | |||||
* | Renamed "select..." methods to "set..." and better IsValidEffect() function. | Howaner | 2014-07-31 | 1 | -2/+2 |
| | |||||
* | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 3 | -4/+24 |
| | |||||
* | Added beacon load/save. | Howaner | 2014-07-30 | 4 | -1/+71 |
| | |||||
* | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 2 | -7/+1 |
| | |||||
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 4 | -8/+10 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Moved potion static functions to EntityEffect to create splash potions through world | archshift | 2014-07-26 | 1 | -1/+1 |
| | | |||||
| * | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 2 | -3/+3 |
| | | |||||
| * | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 2 | -4/+6 |
| | | | | | | | | Fixes #1196. | ||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 7 | -67/+98 |
|\| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 2 | -52/+58 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -18/+18 |
| | | |||||
| * | NBTChunkSerializer.cpp: Added break after serializing the splash potion | archshift | 2014-07-20 | 1 | -0/+1 |
| | | |||||
| * | Code style: Fixed braces on separate lines. | madmaxoft | 2014-07-19 | 1 | -2/+3 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 3 | -5/+5 |
| | | |||||
| * | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 1 | -6/+29 |
| |\ | | | | | | | CMake - Explicitly lists all source files | ||||
| | * | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -2/+4 |
| | | | |||||
| | * | WorldStorage/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+26 |
| | | | |||||
| * | | Splash potions: Renamed PotionParticleType to PotionColor for clarity | archshift | 2014-07-19 | 2 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 14 | -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. | madmaxoft | 2014-07-17 | 1 | -4/+3 |
| | | |||||
| * | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 7 | -22/+22 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 9 | -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. | madmaxoft | 2014-07-15 | 2 | -2/+2 |
| | | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType. | ||||
| * | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 5 | -25/+38 |
| |\ | |||||
| | * | Merge branch 'master' into Sheep | Howaner | 2014-07-13 | 7 | -71/+53 |
| | |\ | |||||
| | | * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 5 | -21/+27 |
| | | |\ | | | | | | | | | | | Implemented trapped chests & others | ||||
| | | | * | cNBTChunkSerializer: Fixed alignment. | madmaxoft | 2014-07-12 | 1 | -14/+14 |
| | | | | | |||||
| | | | * | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 1 | -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 | ||||
| | | | * | Suggestions | Tiger Wang | 2014-07-11 | 1 | -4/+4 |
| | | | | | |||||
| | | | * | Made things consistent | Tiger Wang | 2014-07-08 | 1 | -2/+4 |
| | | | | | |||||
| | | | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 5 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| | * | | | Code fixes. | Howaner | 2014-06-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Save IsSheared from Sheep. | Howaner | 2014-06-28 | 1 | -4/+11 |
| | | | | | |||||
| * | | | | Added splash potions to NBT serialization and retrieval | archshift | 2014-07-12 | 4 | -0/+41 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 2 | -18/+21 |
| |\ \ \ | | |_|/ | |/| | | Fixes to projectiles and the undead | ||||
| | * | | Various fixed | Tiger Wang | 2014-07-04 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | * Fixed potential invalid pointer dereferencing, fixes #1117 * Fixed ender pearls not being loaded properly | ||||
| | * | | Suggestions | Tiger Wang | 2014-07-02 | 2 | -11/+17 |
| | | | | |||||
| * | | | Removed world-saving log messages. | madmaxoft | 2014-07-04 | 2 | -33/+5 |
| | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518 | ||||
| * | | | Removed unneeded code | Tiger Wang | 2014-06-30 | 4 | -38/+1 |
| | | | | |||||
| * | | | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 4 | -0/+38 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 2 | -16/+8 |
|\| | | |||||
| * | | Add entity health saving. | Howaner | 2014-06-24 | 2 | -16/+8 |
| |/ | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 3 | -6/+5 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | MCA saver marks chunks as populated. | madmaxoft | 2014-06-20 | 1 | -0/+3 |
| | | | | | | | | Fixes #140. | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 5 | -13/+11 |
| |\ | |||||
| * | | 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 |
| | | | |||||
* | | | Time and weather is saved, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -3/+10 |
| | | | | | | | | | | | | Also fixed unreliability in Health and LootPickup loading. | ||||
* | | | Health of monsters is now saved | Tiger Wang | 2014-06-04 | 2 | -0/+2 |
| |/ |/| | |||||
* | | Fixed mob loading, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-24 | 4 | -18/+228 |
|\| | |||||
| * | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 2 | -0/+201 |
| |\ | | | | | | | Statistic Manager | ||||
| | * | Fixes | andrew | 2014-05-13 | 2 | -3/+8 |
| | | | |||||
| | * | Fixed stat serialization | andrew | 2014-05-11 | 1 | -5/+22 |
| | | | |||||
| | * | Statistic Manager | andrew | 2014-05-11 | 2 | -0/+179 |
| | | | |||||
| * | | More switch warnings. | archshift | 2014-05-12 | 1 | -0/+7 |
| | | | |||||
| * | | Fixed a few more switch warnings. | archshift | 2014-05-12 | 1 | -17/+20 |
| | | | |||||
| * | | Fixed a warning and a complaint about a never-read variable. | archshift | 2014-05-11 | 1 | -1/+0 |
| |/ | |||||
* | | Renamed cChunkBuffer to cChunkData | Tycho | 2014-05-21 | 1 | -1/+1 |
| | | |||||
* | | Fixed issue with types not being defined for an unused parameter | Tycho | 2014-05-18 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 9 | -79/+142 |
|\| | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | Merge pull request #992 from mc-server/coverity_fixes | Mattes D | 2014-05-09 | 2 | -1/+9 |
| |\ | | | | | | | Coverity fixes | ||||
| | * | Range Check on schematic size | worktycho | 2014-05-09 | 1 | -1/+1 |
| | | | | | | | | | Fixes CID 55830 | ||||
| | * | Check the height and width values read. | worktycho | 2014-05-09 | 1 | -0/+8 |
| | | | | | | | | | Fixes CID 55831 | ||||
| * | | Fixed size_t in FireworksSerializer. | Mattes D | 2014-05-09 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed message formatting. | Mattes D | 2014-05-09 | 1 | -2/+2 |
| | | | |||||
| * | | Even more size_t fixes. | Mattes D | 2014-05-09 | 1 | -4/+4 |
| | | | |||||
| * | | More size_t fixes. | Mattes D | 2014-05-09 | 2 | -6/+6 |
| | | | |||||
| * | | Build fixes after the last size_t batch. | Mattes D | 2014-05-09 | 6 | -15/+15 |
| | | | |||||
| * | | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 5 | -36/+38 |
| |/ | |||||
| * | Merge pull request #989 from Howaner/Anvil | Mattes D | 2014-05-07 | 2 | -12/+59 |
| |\ | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ... | ||||
| | * | Change m_RepairCost to int. | Howaner | 2014-05-07 | 2 | -2/+2 |
| | | | |||||
| | * | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 2 | -12/+59 |
| | | | |||||
| * | | Fix MagmaCube save. | Howaner | 2014-05-07 | 2 | -3/+9 |
| |/ | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-03 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| * | Fixed warnings in FastNBT. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 3 | -11/+27 |
|\| | |||||
| * | Anvil saver pads data to 4K boundaries. | madmaxoft | 2014-05-01 | 1 | -0/+5 |
| | | | | | | | | Fixes #524. | ||||
| * | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 2 | -2/+2 |
| |\ | | | | | | | Add entity invulnerable | ||||
| | * | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 2 | -9/+2 |
| | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| | * | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 2 | -2/+9 |
| | | | |||||
| | * | Fixes | Howaner | 2014-04-26 | 2 | -2/+2 |
| | | | |||||
| * | | Merge pull request #954 from mc-server/projectiles-split | Mattes D | 2014-04-28 | 2 | -3/+7 |
| |\ \ | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files. | ||||
| | * | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 2 | -7/+7 |
| | | | | |||||
| | * | | Moved cGhastFireballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cFireChargeEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cThrownSnowballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cThrownEnderPearl out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cThrownEggEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #948 from jfhumann/staticFixes | Mattes D | 2014-04-27 | 1 | -1/+9 |
| |\ \ \ | | |/ / | |/| | | Fixes motivated by Coverity #1 | ||||
| | * | | Fix for minor resource leak (CID 43616) | jfhumann | 2014-04-26 | 1 | -1/+9 |
| | | | | |||||
| * | | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Other small changes. | ||||
| * | | | Removed unused assignments. | archshift | 2014-04-26 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | archshift | 2014-04-25 | 1 | -0/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Small changes; warning fixing. | archshift | 2014-04-25 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 10 | -37/+38 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | | | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| |/ / | |||||
| * | | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed references to renamed files. | archshift | 2014-04-24 | 1 | -1/+1 |
| |/ | |||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| | * | Rewrote redstone powering to use power levels | Tiger Wang | 2014-04-15 | 2 | -2/+2 |
| | | | |||||
| * | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 3 | -4/+4 |
| |/ | |||||
| * | Removed check for enqueuing a chunk that is already enqueued to be loaded | Tycho | 2014-04-08 | 1 | -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. | madmaxoft | 2014-04-04 | 1 | -28/+28 |
| | | |||||
* | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 4 | -11/+9 |
|/ | |||||
* | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp | ||||
| * | Added one more missing newline. | Samuel Barney | 2014-03-25 | 1 | -1/+1 |
| | | |||||
* | | Added schematic string serializer self-test. | madmaxoft | 2014-04-02 | 1 | -0/+33 |
| | | |||||
* | | BlockArea: Switched internal coords to Vector3i. | madmaxoft | 2014-03-25 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #833 from mc-server/EnderCrystal | Mattes D | 2014-03-25 | 4 | -0/+35 |
|\ \ | |/ |/| | Ender crystals | ||||
| * | Ender crystals | andrew | 2014-03-25 | 4 | -0/+35 |
| | | |||||
* | | Wither invulnerability | andrew | 2014-03-24 | 3 | -3/+19 |
|/ | |||||
* | Fixed a crash in firework rockets. | madmaxoft | 2014-03-17 | 1 | -2/+8 |
| | | | | Fixes #816. | ||||
* | Merge pull request #809 from Howaner/BlockEntitys | Mattes D | 2014-03-16 | 4 | -31/+240 |
|\ | | | | | More entity saving. | ||||
| * | Add anvil direction. | Howaner | 2014-03-16 | 1 | -1/+9 |
| | | |||||
| * | Remove old debug messages. | Howaner | 2014-03-15 | 1 | -3/+0 |
| | | |||||
| * | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-15 | 9 | -24/+404 |
| |\ | |||||
| * | | Add item frame saving. | Howaner | 2014-03-15 | 4 | -2/+130 |
| | | | |||||
| * | | Add health and age load to pickup's. | Howaner | 2014-03-15 | 2 | -6/+20 |
| | | | |||||
| * | | Add ExpOrb saving. | Howaner | 2014-03-15 | 4 | -28/+90 |
| | | | |||||
* | | | Add new leaves to all classes. | Howaner | 2014-03-16 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 2 | -1/+24 |
|\ \ | | | | | | | | | | | | | Conflicts: src/Globals.h | ||||
| * \ | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 2 | -1/+24 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| | * \ | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-12 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Unified Vector classes | andrew | 2014-03-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Renamed cBlockArea Offset to WEOffset. | madmaxoft | 2014-03-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Even in getters / setters. | ||||
| | * | | | Merge branch 'master' into cBlockArea_Offset | madmaxoft | 2014-03-12 | 7 | -5/+406 |
| | |\| | | |||||
| | * | | | Renamed m_Offset to m_WEOffset | STRWarrior | 2014-03-11 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | This allows a blockarea to have an Offset. | STRWarrior | 2014-03-10 | 1 | -0/+23 |
| | | | | | |||||
* | | | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -5/+5 |
|/ / / / | |||||
* | | | | Fixed xofts issues | Tycho | 2014-03-10 | 2 | -1/+5 |
| | | | | |||||
* | | | | Removed Some unnessicary macros | Tycho | 2014-03-10 | 1 | -2/+2 |
| | | | | |||||
* | | | | Use string.reserve to avoid the need to do inplace byteswap | Tycho | 2014-03-10 | 1 | -10/+6 |
| | | | | |||||
* | | | | Removed unused macro from WSSCompact | Tycho | 2014-03-10 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fixed alignment issues in Fireworks Serializer | Tycho | 2014-03-10 | 1 | -7/+7 |
| | | | | |||||
* | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 7 | -5/+406 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Fixed MSVC2008 compilation. | madmaxoft | 2014-03-10 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 4 | -1/+44 |
| |\ \ \ | | | |/ | | |/| | Add TNT load/save | ||||
| | * | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 2 | -32/+134 |
| | |\| | |||||
| | * | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 2 | -3/+2 |
| | | | | |||||
| | * | | Add TNT Save/Load and add Netbeans projects to .gitignore | Howaner | 2014-03-08 | 4 | -1/+45 |
| | | | | |||||
| * | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 9 | -49/+282 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | Hexified colours | Tiger Wang | 2014-03-09 | 1 | -16/+16 |
| | | | | |||||
| * | | | Fixed data length issues | Tiger Wang | 2014-03-09 | 1 | -2/+3 |
| | | | | |||||
| * | | | Demonstrated issues with GetDataLength() | Tiger Wang | 2014-03-09 | 2 | -5/+11 |
| | | | | |||||
| * | | | Fixed compile | Tiger Wang | 2014-02-27 | 2 | -3/+2 |
| | | | | |||||
| * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 5 | -4/+356 |
| | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | Its a const not a macro | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Take 5 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Take 4 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Unsigned types take 3 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix gcc error attempt 2 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fixed gcc error | Tycho | 2014-03-09 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Fixed cBlockArea schematic string saving signature. | madmaxoft | 2014-03-07 | 2 | -6/+5 |
| | | | |||||
* | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 5 | -3/+91 |
|\ \ \ | | |/ | |/| | Add Flower Pots | ||||
| * | | Add Flower Pots | Howaner | 2014-03-07 | 5 | -3/+91 |
| | | | |||||
* | | | Added cBlockArea serialization to string. | madmaxoft | 2014-03-07 | 2 | -32/+135 |
|/ / | | | | | | | Fixes #665. | ||||
* | | Added more documentation for FastNBT parser. | madmaxoft | 2014-03-02 | 1 | -3/+45 |
| | | |||||
* | | Shortened enums | andrew | 2014-03-01 | 1 | -7/+7 |
| | | |||||
* | | Improved comments in float size check. | madmaxoft | 2014-03-01 | 1 | -2/+2 |
| | | |||||
* | | Better fix for the 32-bit float reading. | madmaxoft | 2014-02-28 | 1 | -4/+5 |
|/ | |||||
* | Fixed a gcc warning in FastNBT.h. | madmaxoft | 2014-02-26 | 1 | -2/+11 |
| | |||||
* | Merge pull request #710 from TheJumper/master | Mattes D | 2014-02-24 | 3 | -0/+198 |
|\ | | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops | ||||
| * | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 3 | -0/+198 |
| | | |||||
| * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-23 | 4 | -18/+18 |
| | | |||||
| * | Add Heads completely | Howaner | 2014-02-23 | 1 | -1/+1 |
| | | |||||
| * | Add Skulls/Heads | Howaner | 2014-02-23 | 4 | -5/+64 |
| | | |||||
* | | Fixed MCServer not compiling with C++03 compilers | STRWarrior | 2014-02-24 | 1 | -2/+2 |
| | | |||||
* | | Maps: Improvements | andrew | 2014-02-23 | 1 | -1/+5 |
| | | |||||
* | | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 4 | -5/+66 |
|\ \ | |||||
| * \ | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 4 | -5/+64 |
| |\ \ | | |/ | |/| | Add Skulls/Heads to MCServer | ||||
| | * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 4 | -18/+18 |
| | | | |||||
| | * | Add Heads completely | Howaner | 2014-02-18 | 1 | -1/+1 |
| | | | |||||
| | * | Add Skulls/Heads | Howaner | 2014-02-17 | 4 | -5/+64 |
| | | | |||||
| * | | 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!) | ||||
* | | Documented cMap | andrew | 2014-02-19 | 1 | -0/+2 |
| | | |||||
* | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 2 | -4/+14 |
| | | |||||
* | | Send map when selected | andrew | 2014-02-14 | 1 | -3/+6 |
| | | |||||
* | | IDCount Serialization | andrew | 2014-02-13 | 2 | -1/+103 |
| | | |||||
* | | Implementation of in-game maps | andrew | 2014-02-13 | 2 | -0/+241 |
|/ | |||||
* | Fixed #573 | STRWarrior | 2014-02-12 | 1 | -4/+4 |
| | |||||
* | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 1 | -2/+2 |
| | |||||
* | Partial fix for #130 | Tiger Wang | 2014-02-03 | 1 | -0/+1 |
| | |||||
* | Added saving of angry flag. | Kirill Kirilenko | 2014-02-02 | 2 | -0/+7 |
| | |||||
* | Fixed sitting tag. | Kirill Kirilenko | 2014-02-02 | 2 | -5/+5 |
| | |||||
* | Added saving of collar's color. | Kirill Kirilenko | 2014-02-01 | 2 | -4/+11 |
| | |||||
* | Added reading saved state of the wolf (sitting or standing). | Kirill Kirilenko | 2014-01-31 | 1 | -0/+6 |
| | |||||
* | Inversed condition. | STRWarrior | 2014-01-31 | 1 | -1/+1 |
| | |||||
* | Wolf: If Owner tag is missing a normal ownerless wolf will spawn. | STRWarrior | 2014-01-31 | 1 | -9/+6 |
| | |||||
* | Fixed bad variable. | STRWarrior | 2014-01-30 | 1 | -1/+1 |
| | |||||
* | Check if the tag is found. | STRWarrior | 2014-01-30 | 1 | -0/+5 |
| | |||||
* | Fixes #606 | STRWarrior | 2014-01-30 | 2 | -2/+9 |
| | |||||
* | Item-loading now checks for weird bytes. | madmaxoft | 2014-01-26 | 1 | -3/+9 |
| | |||||
* | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 2 | -0/+201 |
|\ | | | | | More Interfaces to decouple Generator from the rest of the code | ||||
| * | Fixed exports | Tycho | 2014-01-25 | 1 | -4/+1 |
| | | |||||
| * | Fixed spelling error | Tycho | 2014-01-22 | 2 | -1/+1 |
| | | |||||
| * | Added manual bindings for moved functions | Tycho | 2014-01-22 | 1 | -2/+4 |
| | | |||||
| * | formatting changes | Tycho | 2014-01-22 | 2 | -6/+26 |
| | | |||||
| * | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-22 | 3 | -1/+442 |
| |\ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | Actually implemented interfaces | Tycho | 2014-01-20 | 2 | -21/+28 |
| | | | |||||
| * | | Moved Schematic file methods to seperate class | Tycho | 2014-01-20 | 2 | -0/+175 |
| | | | |||||
* | | | Fixed a few compile-time and runtime warnings in ScoreboardSerializer. | madmaxoft | 2014-01-24 | 1 | -8/+4 |
| | | | |||||
* | | | Fixed crash with failed entity-loading. | madmaxoft | 2014-01-24 | 1 | -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 structure | andrew | 2014-01-23 | 1 | -5/+6 |
| | | | |||||
* | | | Fixed scoreboard serialization | andrew | 2014-01-23 | 1 | -35/+26 |
| | | | |||||
* | | | Improved code safety for the Compact world storage. | Mattes D | 2014-01-23 | 1 | -104/+72 |
| | | | | | | | | | | | | That was a huge chunk of smelly code. | ||||
* | | | Command block fixes 2 | andrew | 2014-01-23 | 2 | -17/+40 |
| |/ |/| | |||||
* | | cWorld now saves/loads the scoreboard | andrew | 2014-01-22 | 1 | -5/+10 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 4 | -2/+109 |
|\| | |||||
| * | Merge pull request #569 from worktycho/EnchantmentsFix | Mattes D | 2014-01-19 | 4 | -2/+109 |
| |\ | | | | | | | Enchantments fix | ||||
| | * | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 4 | -10/+11 |
| | | | |||||
| | * | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 4 | -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 support | andrew | 2014-01-21 | 1 | -0/+4 |
| | | | |||||
* | | | Scoreboard serialization | andrew | 2014-01-20 | 1 | -5/+72 |
| | | | |||||
* | | | Scoreboard deserialization | andrew | 2014-01-20 | 3 | -1/+366 |
|/ / | |||||
* | | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 1 | -1/+1 |
| | | |||||
* | | Command blocks: Execute() | andrew | 2014-01-18 | 1 | -1/+1 |
| | | |||||
* | | Command block (de)serialization | andrew | 2014-01-18 | 4 | -18/+80 |
|/ | |||||
* | Added user setting compression factor | Tycho | 2014-01-17 | 6 | -18/+25 |
| | |||||
* | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -1/+1 |
|\ | | | | | Added cWorld::SpawnMinecart. | ||||
| * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
| * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
* | | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 1 | -1/+1 |
| | | |||||
* | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 2 | -2/+2 |
|/ | |||||
* | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 1 | -5/+8 |
| | |||||
* | Fixed wrong enqueueing. | madmaxoft | 2014-01-06 | 1 | -2/+9 |
| | | | | Fixes #505. | ||||
* | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2014-01-02 | 2 | -8/+8 |
|\ | |||||
| * | More memory alignment fixes. | madmaxoft | 2014-01-02 | 1 | -3/+3 |
| | | | | | | | | Ref.: #420. | ||||
| * | Fixed unaligned memory access in FastNBT. | madmaxoft | 2014-01-02 | 1 | -5/+5 |
| | | | | | | | | This should fix #420. | ||||
* | | fixed a few remaining issues with worldstorage | Tycho Bickerstaff | 2014-01-02 | 2 | -24/+6 |
| | | |||||
* | | rewrote queue not to use promises for waits | Tycho Bickerstaff | 2014-01-02 | 2 | -15/+9 |
| | | |||||
* | | refactored chunk Queue to seperate class | Tycho Bickerstaff | 2013-12-31 | 2 | -97/+67 |
| | | |||||
* | | added link dependency between WorldStorage and OSSupport | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+2 |
|/ | |||||
* | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 3 | -12/+788 |
| | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 4 | -7/+15 |
|\ | |||||
| * | Attempt at fixing cChunkDef::Height signedness. | madmaxoft | 2013-12-20 | 2 | -3/+11 |
| | | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 2 | -4/+4 |
| | | |||||
* | | moved Worldstorage to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Moved json includes to where they are really needed. | madmaxoft | 2013-11-28 | 2 | -1/+1 |
| | |||||
* | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 2 | -2/+2 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 3 | -4/+4 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 3 | -4/+4 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 3 | -4/+4 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 10 | -0/+4925 |