Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'planetx/master' | Mattes D | 2014-12-11 | 1 | -4/+31 |
|\ | |||||
| * | 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 | 1 | -78/+148 |
| | | |||||
| * | Added Timestamp info to chunks in WSSAnvil | planetx | 2014-12-07 | 1 | -85/+44 |
| | | |||||
* | | 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 |
| | |||||
* | 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 | 1 | -0/+50 |
|/ | |||||
* | Fixed 1.8 world item format reading. | Howaner | 2014-10-29 | 1 | -2/+19 |
| | |||||
* | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -44/+44 |
| | |||||
* | 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 | 1 | -16/+27 |
| | |||||
* | Anvil: Arrow Tile tags are a short in Vanilla | Howaner | 2014-09-25 | 1 | -4/+21 |
| | |||||
* | Fixed hanging direction bugs. | Howaner | 2014-09-25 | 1 | -1/+1 |
| | |||||
* | Don't create two entity lists. | Howaner | 2014-09-24 | 1 | -7/+2 |
| | |||||
* | Merge branch 'master' into WorldLoader | Howaner | 2014-09-24 | 1 | -3/+17 |
|\ | |||||
| * | Anvil: Wolf collar color is a byte in Vanilla. | madmaxoft | 2014-09-23 | 1 | -3/+17 |
| | | | | | | | | | | 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 | 1 | -5/+34 |
|/ | |||||
* | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -21/+51 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | 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 loading empty chunks. | Mattes D | 2014-09-05 | 1 | -1/+7 |
| | | | | | | | | Reported on the Dropper map in #1307. | ||||
| * | 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. | ||||
| * | 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. | ||||
* | | Added CustomName saving. | Howaner | 2014-09-02 | 1 | -0/+13 |
|/ | |||||
* | WSSAnvil: Removed leftover debugging code. | madmaxoft | 2014-08-30 | 1 | -4/+0 |
| | |||||
* | Rewritten block entity loading. | Mattes D | 2014-08-29 | 1 | -200/+238 |
| | | | | | | 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. | ||||
* | 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. | ||||
* | Wolf uses UUID for owner. | madmaxoft | 2014-08-03 | 1 | -10/+59 |
| | | | | Fixes #1277. | ||||
* | 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 | 1 | -2/+2 |
| | |||||
* | Added beacon load/save. | Howaner | 2014-07-30 | 1 | -1/+49 |
| | |||||
* | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -6/+1 |
| | |||||
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -3/+4 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Moved potion static functions to EntityEffect to create splash potions through world | archshift | 2014-07-26 | 1 | -1/+1 |
| | | |||||
| * | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 1 | -2/+3 |
| | | | | | | | | Fixes #1196. | ||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Splash potions: Renamed PotionParticleType to PotionColor for clarity | archshift | 2014-07-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -19/+65 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -6/+6 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -4/+4 |
| | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType. | ||||
| * | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 1 | -7/+18 |
| |\ | |||||
| | * | Merge branch 'master' into Sheep | Howaner | 2014-07-13 | 1 | -5/+16 |
| | |\ | |||||
| | | * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -3/+7 |
| | | |\ | | | | | | | | | | | Implemented trapped chests & others | ||||
| | | | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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 | 1 | -0/+28 |
| | |/ | |/| | |||||
| * | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 1 | -2/+9 |
| |\ \ | | |/ | |/| | Fixes to projectiles and the undead | ||||
| | * | Suggestions | Tiger Wang | 2014-07-02 | 1 | -2/+9 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -14/+7 |
|\| | | |||||
| * | | Add entity health saving. | Howaner | 2014-06-24 | 1 | -14/+7 |
| |/ | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | 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. | ||||
* | | 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 | 1 | -0/+1 |
|/ | |||||
* | Fixed mob loading, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | |||||
* | More size_t fixes. | Mattes D | 2014-05-09 | 1 | -5/+5 |
| | |||||
* | Build fixes after the last size_t batch. | Mattes D | 2014-05-09 | 1 | -1/+1 |
| | |||||
* | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -4/+4 |
| | |||||
* | Merge pull request #989 from Howaner/Anvil | Mattes D | 2014-05-07 | 1 | -6/+28 |
|\ | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ... | ||||
| * | Change m_RepairCost to int. | Howaner | 2014-05-07 | 1 | -1/+1 |
| | | |||||
| * | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 1 | -6/+28 |
| | | |||||
* | | Fix MagmaCube save. | Howaner | 2014-05-07 | 1 | -2/+8 |
|/ | |||||
* | 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 | 1 | -1/+1 |
|\ | | | | | Add entity invulnerable | ||||
| * | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 1 | -1/+1 |
| | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| * | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | |||||
| * | Fixes | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | |||||
* | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 1 | -6/+6 |
| | | |||||
* | | 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 | 1 | -1/+1 |
|/ | |||||
* | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 1 | -1/+1 |
| | |||||
* | Merge pull request #833 from mc-server/EnderCrystal | Mattes D | 2014-03-25 | 1 | -0/+19 |
|\ | | | | | Ender crystals | ||||
| * | Ender crystals | andrew | 2014-03-25 | 1 | -0/+19 |
| | | |||||
* | | Wither invulnerability | andrew | 2014-03-24 | 1 | -1/+7 |
|/ | |||||
* | Merge pull request #809 from Howaner/BlockEntitys | Mattes D | 2014-03-16 | 1 | -26/+174 |
|\ | | | | | 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 | 1 | -2/+8 |
| |\ | |||||
| * | | Add item frame saving. | Howaner | 2014-03-15 | 1 | -0/+85 |
| | | | |||||
| * | | Add health and age load to pickup's. | Howaner | 2014-03-15 | 1 | -1/+15 |
| | | | |||||
| * | | Add ExpOrb saving. | Howaner | 2014-03-15 | 1 | -26/+70 |
| | | | |||||
* | | | Add new leaves to all classes. | Howaner | 2014-03-16 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Removed Some unnessicary macros | Tycho | 2014-03-10 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -0/+27 |
|\| | | | | | Add TNT load/save | ||||
| * | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -2/+1 |
| | | |||||
| * | Add TNT Save/Load and add Netbeans projects to .gitignore | Howaner | 2014-03-08 | 1 | -0/+28 |
| | | |||||
* | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -0/+36 |
|\| | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | Add Flower Pots | Howaner | 2014-03-07 | 1 | -0/+36 |
| | | |||||
* | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -0/+6 |
|/ | | | | + Added fireworks | ||||
* | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 1 | -0/+183 |
| | |||||
* | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-23 | 1 | -8/+8 |
| | |||||
* | Add Heads completely | Howaner | 2014-02-23 | 1 | -1/+1 |
| | |||||
* | Add Skulls/Heads | Howaner | 2014-02-23 | 1 | -0/+40 |
| | |||||
* | Fixed #573 | STRWarrior | 2014-02-12 | 1 | -4/+4 |
| | |||||
* | Added saving of angry flag. | Kirill Kirilenko | 2014-02-02 | 1 | -0/+6 |
| | |||||
* | Fixed sitting tag. | Kirill Kirilenko | 2014-02-02 | 1 | -4/+4 |
| | |||||
* | Added saving of collar's color. | Kirill Kirilenko | 2014-02-01 | 1 | -3/+9 |
| | |||||
* | 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 | 1 | -0/+7 |
| | |||||
* | Item-loading now checks for weird bytes. | madmaxoft | 2014-01-26 | 1 | -3/+9 |
| | |||||
* | 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 | ||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -1/+2 |
|\ | |||||
| * | Merge pull request #569 from worktycho/EnchantmentsFix | Mattes D | 2014-01-19 | 1 | -1/+2 |
| |\ | | | | | | | Enchantments fix | ||||
| | * | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 1 | -1/+1 |
| | | | |||||
| | * | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | Created a new class cEnchantmentSerializer to serilize Enchantments to NBT. This breaks a dependecy chain between cChunkGenerator and cWorld. cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments so having it seperate reduces the spread of the frein modifier | ||||
* | | | Scoreboard deserialization | andrew | 2014-01-20 | 1 | -1/+1 |
|/ / | |||||
* | | Command blocks: Execute() | andrew | 2014-01-18 | 1 | -1/+1 |
| | | |||||
* | | Command block (de)serialization | andrew | 2014-01-18 | 1 | -0/+42 |
|/ | |||||
* | Added user setting compression factor | Tycho | 2014-01-17 | 1 | -3/+4 |
| | |||||
* | 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 obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
|/ | |||||
* | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 1 | -6/+622 |
| | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
* | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -3/+3 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+1555 |