Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |