Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed metadata reading again. | Howaner | 2014-09-22 | 2 | -173/+7 |
| | |||||
* | Fixed item nbt reading. | Howaner | 2014-09-22 | 2 | -3/+168 |
| | |||||
* | Code improvements. | Howaner | 2014-09-19 | 4 | -38/+36 |
| | |||||
* | Updated SPAWNING_ENTITY hook description. | Howaner | 2014-09-19 | 1 | -2/+3 |
| | |||||
* | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 31 | -360/+648 |
|\ | |||||
| * | QtBiomeVisualiser: More gcc fixes. | madmaxoft | 2014-09-18 | 1 | -2/+2 |
| | | |||||
| * | QtBiomeVisualiser: Fixed linux compilation. | madmaxoft | 2014-09-18 | 5 | -0/+6 |
| | | |||||
| * | Fixed minor style issues. | madmaxoft | 2014-09-17 | 3 | -5/+5 |
| | | |||||
| * | Voronoi biomegen: Added JitterSize and OddRowOffset. | madmaxoft | 2014-09-17 | 3 | -88/+164 |
| | | |||||
| * | Updated SQLiteCpp. | madmaxoft | 2014-09-17 | 1 | -0/+0 |
| | | | | | | | | Our changes have made it into upstream, updating to sync with upstream master. | ||||
| * | Merge pull request #1437 from nesco/master | Mattes D | 2014-09-17 | 4 | -5/+32 |
| |\ | | | | | | | Implemented spectator gamemode. | ||||
| | * | Implementing Spectator Mode | nesco | 2014-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Adding some proprieties of the spectator game mode in player.cpp : - Players can't toss items - Players can't touch the ground | ||||
| | * | Update World.h | nesco | 2014-09-17 | 1 | -1/+1 |
| | | | |||||
| | * | Preparing 1.8 update | nesco | 2014-09-17 | 1 | -5/+15 |
| | | | |||||
| | * | Preparing 1.8 update | nesco | 2014-09-16 | 1 | -1/+2 |
| | | | | | | | | | Partially added Spectator gamemode | ||||
| | * | Preparing 1.8 update | nesco | 2014-09-16 | 1 | -0/+3 |
| | | | | | | | | | Added Spectator gamemode | ||||
| | * | Pre 1.8 release | nesco | 2014-09-16 | 1 | -0/+8 |
| | | | | | | | | | Added Spectator gamemode | ||||
| | * | Preparing 1.8 changes | nesco | 2014-09-16 | 1 | -0/+3 |
| | | | | | | | | | Added Spectator Gamemode | ||||
| | * | Pre 1.8 release | nesco | 2014-09-16 | 1 | -0/+2 |
| | | | | | | | | | Added Gamemode Spectator | ||||
| * | | Added an explicit setting for allowing BungeeCord handshake. | madmaxoft | 2014-09-17 | 3 | -1/+16 |
| | | | |||||
| * | | Fixed wrong url in the debuggers plugin | Howaner | 2014-09-17 | 1 | -1/+1 |
| | | | |||||
| * | | BungeeCord compatibility: don't overwrite UUID / properties. | madmaxoft | 2014-09-17 | 1 | -2/+10 |
| | | | |||||
| * | | Full BungeeCord compatibility. | madmaxoft | 2014-09-17 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | Fixes #1392. Fixes SpigotMC/BungeeCord#1211. | ||||
| * | | Initial BungeeCord support. | madmaxoft | 2014-09-17 | 4 | -1/+43 |
| |/ | | | | | | | Ref.: #1392 | ||||
| * | VoronoiMap: Added Jitter and OddRowOffset params. | madmaxoft | 2014-09-15 | 2 | -11/+55 |
| | | |||||
| * | QtBiomeVisualiser: Fixed colors and read failures. | madmaxoft | 2014-09-15 | 1 | -6/+5 |
| | | |||||
| * | QtBiomeVisualiser: Added reloading. | Mattes D | 2014-09-15 | 6 | -4/+49 |
| | | |||||
| * | QtBiomeVisualiser: removed multithreading. | Mattes D | 2014-09-15 | 2 | -65/+10 |
| | | | | | | | | It was slowing things down, the granularity is too fine. | ||||
| * | QtBiomeVisualiser: Added multithreading. | Mattes D | 2014-09-15 | 3 | -23/+102 |
| | | | | | | | | For some reason this makes the UI less responsive. | ||||
| * | QtBiomeVisualiser: Extended zoom down below 100%. | Mattes D | 2014-09-14 | 2 | -16/+80 |
| | | |||||
| * | QtBiomeVisualiser: Added mouse and keyboard view control. | Mattes D | 2014-09-14 | 2 | -4/+137 |
| | | | | | | | | Mouse dragging or WASD pans view, mouse wheel or QE zooms. | ||||
| * | QtBiomeVisualiser: Removed build-specific variables. | Mattes D | 2014-09-14 | 1 | -3/+0 |
| | | | | | | | | These should be set in the project configuration instead, passed directly to qmake. | ||||
| * | Removed the unused nightbuild script. | madmaxoft | 2014-09-14 | 1 | -209/+0 |
| | | |||||
| * | Merge pull request #1434 from Masy98/master | Alexander Harkness | 2014-09-14 | 1 | -0/+1 |
| |\ | | | | | | | Added me to the contributors list | ||||
| | * | Added me to the contributors list | Masy98 | 2014-09-14 | 1 | -0/+1 |
| |/ | |||||
* | | Derp | Howaner | 2014-09-18 | 1 | -1/+1 |
| | | |||||
* | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 14 | -531/+837 |
| | | |||||
* | | 1.8: Simplified item metadata reading. | Howaner | 2014-09-18 | 3 | -27/+3 |
| | | |||||
* | | Use xofts ReadPosition() code. | Howaner | 2014-09-17 | 1 | -3/+6 |
| | | |||||
* | | Fixed SQLiteCpp downgrade | Howaner | 2014-09-14 | 1 | -0/+0 |
| | | |||||
* | | Simplified WriteUUID() | Howaner | 2014-09-14 | 1 | -9/+9 |
| | | |||||
* | | Fixed warnings. | Howaner | 2014-09-14 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-14 | 58 | -2270/+1737 |
|\| | |||||
| * | Added new Qt-based biome visualiser. | Mattes D | 2014-09-14 | 37 | -2181/+1482 |
| | | | | | | | | Compile with Qt 5.1+ | ||||
| * | OSSupport: Fixed UNICODE Windows builds. | Mattes D | 2014-09-14 | 2 | -8/+8 |
| | | | | | | | | The files now compile even inside UNICODE applications. | ||||
| * | Improved cBlockHandler::DropBlock | Tiger Wang | 2014-09-13 | 5 | -46/+34 |
| | | |||||
| * | Entities experience water resistance | Tiger Wang | 2014-09-13 | 2 | -16/+31 |
| | | |||||
| * | Merge pull request #1353 from mc-server/Effects | Mattes D | 2014-09-13 | 13 | -16/+179 |
| |\ | | | | | | | Added speed entity effect. | ||||
| | * | Added extra mushroom handler. | Howaner | 2014-09-12 | 4 | -10/+60 |
| | | | |||||
| | * | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 133 | -1375/+2157 |
| | |\ | |||||
| | * | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() | Howaner | 2014-09-02 | 4 | -11/+11 |
| | | | | |||||
| | * | | Merge branch 'master' into Effects | Howaner | 2014-09-02 | 38 | -405/+954 |
| | |\ \ | |||||
| | * | | | Removed SexyMotd link | Howaner | 2014-08-30 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Added GetWalkSpeed() and SetWalkSpeed() documentation. | Howaner | 2014-08-30 | 2 | -0/+3 |
| | | | | | |||||
| | * | | | Fixed potion removing in creative mode. | Howaner | 2014-08-30 | 5 | -8/+16 |
| | | | | | |||||
| | * | | | Added slowness effect and added entity support. | Howaner | 2014-08-30 | 2 | -16/+65 |
| | | | | | |||||
| | * | | | Added SetWalkSpeed() to cMonster. | Howaner | 2014-08-30 | 2 | -0/+9 |
| | | | | | |||||
| | * | | | Merge branch 'master' into Effects | Howaner | 2014-08-30 | 12 | -223/+319 |
| | |\ \ \ | |||||
| | * | | | | Added speed entity effect. | Hownaer | 2014-08-28 | 3 | -1/+46 |
| | | | | | | |||||
| * | | | | | Gittip is now Gratipay | Alexander Harkness | 2014-09-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Also, 7000th Commit! | ||||
| * | | | | | Updated CI Links to new ones. | Alexander Harkness | 2014-09-13 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | 1.8: Updated scoreboard packets. | Howaner | 2014-09-13 | 1 | -3/+7 |
| | | | | | | |||||
* | | | | | | Moved chat json creating to the CompositeChat class. | Howaner | 2014-09-13 | 6 | -346/+192 |
| | | | | | | |||||
* | | | | | | 1.8: Fixed maps. | Howaner | 2014-09-13 | 12 | -45/+43 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 24 | -104/+185 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| * | | | | | Fixed friction being applied whilst airborne | Tiger Wang | 2014-09-12 | 1 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reported by tonibm9 in #1300. | ||||
| * | | | | | APIDump: Improved command binding documentation. | madmaxoft | 2014-09-12 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #1424 from Howaner/Fixes | Mattes D | 2014-09-12 | 21 | -85/+169 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Fixes | ||||
| | * | | | | Only drop flint or gravel, not both. | Howaner | 2014-09-12 | 1 | -2/+4 |
| | | | | | | |||||
| | * | | | | Fixed farmland issues. | Howaner | 2014-09-12 | 11 | -64/+75 |
| | | | | | | |||||
| | * | | | | Only place farmland if no block is upper than dirt/grass. | Howaner | 2014-09-12 | 1 | -1/+6 |
| | | | | | | |||||
| | * | | | | Added hoe interact sound. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Play placesound from the middle of the block. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fixed block place sounds. | Howaner | 2014-09-12 | 2 | -15/+27 |
| | | | | | | |||||
| | * | | | | Spawn exp if you break a mob spawner. | Howaner | 2014-09-12 | 6 | -4/+50 |
| | | | | | | |||||
| | * | | | | Disabled mobspawner itemdrop. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Players in survival mode are not allowed to break a bedrock. | Howaner | 2014-09-12 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -1/+2 |
|\| | | | | |||||
| * | | | | Fixed iron ore drop. | Howaner | 2014-09-12 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 2 | -0/+17 |
|\| | | | | |||||
| * | | | | Added flint drop and fence gate meta reset. | Howaner | 2014-09-12 | 2 | -0/+17 |
| | | | | | |||||
* | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 65 | -326/+260 |
|\| | | | | |||||
| * | | | | Fixed a redstone sim failure with droppers. | Mattes D | 2014-09-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tycho | 2014-09-10 | 2 | -3/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #1414 from Masy98/Crafting | Mattes D | 2014-09-10 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Fixed sign recipe | ||||
| | | * | | | | Fixed spacing | Masy98 | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fixed sign recipe | Masy98 | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Grammar fixes. | Alexander Harkness | 2014-09-10 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Cleaned up flags | Tycho | 2014-09-10 | 1 | -5/+4 |
| |/ / / / / | |||||
| * | | | | | Added MCServer_ prfix to env vars for versions | Tycho | 2014-09-10 | 2 | -9/+9 |
| | | | | | | |||||
| * | | | | | Merge pull request #1413 from mc-server/versionInfo | Alexander Harkness | 2014-09-10 | 6 | -0/+48 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added abilty to set build info | ||||
| | * | | | | | Added example for how to use version info to travis | Tycho | 2014-09-10 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Added abilty to set build info | Tycho | 2014-09-10 | 5 | -0/+44 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | build info is displayed at startup Fixes #1410 | ||||
| * | | | | | Merge pull request #1402 from Masy98/Sounds | Mattes D | 2014-09-10 | 50 | -299/+172 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | ||||
| | * | | | | | Removed old sound-configuration for SignPosts | Masy98 | 2014-09-09 | 1 | -6/+0 |
| | | | | | | | |||||
| | * | | | | | Removed old sound-configuration for Repeaters | Masy98 | 2014-09-09 | 1 | -6/+0 |
| | | | | | | | |||||
| | * | | | | | Removed old sound-configuration for Trapdoors | Masy98 | 2014-09-09 | 1 | -5/+0 |
| | | | | | | | |||||
| | * | | | | | Removed old sound-configuration for doors | Masy98 | 2014-09-09 | 2 | -10/+0 |
| | | | | | | | |||||
| | * | | | | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | Masy98 | 2014-09-09 | 45 | -272/+172 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1399 from mc-server/warnings | Mattes D | 2014-09-09 | 3 | -17/+29 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Warnings | ||||
| | * | | | | | Actually set default | worktycho | 2014-09-09 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | use the correct ASSERT | worktycho | 2014-09-08 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | FIxed a couple more warnings | Tycho | 2014-09-08 | 1 | -2/+8 |
| | | | | | | | |||||
| | * | | | | | TimeOfDay does not need to be an Int64 | Tycho | 2014-09-08 | 3 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | Fixed a few compile warnings | Tycho | 2014-09-08 | 1 | -9/+14 |
| | | | | | | | |||||
| * | | | | | | Update Zip2008_PDBs.list | Alexander Harkness | 2014-09-09 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Update Zip2008.list | Alexander Harkness | 2014-09-09 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Fixed many right click issues. | Howaner | 2014-09-12 | 2 | -7/+17 |
| | | | | | | | |||||
* | | | | | | | Fixed wrong buffer length in the 1.8 protocol. | Howaner | 2014-09-12 | 1 | -10/+4 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed ReadItem() | Howaner | 2014-09-12 | 2 | -20/+40 |
| | | | | | | | |||||
* | | | | | | | 1.8: Added difficulty sending | Howaner | 2014-09-12 | 1 | -0/+6 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed block entities. | Howaner | 2014-09-12 | 1 | -8/+2 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed eating. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed workbench, enchanting and anvil window. | Howaner | 2014-09-12 | 1 | -3/+19 |
| | | | | | | | |||||
* | | | | | | | 1.8: Enderman, byte -> short | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed enderman spawning. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed inventory open packet. | Howaner | 2014-09-11 | 3 | -4/+32 |
| | | | | | | | |||||
* | | | | | | | Removed GetProtocolVersion() from the protocols. | Howaner | 2014-09-11 | 7 | -19/+6 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed sign placing. | Howaner | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | 1.8: Fixed hangings. | Howaner | 2014-09-11 | 4 | -32/+89 |
| | | | | | | | |||||
* | | | | | | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 19 | -38/+115 |
| | | | | | | | |||||
* | | | | | | | 1.8: Added MultiBlockChange packet. | Howaner | 2014-09-09 | 4 | -54/+86 |
| | | | | | | | |||||
* | | | | | | | Downgrade SQLiteCpp again | Howaner | 2014-09-09 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 16 | -31/+108 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-09 | 62 | -850/+1589 |
|\| | | | | | | |||||
| * | | | | | | capitalisation error | worktycho | 2014-09-08 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1397 from mc-server/saveSetting | Mattes D | 2014-09-08 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | If server fails init, save any changed or generated settings. | ||||
| | * | | | | | derp | worktycho | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | If server fails init, save any changed or generated settings. | worktycho | 2014-09-08 | 1 | -0/+1 |
| |/ / / / / | |||||
| * / / / / | Exported cClientHandle:GetIPString() to Lua API. | Mattes D | 2014-09-07 | 2 | -1/+2 |
| |/ / / / | |||||
| * | | | | Webadmin: Added default ports to auto-generated ini file. | Mattes D | 2014-09-07 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | Fixes #1382. | ||||
| * | | | | WebAdmin: Added HTTPS instructions when cert / key is missing. | Mattes D | 2014-09-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fixed submodules' downgrade from the previous PR merge. | Mattes D | 2014-09-07 | 2 | -0/+0 |
| | | | | | |||||
| * | | | | Re-ordered the items.ini and added a few new names | Masy98 | 2014-09-06 | 1 | -291/+290 |
| | | | | | |||||
| * | | | | Merge branch 'master' into blocks | Masy98 | 2014-09-06 | 73 | -990/+1672 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/crafting.txt | ||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Masy98 | 2014-09-06 | 38 | -575/+762 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge pull request #1385 from mc-server/clangWarnings | Mattes D | 2014-09-06 | 2 | -6/+27 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Should now compile in clang 3.0 | ||||
| | | | * | | | | Update SetFlags.cmake | worktycho | 2014-09-06 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | | * | | | | Added workaround for clang version | Tycho | 2014-09-06 | 2 | -5/+16 |
| | | | | | | | | |||||
| | | | * | | | | bumped cmake version min and fixed clang support | Tycho | 2014-09-06 | 2 | -3/+3 |
| | | | | | | | | |||||
| | | | * | | | | Wrong cmake var | worktycho | 2014-09-06 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | | * | | | | Improve error message | worktycho | 2014-09-06 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | | * | | | | Should now compile in clang 3.0 | worktycho | 2014-09-06 | 1 | -5/+16 |
| | | | | | | | | |||||
| | | * | | | | | Added missing newline. | Mattes D | 2014-09-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Removed chunk's unused Y coord. | Mattes D | 2014-09-06 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the second issue of #1313. | ||||
| | | * | | | | | Added Y-wise asserts to signs. | Mattes D | 2014-09-06 | 3 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help detect #1313's second case. | ||||
| | | * | | | | | Alpha-sorted protocol 1.7 senders. | Mattes D | 2014-09-06 | 1 | -7/+7 |
| | | | | | | | | |||||
| | | * | | | | | Fixed player spawning in unknown world. | Mattes D | 2014-09-06 | 1 | -0/+4 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | This may happen if the admin removes a world. | ||||
| | | * | | | | Win build: put third party licenses into a separate folder. | madmaxoft | 2014-09-06 | 6 | -5/+1 |
| | | | | | | | |||||
| | | * | | | | 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. | ||||
| | | * | | | | Removed outdated message sending methods. | Alexander Harkness | 2014-09-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | Fixes #1381 | ||||
| | | * | | | | Merge pull request #1361 from mc-server/WebAdmin | Mattes D | 2014-09-06 | 9 | -348/+501 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Webadmin improvements | ||||
| | | | * | | | | Xoft fixes. | Alexander Harkness | 2014-09-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | * | | | | [WebAdmin] Code improvements. | Howaner | 2014-09-02 | 2 | -61/+99 |
| | | | | | | | | |||||
| | | | * | | | | Merge branch 'master' into WebAdmin | Howaner | 2014-09-02 | 27 | -293/+770 |
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| | | |||||
| | | | * | | | | WebAdmin: Exported logo and background. | Howaner | 2014-08-31 | 3 | -3/+3 |
| | | | | | | | | |||||
| | | | * | | | | WebAdmin: Stop webadmin if template can't load. | Howaner | 2014-08-31 | 1 | -1/+3 |
| | | | | | | | | |||||
| | | | * | | | | WebAdmin: Added favicon to the login template. | Howaner | 2014-08-31 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | | * | | | | WebAdmin: Exported favicon. | Howaner | 2014-08-31 | 2 | -4/+4 |
| | | | | | | | | |||||
| | | | * | | | | WebAdmin: Exported stylesheet in a own file. | Howaner | 2014-08-31 | 2 | -333/+329 |
| | | | | | | | | |||||
| | | | * | | | | WebAdmin: Added login template | Howaner | 2014-08-31 | 2 | -0/+24 |
| | | | | | | | | |||||
| | | | * | | | | WebAdmin: Added "files" folder and load the login template from login_template.html | Howaner | 2014-08-31 | 2 | -10/+102 |
| | | | | | | | | |||||
| | | * | | | | | WorldStorage no longer queues chunks into generator. | Mattes D | 2014-09-05 | 4 | -51/+17 |
| | | | | | | | | |||||
| | | * | | | | | Fixed loading empty chunks. | Mattes D | 2014-09-05 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on the Dropper map in #1307. | ||||
| | | * | | | | | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 9 | -107/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #1370. | ||||
| | | * | | | | | BiomeMultiCache is not used for simple generators. | Mattes D | 2014-09-05 | 1 | -21/+22 |
| | | | | | | | | |||||
| | | * | | | | | Fixed style. | Mattes D | 2014-09-05 | 3 | -9/+13 |
| | | | | | | | | |||||
| | | * | | | | | Fixed security: Player cannot spawn in a disabled world. | Mattes D | 2014-09-05 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Anvil: Fixed loading block entities with invalid Y coord. | Mattes D | 2014-09-05 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' | Masy98 | 2014-09-05 | 48 | -444/+935 |
| | |\| | | | | | |||||
| | | * | | | | | Merge pull request #1375 from mc-server/EntitiesInBox | Mattes D | 2014-09-04 | 13 | -1/+264 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Implemented ForEachEntityInBox | ||||
| | | | * | | | | | Fixed compilation after chunk Y removal. | madmaxoft | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | * | | | | | Merge remote-tracking branch 'origin/master' into EntitiesInBox | madmaxoft | 2014-09-04 | 32 | -262/+376 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Debuggers: Reviewed and fixed the Pickups and Poof commands. | madmaxoft | 2014-09-03 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now they're confirmed working. | ||||
| | | | * | | | | | | LuaState: Fixed class value-getting off the stack. | madmaxoft | 2014-09-03 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | | | * | | | | | | LuaState: Fixed referenced function pushing. | madmaxoft | 2014-09-03 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The references are no longer destroyed by the call. | ||||
| | | | * | | | | | | Debuggers: Added a test code for ForEachEntityInBox(). | madmaxoft | 2014-09-03 | 1 | -0/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently untested, may not run, may crash. | ||||
| | | | * | | | | | | Exported ForEachEntityInBox() to Lua API. | madmaxoft | 2014-09-03 | 2 | -0/+71 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Added cWorld::ForEachEntityInBox() | madmaxoft | 2014-09-03 | 8 | -0/+117 |
| | | | | | | | | | | |||||
| | | | * | | | | | | cBoundingBox: Added accessors. | madmaxoft | 2014-09-03 | 1 | -0/+11 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge pull request #1371 from DayBr3ak/master | Mattes D | 2014-09-04 | 3 | -2/+92 |
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | issue381, multicache for cBioGen | ||||
| | | | * | | | | | | change to linear calculation | DayBr3ak | 2014-09-03 | 2 | -9/+7 |
| | | | | | | | | | | |||||
| | | | * | | | | | | adapting format | DayBr3ak | 2014-09-03 | 3 | -7/+14 |
| | | | | | | | | | | |||||
| | | | * | | | | | | forgot this one | DayBr3ak | 2014-09-02 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| | | | * | | | | | | opting for size_t | DayBr3ak | 2014-09-02 | 2 | -5/+5 |
| | | | | | | | | | | |||||
| | | | * | | | | | | fixing memory leak | DayBr3ak | 2014-09-02 | 1 | -4/+5 |
| | | | | | | | | | | |||||
| | | | * | | | | | | changing implem, using vectors | DayBr3ak | 2014-09-02 | 2 | -98/+23 |
| | | | | | | | | | | |||||
| | | | * | | | | | | adding config file entry #381 | DayBr3ak | 2014-09-02 | 1 | -1/+10 |
| | | | | | | | | | | |||||
| | | | * | | | | | | adding the multicache behavior | DayBr3ak | 2014-09-02 | 3 | -4/+119 |
| | | | | | | | | | | |||||
| | | | * | | | | | | added multicache class definition | DayBr3ak | 2014-09-01 | 1 | -0/+35 |
| | | | | | | | | | | |||||
| | | * | | | | | | | 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. | ||||
| | | * | | | | | | | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" | archshift | 2014-09-04 | 4 | -62/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 472efa8174626a00ffdf5b39e1a44ac419cd3698. Apparently we don't support some of these features quite yet (darn you C++98!) | ||||
| | | * | | | | | | | In 1.8, carrots and potatoes yield one less hunger point. | archshift | 2014-09-04 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc | archshift | 2014-09-04 | 4 | -29/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snow Golems must also be above 64Y to spawn snow (as of 1.8). | ||||
| | | * | | | | | | | ChunkGenerator: Log world seed when creating a new one. | madmaxoft | 2014-09-03 | 1 | -3/+14 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Added cIniFile::HasValue() function. | madmaxoft | 2014-09-03 | 2 | -0/+23 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Updated SQLiteCpp. | madmaxoft | 2014-09-03 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix #1374. | ||||
| | | * | | | | | | | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 18 | -230/+237 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove y-coord from chunks | ||||
| | | | * | | | | | | | commit | LO1ZB | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | re-add the missing "s" too cChunkCoordsWithBoolList | LO1ZB | 2014-09-03 | 3 | -6/+6 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 5 | -23/+41 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | fix possibility of a twice generated chunk | LO1ZB | 2014-09-01 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | remove orphaned comment. | LO1ZB | 2014-08-30 | 1 | -4/+0 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | me being stupid | LO1ZB | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | add comments | LO1ZB | 2014-08-29 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | fix chunk regenerating | LO1ZB | 2014-08-29 | 3 | -9/+9 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | remove y-coord from chunks | LO1ZB | 2014-08-28 | 18 | -217/+208 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added new recipes! | Masy98 | 2014-09-02 | 1 | -4/+19 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Seperated "custom" names list from the normal list in items.ini! | Masy98 | 2014-09-02 | 2 | -197/+328 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Fixed typo! | Masy98 | 2014-09-02 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added missing recipes! | Masy98 | 2014-09-02 | 1 | -6/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Seperated the "custom" names from the normal list! | Masy98 | 2014-09-02 | 1 | -193/+326 |
| | | | | | | | | | | |||||
* | | | | | | | | | | PlayerSpawn packet: Send the correct uuid. | Howaner | 2014-09-09 | 1 | -5/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | 1.8: Added new uuid field. | Howaner | 2014-09-09 | 3 | -17/+44 |
| | | | | | | | | | | |||||
* | | | | | | | | | | More fixes. | Howaner | 2014-09-08 | 3 | -12/+7 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Recoded cProtocol180 class. | Howaner | 2014-09-08 | 4 | -589/+2690 |
| | | | | | | | | | | |||||
* | | | | | | | | | | 1.8: Fixed tab complete. | Howaner | 2014-09-08 | 3 | -2/+20 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed more 1.8 packets. | Howaner | 2014-09-08 | 7 | -47/+313 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Updated chunk sending to 1.8 | Howaner | 2014-09-08 | 4 | -26/+22 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added GetProtocolVersion() to cProtocol. | Howaner | 2014-09-08 | 8 | -26/+29 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Implemented packet compression. | Howaner | 2014-09-08 | 7 | -35/+117 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChunkData packet needs this. | ||||
* | | | | | | | | | | Fixed client errors. | Howaner | 2014-09-04 | 5 | -52/+79 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added more 1.8 protocol things. | Howaner | 2014-09-04 | 6 | -14/+632 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Started implementing of the 1.8 protocol. | Howaner | 2014-09-04 | 7 | -7/+502 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Anvil: switched inflate to stream mode. | madmaxoft | 2014-09-03 | 3 | -18/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the fixed-size buffer which could have caused #1307 and #1366. | ||||
* | | | | | | | | | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 6 | -20/+20 |
| | | | | | | | | | |||||
* | | | | | | | | | Quick fix for a preprocessor error with clang on OS X | archshift | 2014-09-03 | 1 | -1/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Added mutton, which sheep now drop when killed | archshift | 2014-09-03 | 4 | -0/+13 |
| | | | | | | | | | |||||
* | | | | | | | | | EntityEffect.cpp: Enable 1.8's leaping potion | archshift | 2014-09-03 | 1 | -1/+1 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | 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 pull request #1350 from mc-server/Inventory | Mattes D | 2014-09-02 | 9 | -179/+175 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Enchanting table improvements. | ||||
| * | | | | | | | Changed the IsEnchantable() comment again. | Howaner | 2014-09-02 | 2 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into Inventory | Howaner | 2014-09-02 | 56 | -649/+1452 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Re-added alternate spellings of darkgraywool. | madmaxoft | 2014-09-02 | 1 | -0/+2 |
| | | | | | | | | |||||
* | | | | | | | | Re-updated the Core. | madmaxoft | 2014-09-02 | 1 | -0/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'masy/blocks' | madmaxoft | 2014-09-02 | 4 | -58/+212 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Added missing leather recipe! | Masy98 | 2014-09-01 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into blocks | Masy98 | 2014-09-01 | 24 | -271/+589 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/furnace.txt MCServer/items.ini | ||||
| * | | | | | | | | Fixed spacing and light gray wool name! | Masy98 | 2014-09-01 | 2 | -38/+40 |
| | | | | | | | | | |||||
| * | | | | | | | | Added furnace recipes! | Masy98 | 2014-08-31 | 2 | -17/+30 |
| | | | | | | | | | |||||
| * | | | | | | | | Added missing mossy stonebrick recipe! | Masy98 | 2014-08-31 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Added 1.8 recipes! | Masy98 | 2014-08-31 | 2 | -8/+80 |
| | | | | | | | | | |||||
| * | | | | | | | | Added 1.8 blocks and items! | Masy98 | 2014-08-31 | 1 | -1/+65 |
| | | | | | | | | | |||||
* | | | | | | | | | Pickups combine only within one chunk. | madmaxoft | 2014-09-01 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This greatly improves performance of the tick thread. | ||||
* | | | | | | | | | CopyBlocks test: decreased the test size. | madmaxoft | 2014-09-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just needlessly ate up test time; there's no need for such rigorous testing once the test started succeeding. | ||||
* | | | | | | | | | Fixed off-by-one errors in cChunkDef asserts. | madmaxoft | 2014-09-01 | 1 | -8/+8 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1368 from mc-server/coverityFixes | Mattes D | 2014-09-01 | 1 | -6/+24 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Make sure packets are valid | ||||
| * | | | | | | | Make sure packets are valid | worktycho | 2014-09-01 | 1 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 66408, 66409 and 72045 | ||||
* | | | | | | | | Fixed Bindings regeneration under MSVC. | madmaxoft | 2014-09-01 | 1 | -1/+6 |
| | | | | | | | | |||||
* | | | | | | | | Fixed previous commit's wrong assumptions. | madmaxoft | 2014-09-01 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The equipment-getting functions return a copy already, so we can't take a pointer, really. | ||||
* | | | | | | | | Fixed MSVC compilation, improved performance. | madmaxoft | 2014-09-01 | 1 | -30/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads. | ||||
* | | | | | | | | Fixed MSVC warning. | madmaxoft | 2014-09-01 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'Hircine/Enchantments' | madmaxoft | 2014-09-01 | 9 | -22/+323 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed style | Jaume Aloy | 2014-08-31 | 3 | -8/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Added a_Digger check | Jaume Aloy | 2014-08-30 | 2 | -30/+33 |
| | | | | | | | | | |||||
| * | | | | | | | | More Enchantments | Jaume Aloy | 2014-08-22 | 2 | -58/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added Thorns and Respiration enchantments | ||||
| * | | | | | | | | Protection Enchantments, some fixes | Jaume Aloy | 2014-08-21 | 4 | -15/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Protection echantments (fire, blast, feather falling, protection and projectile). It isn't finished, add secondary effects and optimize the code. - Removed some brackets. - Silk touch fixed. | ||||
| * | | | | | | | | Changed if in BlockHandler | Jaume Aloy | 2014-08-19 | 2 | -6/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixes | Jaume Aloy | 2014-08-19 | 6 | -50/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed m_TicksLeftBurning > 0 for IsOnFire() - Tried to do the changes in BlockHandler.cpp - Removed m_Creator in ArrowEntity - Added m_Enchantments in ProjectileEntity CreatorData - Added blank lines between functions | ||||
| * | | | | | | | | Changed if for switch | Jaume Aloy | 2014-08-19 | 3 | -15/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | Added more enchantments and some fixes | Jaume Aloy | 2014-08-19 | 6 | -23/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect | ||||
| * | | | | | | | | Added some Enchantments | Jaume Aloy | 2014-08-19 | 4 | -7/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bow enchantments: Infinity, Flame and Power - Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite, Sharpness | ||||
* | | | | | | | | | Avoid false positive in style check. | madmaxoft | 2014-09-01 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1365 from mc-server/coverityFixes | Mattes D | 2014-09-01 | 4 | -9/+9 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Coverity fixes | ||||
| * | | | | | | | | Fixed style. | madmaxoft | 2014-09-01 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Removed isDone check | worktycho | 2014-08-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The same data is returned by executeStep so why execute a call when you have the data. | ||||
| * | | | | | | | | Changed null check to assert | worktycho | 2014-08-31 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the null check to clarify that the function should not be called before the entity has been attached to a world. | ||||
| * | | | | | | | | Delete the entity before removing from the list | worktycho | 2014-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Old code was calling dereference on invalid iterator | ||||
| * | | | | | | | | Init RankMgr pointer to NULL | worktycho | 2014-08-31 | 1 | -1/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1363 from mc-server/FurnaceRecipes | Mattes D | 2014-09-01 | 6 | -211/+175 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Rewritten furnace.txt loading | ||||
| * | | | | | | | | Use std::auto_ptr | Howaner | 2014-08-31 | 1 | -6/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed compile warnings. | Howaner | 2014-08-31 | 2 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed wrong doxy-comment. | Howaner | 2014-08-31 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Rewrited furnace.txt | Howaner | 2014-08-31 | 2 | -49/+53 |
| | | | | | | | | | |||||
| * | | | | | | | | Rewrited furnace.txt loading. | Howaner | 2014-08-31 | 4 | -159/+119 |
| |/ / / / / / / | |||||
* / / / / / / / | Fixed ReplaceString() documentation. | Howaner | 2014-09-01 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1357 from mc-server/leafFix | Mattes D | 2014-08-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Check range of y in HasNearLog | ||||
| * | | | | | | Check range of y in HasNearLog | worktycho | 2014-08-31 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | Fixes #803 | ||||
* | | | | | | Merge pull request #1355 from mc-server/fixes | STRWarrior | 2014-08-30 | 10 | -83/+93 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixes | ||||
| * | | | | | | Fixed style. | madmaxoft | 2014-08-30 | 2 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into fixes | madmaxoft | 2014-08-30 | 10 | -251/+406 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | WSSAnvil: Removed leftover debugging code. | madmaxoft | 2014-08-30 | 1 | -4/+0 |
| | | | | | | | |||||
* | | | | | | | Fixed MSVC2008 compilation. | madmaxoft | 2014-08-30 | 1 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was getting confused about which sqrt() overload to call. | ||||
* | | | | | | | Merge pull request #1340 from Masy98/crafting | Mattes D | 2014-08-30 | 2 | -16/+82 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Added missing recipes for stairs and slabs | ||||
| * | | | | | | Fixed missing slab name in line 297 | Masy98 | 2014-08-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into crafting | Masy98 | 2014-08-30 | 88 | -1562/+4865 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | cChunk: Fixed the Coords param. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Rewritten block entity loading. | Mattes D | 2014-08-29 | 7 | -215/+308 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | Fixed slab name | Masy98 | 2014-08-21 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Added missing recipes for stairs and slabs! | Masy98 | 2014-08-21 | 2 | -4/+5 |
| | | | | | | | |||||
| * | | | | | | Added missing recipes for stairs and slabs! | Masy98 | 2014-08-21 | 1 | -12/+30 |
| | | | | | | | |||||
| * | | | | | | Changed new logs from wood to log! | Masy98 | 2014-08-21 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Added missing blocks in item.ini | Masy98 | 2014-08-21 | 1 | -2/+49 |
| | | | | | | | |||||
| | * | | | | | Updated Core | Tiger Wang | 2014-08-29 | 1 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | A better hotfix for CraftingRecipies | Tiger Wang | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 163 | -2366/+5937 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/Server.cpp | ||||
* | | | | | | | VanillaFluidSimulator: Fixed an invalid Y-coord query. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing a spam of console messages, along with possible server crash, when liquids passed below the world: http://forum.mc-server.org/showthread.php?tid=1508&pid=15632#pid15632 | ||||
* | | | | | | | Fixed conversion warning. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Fixed spaces. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Hotfixed recipe.txt loading. | Hownaer | 2014-08-29 | 3 | -5/+8 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Fire can be destroyed with the sword in creative-mode | Hownaer | 2014-08-28 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Hownaer | 2014-08-28 | 14 | -41/+197 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #1323 from mc-server/CraftingFixes | Mattes D | 2014-08-28 | 13 | -39/+105 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed a couple of issues in craftingRecipes.cpp | ||||
| | * | | | | | | Final template keyword style fix. | Mattes D | 2014-08-28 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | More template keyword fixes. | Mattes D | 2014-08-28 | 5 | -16/+16 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into CraftingFixes | Mattes D | 2014-08-28 | 125 | -2173/+5248 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | CheckBasicStyle: Added checking for the "template" keyword. | Mattes D | 2014-08-28 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed spaces after "template" keyword. | Mattes D | 2014-08-28 | 5 | -14/+14 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed comments | Tycho | 2014-08-13 | 1 | -5/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Added missing header | Tycho | 2014-08-13 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed Integer pasing warnings in CraftingRecipies.cpp | Tycho | 2014-08-13 | 2 | -4/+64 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed type issues in CraftingRecipe.cpp | Tycho | 2014-08-13 | 2 | -5/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed forgotten error checking | Tycho | 2014-08-13 | 1 | -1/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed a typo. | Mattes D | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1324 from ChriPiv/master | Mattes D | 2014-08-28 | 1 | -2/+92 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | Implement ability to push minecarts on curved rails | ||||
| | * | | | | | | | Change comment formatting | Christophe Piveteau | 2014-08-24 | 1 | -20/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Adjust comment formatting | Christophe Piveteau | 2014-08-18 | 1 | -20/+40 |
| | | | | | | | | | |||||
| | * | | | | | | | Added a lot of comments | Christophe Piveteau | 2014-08-15 | 1 | -30/+36 |
| | | | | | | | | | |||||
| | * | | | | | | | Clarify comment message | Christophe Piveteau | 2014-08-15 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | End of comment moved away from new line | Christophe Piveteau | 2014-08-15 | 1 | -2/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add some comments | Christophe Piveteau | 2014-08-15 | 1 | -10/+21 |
| | | | | | | | | | |||||
| | * | | | | | | | Further changes in coding style | Christophe Piveteau | 2014-08-14 | 1 | -38/+28 |
| | | | | | | | | | |||||
| | * | | | | | | | Further fixing of coding style errors | Christophe Piveteau | 2014-08-13 | 1 | -26/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | Another intendation error | Christophe Piveteau | 2014-08-13 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed braces and intendation errors | Christophe Piveteau | 2014-08-13 | 1 | -3/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Implement ability to push minecarts on curved rails | Christophe Piveteau | 2014-08-13 | 1 | -2/+70 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed anvil placing. | Hownaer | 2014-08-28 | 1 | -5/+6 |
|/ / / / / / / / | |||||
| | | | * | | | | Added new console command with cleanup | Tiger Wang | 2014-08-29 | 2 | -28/+45 |
| | | | | | | | | |||||
| | | | * | | | | Improved explosion damage | Tiger Wang | 2014-08-29 | 2 | -48/+28 |
| | | | | | | | | |||||
| | | | * | | | | Removed unused code | Tiger Wang | 2014-08-29 | 3 | -3/+1 |
| | | | | | | | | |||||
| | | | * | | | | Improved command block security | Tiger Wang | 2014-08-29 | 1 | -6/+19 |
| | | | | | | | | |||||
| | | | | | * | | Changed the IsEnchantable() comment. | Howaner | 2014-08-30 | 2 | -2/+3 |
| | | | | | | | | |||||
| | | | | | * | | APIDump: Added missing cItem things. | Hownaer | 2014-08-28 | 2 | -4/+9 |
| | | | | | | | | |||||
| | | | | | * | | Added comments. | Hownaer | 2014-08-28 | 1 | -1/+3 |
| | | | | | | | | |||||
| | | | | | * | | Fixed bad values in the IsEnchantable() method. | Hownaer | 2014-08-28 | 2 | -5/+17 |
| | | | | | | | | |||||
| | | | | | * | | Fixed crashes and use std::swap. | Hownaer | 2014-08-28 | 4 | -26/+43 |
| | | | | | | | | |||||
| | | | | | * | | Enchanting table improvements. | Hownaer | 2014-08-28 | 5 | -154/+113 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Fixed ItemCategory code example. | Hownaer | 2014-08-28 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Fixed mob burning. | reiter | 2014-08-28 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | | | | | | | Fixes #1298 | ||||
* | | | | | | DungeonRooms: Fixed an off-by-one error. | Mattes D | 2014-08-27 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Debuggers: Added a testcase for OnProjectileHitBlock. | Mattes D | 2014-08-27 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is a test for #1326. | ||||
* | | | | | | More basic style fixes. | Mattes D | 2014-08-27 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Fixed basic style violations. | Mattes D | 2014-08-27 | 2 | -13/+11 |
| | | | | | | |||||
* | | | | | | CheckBasicStyle: Relaxed the "space after comma". | Mattes D | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | An apostrophe directly following a comma is not a violation. | ||||
* | | | | | | Merge pull request #1345 from mc-server/DungeonRoomsFinisher | Mattes D | 2014-08-27 | 7 | -7/+359 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added dungeon rooms finisher. | ||||
| * | | | | | | DungeonRooms: Added a height probability distribution function. | Mattes D | 2014-08-27 | 3 | -9/+19 |
| | | | | | | | |||||
| * | | | | | | DungeonRooms: Added the spawner in the center of the room. | Mattes D | 2014-08-27 | 1 | -0/+15 |
| | | | | | | | |||||
| * | | | | | | DungeonRooms: Chests are never placed next to each other. | Mattes D | 2014-08-26 | 1 | -22/+27 |
| | | | | | | | |||||
| * | | | | | | DungeonRooms: Random pattern for floors. | Mattes D | 2014-08-26 | 1 | -1/+32 |
| | | | | | | | |||||
| * | | | | | | DungeonRooms: Replaced explicit switch with CanBeTerraformed(). | Mattes D | 2014-08-26 | 1 | -11/+3 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into DungeonRoomsFinisher | Mattes D | 2014-08-26 | 24 | -694/+3478 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Profiling: Added profiling script for x64 executable. | Mattes D | 2014-08-26 | 3 | -6/+12 |
| | | | | | | | | |||||
| * | | | | | | | VS Profiling: Shutdown the profiler on error. | Mattes D | 2014-08-26 | 1 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Added initial dungeon rooms finisher. | Mattes D | 2014-08-26 | 4 | -0/+289 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1346 from mc-server/AnvilStatsHeights | Mattes D | 2014-08-27 | 8 | -16/+187 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Anvil stats heights | ||||
| * | | | | | | | | AnvilStats: Fixed thread start race condition. | Mattes D | 2014-08-27 | 2 | -10/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whole program would sometimes fail to process anything because the threads were waited-for before they were started. | ||||
| * | | | | | | | | AnvilStats: Added per-height spawner stats. | Mattes D | 2014-08-27 | 2 | -4/+47 |
| | | | | | | | | | |||||
| * | | | | | | | | AnvilStats: Ignoring output XLS files. | Mattes D | 2014-08-27 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | AnvilStats: Added cmake directive for larger executable stack. | Mattes D | 2014-08-27 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes runtime "stack overflow" errors caused by large stack-allocated arrays used for decompression. | ||||
| * | | | | | | | | AnvilStats: Fixed Win64 compilation. | Mattes D | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | AnvilStats: initial per-height blocktype implementation (WIP). | madmaxoft | 2014-08-27 | 3 | -5/+96 |
|/ / / / / / / / | |||||
* | / / / / / / | AnvilStats: Rewritten to use CMake. | madmaxoft | 2014-08-27 | 4 | -523/+126 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1290 from mc-server/Ranks | Mattes D | 2014-08-26 | 24 | -694/+3478 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Rewriting permission system to use UUIDs and Ranks | ||||
| * | | | | | | RankMgr: Exported the default-rank functions. | Mattes D | 2014-08-24 | 2 | -6/+69 |
| | | | | | | | |||||
| * | | | | | | RankMgr: Default rank is applied to players without any rank. | Mattes D | 2014-08-24 | 3 | -60/+21 |
| | | | | | | | |||||
| * | | | | | | RankMgr: Unified function signature comments in the bindings. | Mattes D | 2014-08-23 | 2 | -28/+36 |
| | | | | | | | |||||
| * | | | | | | RankMgr: Implemented default rank, added defaults. | Mattes D | 2014-08-23 | 3 | -24/+198 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into Ranks | Mattes D | 2014-08-22 | 84 | -875/+1044 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | cMojangAPI updates cRankManager's playernames. | Mattes D | 2014-08-21 | 4 | -2/+87 |
| | | | | | | | | |||||
| * | | | | | | | RankMgr: Added cRankManager::RemovePlayerRank(). | Mattes D | 2014-08-21 | 4 | -0/+60 |
| | | | | | | | | |||||
| * | | | | | | | Removed last remnant of cGroup. | Mattes D | 2014-08-21 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Removed Group.h from Bindings' dependencies. | Mattes D | 2014-08-21 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Removed the cGroup and cGroupManager classes. | Mattes D | 2014-08-21 | 1 | -25/+2 |
| | | | | | | | | |||||
| * | | | | | | | Removed cGroup and cGroupManager. | Mattes D | 2014-08-21 | 10 | -395/+8 |
| | | | | | | | | |||||
| * | | | | | | | cMojangAPI: Fixed MakeUUID___() bindings. | Mattes D | 2014-08-21 | 2 | -4/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToLua would generate a shadow return value for the input strings. | ||||
| * | | | | | | | Updated the Core. | Mattes D | 2014-08-20 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Exported cServer:ShouldAuthenticate to Lua API. | Mattes D | 2014-08-20 | 2 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | cPlayer: Exported the LoadRank function to Lua API. | Mattes D | 2014-08-20 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Added cRankManager documentation. | Mattes D | 2014-08-20 | 1 | -0/+56 |
| | | | | | | | | |||||
| * | | | | | | | RankMgr bindings: fixed GetRankVisuals return value. | Mattes D | 2014-08-20 | 1 | -18/+22 |
| | | | | | | | | |||||
| * | | | | | | | RankMgr: Fixed an ignored return value in the API. | Mattes D | 2014-08-20 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | cPlayer reads ranks from cRankManager. | Mattes D | 2014-08-19 | 3 | -263/+139 |
| | | | | | | | | |||||
| * | | | | | | | RankMgr: Removed unneeded testing code. | madmaxoft | 2014-08-14 | 1 | -208/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into Ranks | madmaxoft | 2014-08-14 | 18 | -77/+91 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | RankMgr: Fixed multithreading issues. | madmaxoft | 2014-08-13 | 2 | -49/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only one thread is allowed to interact with a SQLite::Database object at a time. Additionally, improved performance of the migration by wrapping the entire thing in a transaction. | ||||
| * | | | | | | | | RankMgr: Initial migration code. | madmaxoft | 2014-08-13 | 3 | -1/+568 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranks | madmaxoft | 2014-08-12 | 15 | -81/+181 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed unchecked return values. | madmaxoft | 2014-08-11 | 1 | -3/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into Ranks | madmaxoft | 2014-08-09 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Debuggers: Disabled UUID and RankMgr tests. | madmaxoft | 2014-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | WebAdmin: Manually exported string conversion functions. | madmaxoft | 2014-08-09 | 2 | -6/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use. | ||||
| * | | | | | | | | | | WebAdmin: Added GetURLEncodedString(). | madmaxoft | 2014-08-09 | 2 | -1/+36 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | RankMgr: Added GetRankVisuals() function. | madmaxoft | 2014-08-09 | 3 | -5/+81 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranks | madmaxoft | 2014-08-09 | 12 | -28/+127 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Debuggers: Simple cRankManager test case. | madmaxoft | 2014-08-08 | 1 | -0/+13 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Exported cRankManager to LuaAPI. | madmaxoft | 2014-08-08 | 5 | -1/+894 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | cLuaState: Added GetStackValues() auto-generated templates. | madmaxoft | 2014-08-08 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will read consecutive values off the stack, each value of a type independent of the other values. Auto-generated because we don't have variadic templates in C++03. | ||||
| * | | | | | | | | | | | RankMgr: Finished API implementation. | madmaxoft | 2014-08-08 | 2 | -38/+401 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | RankMgr: Implemented GetXforY and GetAll APIs. | madmaxoft | 2014-08-08 | 2 | -18/+162 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | RankMgr: Implemented the basic API functions. | madmaxoft | 2014-08-08 | 2 | -60/+696 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | RankMgr: Renamed PermissionGroup to Group in API and PermGroup in DB. | madmaxoft | 2014-08-08 | 2 | -28/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Group" is SQL keyword and shouldn't be used as table name. | ||||
| * | | | | | | | | | | | RankMgr: Added SQL integer datatypes. | madmaxoft | 2014-08-05 | 1 | -5/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | RankMgr: More interface. | madmaxoft | 2014-08-05 | 1 | -2/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | RankMgr: Initial interface declaration. | madmaxoft | 2014-08-05 | 3 | -0/+258 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Type warning fixes. | Mattes D | 2014-08-25 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed a type warning. | Mattes D | 2014-08-25 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Assume POWER is big-endian, so it compiles. | Alexander Harkness | 2014-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [reference](http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros#POWER) We may want to come back and figure out if the processor is running in little-endian mode, but for now assume they're big-endian. | ||||
* | | | | | | | | | | | | Fixed item drop. | Howaner | 2014-08-22 | 1 | -14/+18 |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | Fixes #1341 | ||||
* | | | | | | | | | | | Fixed a warning in FastRandom. | Mattes D | 2014-08-22 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | World: Report chunk count for the spawn area. | Mattes D | 2014-08-22 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed cPlugin::OnPlayerMoving signature. | Mattes D | 2014-08-22 | 3 | -3/+3 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | cLuaState: Fixed Vector3<> names pushed to Lua. | Mattes D | 2014-08-22 | 2 | -5/+44 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | ToLua++ lib: Assert when usertype is not known. | Mattes D | 2014-08-22 | 1 | -4/+7 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Added initializers for class members. | Mattes D | 2014-08-21 | 14 | -9/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by Coverity, these weren't initialized. | ||||
* | | | | | | | | | | | cSetChunkData: Added missing initializers. | Mattes D | 2014-08-21 | 1 | -0/+3 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Added cWorld initializers. | Mattes D | 2014-08-21 | 1 | -0/+30 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed 1.7.2 login packet reading. | Mattes D | 2014-08-21 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1317. | ||||
* | | | | | | | | | | | Sorted the generated param count. | Mattes D | 2014-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed a compile-time warning in MSVC. | Mattes D | 2014-08-21 | 1 | -1/+1 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1314 from mc-server/Fire | Mattes D | 2014-08-21 | 2 | -33/+17 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed cancelled fire interact from all directions. | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into Fire | Howaner | 2014-08-20 | 78 | -860/+857 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Revert "Removes the fire if the block under the fire was broken." | Howaner | 2014-08-11 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01001d2a49a3366e9b1eccf938d5073ab9a2f06e. | ||||
| * | | | | | | | | | | | Removes the fire if the block under the fire was broken. | Howaner | 2014-08-11 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Moved the clicked-through block check to the top of the function. | Howaner | 2014-08-11 | 2 | -41/+17 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed cancelled fire interact from all directions. | Howaner | 2014-08-11 | 1 | -4/+12 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1339 from mc-server/Hooks | STRWarrior | 2014-08-20 | 9 | -42/+131 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | Added HOOK_SERVER_PING | ||||
| * | | | | | | | | | | | Renamed a_Motd to a_ServerDescription. | Howaner | 2014-08-20 | 7 | -14/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added a_ClientHandle to the HOOK_SERVER_PING hook. | Howaner | 2014-08-20 | 8 | -10/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added "HOOK_SERVER_PING" call to older protocols | Howaner | 2014-08-20 | 1 | -13/+12 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Cleaned up code. | Howaner | 2014-08-20 | 3 | -848/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added HOOK_SERVER_PING | Howaner | 2014-08-20 | 8 | -36/+926 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | First implementation of HOOK_SERVER_PING. | Howaner | 2014-08-16 | 5 | -0/+43 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1335 from mc-server/CodeFixes | Mattes D | 2014-08-20 | 30 | -154/+83 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Code formatting fixes. | ||||
| * | | | | | | | | | | | Removed old classes from the CMakeLists.txt | Howaner | 2014-08-20 | 1 | -2/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Code formatting fixes. | Howaner | 2014-08-19 | 29 | -152/+83 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Player: Silenced a few type conversion warnings. | Mattes D | 2014-08-18 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Player saving creates the "players" folder, if needed. | Mattes D | 2014-08-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1268. | ||||
* | | | | | | | | | | | SwamplandM: Fixed sometimes having no mountains. | STRWarrior | 2014-08-18 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1329 from mc-server/Move | Mattes D | 2014-08-16 | 7 | -10/+20 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Better OnPlayerMoving hook. | ||||
| * | | | | | | | | | | Updated HOOK_PLAYER_MOVING documentation. | Howaner | 2014-08-16 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Better OnPlayerMoving hook. | Howaner | 2014-08-16 | 6 | -9/+17 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1308 from mc-server/logger | Mattes D | 2014-08-15 | 24 | -612/+644 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | New Logging framework | ||||
| * | | | | | | | | | Removed an unneeded cast. | madmaxoft | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | File logger prefixes are 4 chars wide. | madmaxoft | 2014-08-13 | 1 | -6/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Logger: Fixed windows debug ODS logger, fixed-size file prefixes. | madmaxoft | 2014-08-13 | 1 | -8/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Logger: Fixed missing timestamp in log messages. | madmaxoft | 2014-08-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed windows compilation and style issues. | madmaxoft | 2014-08-12 | 4 | -37/+177 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix messing rename | Tycho | 2014-08-12 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Renamed Loggers | Tycho | 2014-08-12 | 17 | -439/+418 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed Tools to work with new logging framework | Tycho | 2014-08-10 | 8 | -216/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added forgoten files | Tycho | 2014-08-10 | 4 | -0/+457 |
| | | | | | | | | | | |||||
| * | | | | | | | | | First Implementatation of new Loggin framework | Tycho | 2014-08-10 | 15 | -398/+51 |
| | | | | | | | | | | |||||
* | | | | | | | | | | CheckBasicStyle checks the src folder as well. | madmaxoft | 2014-08-14 | 5 | -14/+20 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1319 from mc-server/webadminfixes | Mattes D | 2014-08-13 | 2 | -30/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | A couple of fixes for issues with the webadmin | ||||
| * | | | | | | | | Fixed shadowing variable | Tycho | 2014-08-13 | 1 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Removed unused method | Tycho | 2014-08-13 | 2 | -25/+0 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1296 from mc-server/LuaAPI | Franz Reiter | 2014-08-12 | 13 | -33/+66 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | ||||
| * | | | | | | | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 12 | -28/+29 |
| | | | | | | | | |||||
| * | | | | | | | Added a comment and simplified code. | Howaner | 2014-08-10 | 2 | -11/+5 |
| | | | | | | | | |||||
| * | | | | | | | Added IsDaylightCycleEnabled saving. | Howaner | 2014-08-10 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Renamed functions. | Howaner | 2014-08-10 | 2 | -7/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into LuaAPI | Howaner | 2014-08-10 | 6 | -11/+102 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Renamed m_DoDaylightCycle to m_CycleDaylight. | Howaner | 2014-08-08 | 2 | -7/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 4 | -20/+56 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | I need this for a GameRule plugin. | ||||
* | | | | | | | | Merge pull request #1316 from ChriPiv/master | Alexander Harkness | 2014-08-11 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add entry for bat in monsters.ini | ||||
| * | | | | | | | | Add entry for bat in monsters.ini | Christophe Piveteau | 2014-08-11 | 1 | -0/+6 |
|/ / / / / / / / | |||||
* | | / / / / / | cProtocol172: Check return values. | madmaxoft | 2014-08-11 | 1 | -4/+9 |
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431 | ||||
* | | | | | | | Merge pull request #1310 from mc-server/ChestFix | Mattes D | 2014-08-11 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed potential null dereference | ||||
| * | | | | | | | Fixed potential null dereference | Tycho | 2014-08-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70466 | ||||
* | | | | | | | | Merge pull request #1301 from mc-server/Ores | Mattes D | 2014-08-11 | 3 | -53/+120 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Ore Tweaks | ||||
| * | | | | | | | | Bunch of tweaks: | STRWarrior | 2014-08-10 | 3 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed Quarts to Quartz Using const_iterator instead of iterator Used CheckBasicStyle script to find style errors | ||||
| * | | | | | | | | Added NaturalPatches generator | STRWarrior | 2014-08-10 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It generates gravel and dirt. | ||||
| * | | | | | | | | Added NetherOreNests. | STRWarrior | 2014-08-10 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It generates Nether Quarts. | ||||
| * | | | | | | | | Changed cStructGenOreNests to take a list of ores + the block to replace. | STRWarrior | 2014-08-10 | 3 | -53/+83 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1312 from mc-server/unnamed-enum | Mattes D | 2014-08-11 | 6 | -12/+22 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Various unnamed enum fixes | ||||
| * | | | | | | | | Fixed tolua error with static initialization | archshift | 2014-08-11 | 2 | -3/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | Gave names to unnamed enums | archshift | 2014-08-11 | 4 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Player.cpp: change unnamed enum to constant integers | archshift | 2014-08-11 | 2 | -7/+8 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1311 from mc-server/CMakeFix | Mattes D | 2014-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed circular dependecy luaState_Call.inc | ||||
| * | | | | | | | | Fixed circular dependecy luaState_Call.inc | Tycho | 2014-08-10 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1309 from mc-server/coverity_fixes | Mattes D | 2014-08-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed potential crash in Player.cpp | ||||
| * | | | | | | | | Spaces | Tycho | 2014-08-10 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed potential crash in Player.cpp | Tycho | 2014-08-10 | 1 | -0/+4 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 71780 If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player | ||||
* | | | | | | | | Merge pull request #1299 from mc-server/Slabs | Mattes D | 2014-08-10 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Send the old slab to the client when the interact cancelled. | ||||
| * | | | | | | | Changed comment. | Howaner | 2014-08-10 | 1 | -3/+1 |
| | | | | | | | | |||||
| * | | | | | | | Added comment. | Howaner | 2014-08-08 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Send the old slab to the client when the interact cancelled. | Howaner | 2014-08-08 | 1 | -0/+11 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1305 from mc-server/Food | Mattes D | 2014-08-10 | 1 | -4/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fixed swing arm animation when you ate. | ||||
| * | | | | | | Fixed swing arm animation when you ate. | Howaner | 2014-08-10 | 1 | -4/+2 |
|/ / / / / / | |||||
* | | | / / | Removed an old and outdated comment. | STRWarrior | 2014-08-10 | 1 | -2/+0 |
| |_|_|/ / |/| | | | | |||||
* | | | | | WebAdmin: Manually exported string conversion functions. | madmaxoft | 2014-08-09 | 2 | -6/+64 |
| | | | | | | | | | | | | | | | | | | | | ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use. | ||||
* | | | | | WebAdmin: Added GetURLEncodedString(). | madmaxoft | 2014-08-09 | 2 | -1/+36 |
|/ / / / | |||||
* | | | | Merge pull request #1295 from mc-server/crystal | Mattes D | 2014-08-07 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | On destroy ender crystal, create bedrock and fire. | ||||
| * | | | | On destroy ender crystal, create bedrock and fire | archshift | 2014-08-06 | 1 | -3/+3 |
| |/ / / | |||||
* | | | | Fixed nether wart digging. | Howaner | 2014-08-07 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes #1265 | ||||
* | | | | Removed debug message. | Howaner | 2014-08-07 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #1291 from mc-server/RedstoneCleanUp | Mattes D | 2014-08-06 | 6 | -21/+83 |
|\ \ \ | | | | | | | | | Redstone clean up | ||||
| * | | | Fixed style issues | Tycho | 2014-08-06 | 3 | -5/+8 |
| | | | | |||||
| * | | | Fixed multiple inhertance being output by tolua | Tycho | 2014-08-06 | 2 | -6/+10 |
| | | | | |||||
| * | | | Removed dependecy of redstone simulator on NoteBlock | Tycho | 2014-08-05 | 4 | -12/+20 |
| | | | | |||||
| * | | | Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly | Tycho | 2014-08-05 | 5 | -9/+56 |
| | | | | |||||
* | | | | Resending fire to the client when the interact cancelled. | Howaner | 2014-08-06 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge pull request #1289 from mc-server/LuaAPI | Franz Reiter | 2014-08-05 | 2 | -2/+31 |
|\ \ \ \ | |/ / / |/| | | | Added Clamp() function to the lua api. | ||||
| * | | | Made lua clamp() compatible with all number types. | Howaner | 2014-08-05 | 1 | -4/+4 |
| | | | | |||||
| * | | | Added api documentation for Clamp() | Howaner | 2014-08-05 | 2 | -4/+5 |
| | | | | |||||
| * | | | Added Clamp() function to the lua api. | Howaner | 2014-08-05 | 1 | -0/+28 |
|/ / / | |||||
* / / | Fixed unsigned long comparison to size_t | archshift | 2014-08-05 | 1 | -1/+1 |
|/ / | |||||
* | | MojangAPI: Fixed PlayerNameToUUID(). | madmaxoft | 2014-08-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1287 from Howaner/Bow | Franz Reiter | 2014-08-04 | 1 | -0/+10 |
|\ \ | |/ |/| | Added arrow consuming on shooting | ||||
| * | Changed arrow comment. | Howaner | 2014-08-04 | 1 | -1/+1 |
| | | |||||
| * | Added arrow consuming on shooting | Howaner | 2014-08-04 | 1 | -0/+10 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-04 | 1 | -1/+1 |
|\| | |||||
| * | Fixed #1286 | Howaner | 2014-08-04 | 1 | -1/+1 |
| | | |||||
* | | Fixed signs not staying on other signs | Tiger Wang | 2014-08-04 | 2 | -2/+4 |
| | | |||||
* | | Made AllToLua output consistent | Tiger Wang | 2014-08-04 | 1 | -2/+2 |
|/ | |||||
* | Updated submodules | Tiger Wang | 2014-08-04 | 2 | -0/+0 |
| | |||||
* | CheckBasicStyle: multi-level indent change. | madmaxoft | 2014-08-04 | 7 | -13/+33 |
| | |||||
* | BasicStyleCheck: Dividers are exactly 80 slashes. | madmaxoft | 2014-08-04 | 2 | -2/+18 |
| | |||||
* | Merge pull request #1284 from Howaner/Monster | Mattes D | 2014-08-04 | 2 | -18/+24 |
|\ | | | | | Attempt to fix knockback and swimming. | ||||
| * | Merge branch 'master' into Monster | Howaner | 2014-08-04 | 9 | -75/+69 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1285 from mc-server/StrCaseRefactor | Mattes D | 2014-08-04 | 7 | -47/+54 |
|\ \ | | | | | | | Refactored case-conversion functions. | ||||
| * | | Refactored case-conversion functions. | madmaxoft | 2014-08-04 | 7 | -47/+54 |
| | | | | | | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place. | ||||
* | | | Merge pull request #1283 from Howaner/GlobalFixes | Mattes D | 2014-08-04 | 1 | -6/+5 |
|\ \ \ | |/ / |/| | | Fixed skins in mc 1.7.9/1.7.10 | ||||
| * | | Changed properties for-loop. | Howaner | 2014-08-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into GlobalFixes | Howaner | 2014-08-03 | 2 | -0/+18 |
| |\ \ | |||||
| * | | | Fixed skins in mc 1.7.9/1.7.10 | Howaner | 2014-08-03 | 1 | -6/+5 |
| | | | | |||||
* | | | | Anvil: Wolf owner not saved if not present. | madmaxoft | 2014-08-04 | 1 | -2/+8 |
| | | | | |||||
* | | | | Rewritten string case manipulation to use std::transform. | madmaxoft | 2014-08-04 | 1 | -22/+4 |
| |/ / |/| | | |||||
| | * | Changed /** to /* | Howaner | 2014-08-04 | 1 | -3/+5 |
| | | | |||||
| | * | Fixed warnings | Howaner | 2014-08-04 | 1 | -3/+3 |
| | | | |||||
| | * | Attempt to fix knockback and swimming. | Howaner | 2014-08-04 | 2 | -18/+22 |
| |/ |/| | |||||
* | | Attempting a compilation fix for gcc / clang. | madmaxoft | 2014-08-03 | 2 | -0/+18 |
|/ | |||||
* | Wolf uses UUID for owner. | madmaxoft | 2014-08-03 | 5 | -17/+82 |
| | | | | Fixes #1277. | ||||
* | Debuggers: Added a Name-from-UUID cMojangAPI test. | madmaxoft | 2014-08-03 | 1 | -0/+7 |
| | |||||
* | cMojangAPI: Added UUID-to-Name lookup. | madmaxoft | 2014-08-03 | 6 | -71/+530 |
| | | | | Also fixed the bindings, now all functions are static-like. | ||||
* | Trailing whitespace fix. | madmaxoft | 2014-08-03 | 1 | -1/+1 |
| | |||||
* | Added cMojangAPI:GetUUIDFromPlayerName(). | madmaxoft | 2014-08-03 | 3 | -0/+36 |
| | | | | This is a simpler way to ask for a single name -> uuid conversion. | ||||
* | ToLua driver: disabled output buffering. | madmaxoft | 2014-08-03 | 1 | -0/+3 |
| | |||||
* | Added cPlayer::GetUUID(). | madmaxoft | 2014-08-03 | 1 | -0/+3 |
| | |||||
* | Fixed a ToLua warning - operator = not supported. | madmaxoft | 2014-08-03 | 8 | -8/+16 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2014-08-03 | 3 | -101/+70 |
|\ | |||||
| * | Entity.cpp: Air timer comment fix | archshift | 2014-08-03 | 1 | -1/+1 |
| | | |||||
| * | Code reduction and clarity fixes | archshift | 2014-08-03 | 2 | -29/+16 |
| | | |||||
| * | Removed unused cPlayer::FoodPoison function | archshift | 2014-08-03 | 2 | -12/+0 |
| | | |||||
| * | Entity.cpp: On portal check, use if-else for current dimension | archshift | 2014-08-03 | 1 | -60/+54 |
| | | | | | | | | If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others. | ||||
* | | VillageGen: Fixed a typo in comment | STRWarrior | 2014-08-03 | 1 | -1/+1 |
|/ | |||||
* | Added proper trees and height for SwamplandM biome | STRWarrior | 2014-08-02 | 3 | -2/+4 |
| | |||||
* | Merge pull request #1275 from Howaner/BlockEntitys | Mattes D | 2014-08-02 | 2 | -1/+18 |
|\ | | | | | Verify beacon effects sent by the client before setting them. | ||||
| * | Fixed a bug who can used from hacked clients. | Howaner | 2014-08-02 | 2 | -1/+18 |
|/ | |||||
* | Fixed issues with autocomplete and time loading | Tiger Wang | 2014-08-01 | 1 | -7/+33 |
| | | | | * Fixes #1274 | ||||
* | Improved endermen code a little | Tiger Wang | 2014-08-01 | 4 | -21/+57 |
| | |||||
* | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 22 | -158/+859 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 71 | -442/+1568 |
| |\ | |||||
| * | | Removed trailing whitespace. | madmaxoft | 2014-07-31 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed UUIDs handling in cPlayer. | madmaxoft | 2014-07-31 | 2 | -6/+9 |
| | | | | | | | | | | | | The loading expected dashed UUIDs, MCS uses short UUIDs throughout. | ||||
| * | | MojangAPI: Moved the settings to a separate ini section. | madmaxoft | 2014-07-31 | 1 | -2/+2 |
| | | | |||||
| * | | MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). | madmaxoft | 2014-07-31 | 5 | -11/+55 |
| | | | |||||
| * | | MojangAPI: Renamed cache file to MojangAPI.sqlite. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | | |||||
| * | | APIDump: Added notes about cache to cMojangAPI. | madmaxoft | 2014-07-30 | 1 | -1/+7 |
| | | | |||||
| * | | MojangAPI: Clarified the UUID conversion code. | madmaxoft | 2014-07-30 | 2 | -4/+17 |
| | | | |||||
| * | | ManualBindings: Fixed alignment. | madmaxoft | 2014-07-30 | 1 | -3/+3 |
| | | | |||||
| * | | APIDump: Fixed UUID-related documentation. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | | |||||
| * | | Debuggers: Updated for the new cMojangAPI changes. | madmaxoft | 2014-07-30 | 1 | -1/+10 |
| | | | |||||
| * | | MojangAPI: Implemented UUID shortening and dashing. | madmaxoft | 2014-07-30 | 5 | -22/+40 |
| | | | |||||
| * | | Exported cMojangAPI to Lua. | madmaxoft | 2014-07-30 | 5 | -6/+46 |
| | | | |||||
| * | | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache. | madmaxoft | 2014-07-30 | 9 | -239/+564 |
| | | | | | | | | | | | | The cache is persisted into a SQLite DB file on server shutdown. | ||||
| * | | Fixed SQLiteCpp include paths for MSVC2010+. | Mattes D | 2014-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed include directories for SQLiteCpp. | madmaxoft | 2014-07-28 | 1 | -0/+6 |
| | | | |||||
| * | | Added SQLiteCpp library. | madmaxoft | 2014-07-28 | 5 | -0/+33 |
| | | | | | | | | | | | | This provides C++ wrappers for SQLite, making it safer to use in the C++ environment. | ||||
| * | | Debuggers: Added an example for cClientHandle:GetUUIDsFromPlayerNames(). | madmaxoft | 2014-07-28 | 1 | -0/+31 |
| | | | |||||
| * | | Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API. | madmaxoft | 2014-07-28 | 2 | -3/+63 |
| | | | |||||
| * | | cAuthenticator: Added GetUUIDsFromPlayerNames(). | madmaxoft | 2014-07-28 | 2 | -3/+116 |
| | | | |||||
* | | | Merge pull request #1273 from Howaner/GlobalFixes | Mattes D | 2014-08-01 | 1 | -6/+14 |
|\ \ \ | | | | | | | | | Added missing HOOK_BLOCK_SPREAD call. | ||||
| * | | | Added missing HOOK_BLOCK_SPREAD call. | Howaner | 2014-08-01 | 1 | -6/+14 |
|/ / / | |||||
* | | | Merge pull request #1272 from Howaner/Food | Mattes D | 2014-08-01 | 8 | -48/+177 |
|\ \ \ | | | | | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added... | ||||
| * | | | Compile fix. | Howaner | 2014-08-01 | 1 | -2/+1 |
| | | | | |||||
| * | | | Import Statistics.h | Howaner | 2014-07-31 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. | Howaner | 2014-07-31 | 8 | -48/+177 |
| | |/ | |/| | |||||
* | | | Merge pull request #1269 from Howaner/BlockEntitys | Mattes D | 2014-08-01 | 28 | -37/+891 |
|\ \ \ | | | | | | | | | Added beacon. | ||||
| * | | | Use "default:" in switch. | Howaner | 2014-07-31 | 1 | -3/+6 |
| | | | | |||||
| * | | | Updated documentation again. | Howaner | 2014-07-31 | 1 | -4/+4 |
| | | | | |||||
| * | | | Renamed "select..." methods to "set..." and better IsValidEffect() function. | Howaner | 2014-07-31 | 4 | -55/+19 |
| | | | | |||||
| * | | | Updated documentation. | Howaner | 2014-07-31 | 2 | -8/+8 |
| | | | | |||||
| * | | | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 8 | -66/+84 |
| | | | | |||||
| * | | | Added window update. | Howaner | 2014-07-30 | 1 | -0/+23 |
| | | | | |||||
| * | | | Added beacon load/save. | Howaner | 2014-07-30 | 5 | -1/+74 |
| | | | | |||||
| * | | | Added beacon documentation. | Howaner | 2014-07-30 | 2 | -0/+27 |
| | | | | |||||
| * | | | Changed return type from GetPrimaryPotion() and GetSecondaryPotion() | Howaner | 2014-07-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | Exported the beacon. | Howaner | 2014-07-30 | 11 | -17/+107 |
| | | | | |||||
| * | | | Added beacon. | Howaner | 2014-07-30 | 13 | -33/+689 |
| | | | | |||||
* | | | | Merge pull request #1270 from Howaner/Options | Mattes D | 2014-07-31 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator | ||||
| * | | | | Capitalised "incremental" | Howaner | 2014-07-31 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. | Howaner | 2014-07-31 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1271 from Howaner/GlobalFixes | Mattes D | 2014-07-31 | 2 | -2/+13 |
|\ \ \ \ | | | | | | | | | | | Fixed water from ice and removed packed ice drop. | ||||
| * | | | | Changed IsSolid to FullyOccupiesVoxel | Howaner | 2014-07-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed water from ice and removed packed ice drop. | Howaner | 2014-07-31 | 2 | -2/+13 |
| |/ / / | |||||
* | | | | Merge pull request #1047 from mc-server/Enderman | Tiger Wang | 2014-07-31 | 2 | -0/+121 |
|\ \ \ \ | |/ / / |/| | | | Enderman attacks a player if he's looking at him | ||||
| * | | | Comment suggestions | Tiger Wang | 2014-07-31 | 1 | -9/+8 |
| | | | | |||||
| * | | | Added lighting code and added comments | STRWarrior | 2014-07-30 | 1 | -0/+17 |
| | | | | |||||
| * | | | Removed lighting code in cEnderman::CheckEventSeePlayer | STRWarrior | 2014-07-30 | 1 | -9/+1 |
| | | | | |||||
| * | | | Changed comment | worktycho | 2014-06-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Replaced strange algebra with dot product. | worktycho | 2014-06-18 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | 10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value. | ||||
| * | | | Improved Enderman code | Tiger Wang | 2014-06-18 | 2 | -14/+34 |
| | | | | |||||
| * | | | Swapped m_Player and m_EndermanPos | STRWarrior | 2014-06-18 | 1 | -2/+2 |
| | | | | |||||
| * | | | Enderman attacks a player if he's looking at him. | STRWarrior | 2014-06-18 | 2 | -0/+91 |
| | | | | |||||
* | | | | Merge pull request #1267 from mc-server/RoofedForest | Tiger Wang | 2014-07-31 | 1 | -3/+61 |
|\ \ \ \ | | | | | | | | | | | Added RoofedForest trees. | ||||
| * | | | | Suggestions | STRWarrior | 2014-07-30 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage | STRWarrior | 2014-07-30 | 2 | -66/+55 |
| | | | | | |||||
| * | | | | Fixed doxy comment | STRWarrior | 2014-07-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed comment at the end of a for-loop | STRWarrior | 2014-07-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed compiling using Clang | STRWarrior | 2014-07-30 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Added RoofedForest trees. | STRWarrior | 2014-07-30 | 2 | -2/+73 |
| | | | | | | | | | | | | | | | | | | | | Could still be improved allot. | ||||
* | | | | | Merge pull request #1266 from mc-server/PreSimulatorConfig | Mattes D | 2014-07-30 | 3 | -6/+30 |
|\| | | | | |_|/ / |/| | | | PreSimulator: Added configurations. | ||||
| * | | | PreSimulator: Added configurations. | STRWarrior | 2014-07-30 | 3 | -6/+30 |
|/ / / | | | | | | | | | | You can now choose if it should pregenerate something or not | ||||
* | | | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 8 | -42/+57 |
|\ \ \ | |||||
| * | | | Change Group->SetColor() again. | Howaner | 2014-07-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use AString(1, Color[0]) | Howaner | 2014-07-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use Color[0]. | Howaner | 2014-07-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed group color's. | Howaner | 2014-07-27 | 2 | -16/+5 |
| | | | | |||||
| * | | | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 5 | -11/+22 |
| | | | | |||||
| * | | | Fixed plugin count and fixed plugin loading, when settings.ini was regenerated. | Howaner | 2014-07-27 | 1 | -16/+30 |
| | | | | |||||
* | | | | Fixed "Dependency" typos | archshift | 2014-07-30 | 3 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #1262 from mc-server/CanBeTerraformed | Mattes D | 2014-07-30 | 4 | -44/+32 |
|\ \ \ \ | | | | | | | | | | | Added cBlockInfo::CanBeTerraformed and made finishers use it | ||||
| * | | | | Added soulsand to the terraformed list. | STRWarrior | 2014-07-29 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Added cBlockInfo::CanBeTerraformed and made finishers use it | STRWarrior | 2014-07-29 | 4 | -44/+31 |
| | | | | | | | | | | | | | | | | | | | | I might have forgotten some of them though | ||||
* | | | | | Fixed FinishGen.h types. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Entity.h: Moved constants out of some unnamed enum | archshift | 2014-07-30 | 1 | -14/+14 |
| | | | | | |||||
* | | | | | Merge pull request #1263 from Howaner/GlobalFixes | archshift | 2014-07-30 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed compile error with clang. | ||||
| * | | | | | Changed size_t to 'unsigned long' | Howaner | 2014-07-30 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fixed compile error with clang. | Howaner | 2014-07-30 | 1 | -2/+2 |
|/ / / / / | |||||
* / / / / | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 8 | -20/+14 |
|/ / / / | |||||
* | | | | Merge pull request #1061 from mc-server/portals | Mattes D | 2014-07-29 | 42 | -236/+673 |
|\ \ \ \ | | | | | | | | | | | Portals and others | ||||
| * | | | | Detrailed whitespace | Tiger Wang | 2014-07-29 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 123 | -696/+1749 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | | | | Suggestions | Tiger Wang | 2014-07-23 | 6 | -24/+28 |
| | | | | | | |||||
| * | | | | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 8 | -61/+55 |
| | | | | | | |||||
| * | | | | | Suggestion and failed merge fix | Tiger Wang | 2014-07-22 | 2 | -1/+6 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 180 | -1499/+2560 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | | | | | | Suggestions | Tiger Wang | 2014-07-21 | 10 | -127/+161 |
| | | | | | | | |||||
| * | | | | | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 12 | -65/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files | ||||
| * | | | | | | Fix failed merge and other issues | Tiger Wang | 2014-07-18 | 14 | -77/+28 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 382 | -4731/+7710 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 20 | -102/+297 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Conforms to standards | Tiger Wang | 2014-06-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 103 | -3457/+5628 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | | | | | | | | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 7 | -39/+26 |
| | | | | | | | | | | |||||
| * | | | | | | | | | More suggestions | Tiger Wang | 2014-06-21 | 4 | -5/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Implemented PR suggestions | archshift | 2014-06-16 | 5 | -8/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef | ||||
| * | | | | | | | | | Reverted portal creation code | Tiger Wang | 2014-06-14 | 2 | -103/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't really working and needs more development | ||||
| * | | | | | | | | | Cauldrons check the heightmap | Tiger Wang | 2014-06-14 | 3 | -8/+12 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-14 | 20 | -492/+791 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | | | | | | | | | Fixed order of initalisation | Tycho | 2014-06-12 | 2 | -5/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed unnessicary indirection from Entity iterator list | Tycho | 2014-06-12 | 2 | -6/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed compile | worktycho | 2014-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 20 | -118/+175 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 72 | -293/+2868 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | | | | | | | | | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 10 | -54/+179 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Capitalising | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix reading 64 bit values | worktycho | 2014-06-07 | 1 | -2/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed Time of day | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-05 | 7 | -14/+36 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed decision failure | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed compilation | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-04 | 2 | -2/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Time and weather is saved, part of #1058 | Tiger Wang | 2014-06-04 | 2 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed unreliability in Health and LootPickup loading. | ||||
| * | | | | | | | | | | | Health of monsters is now saved | Tiger Wang | 2014-06-04 | 2 | -0/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed a NetherFinisher bug | Tiger Wang | 2014-06-04 | 3 | -24/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Configurable portals | Tiger Wang | 2014-06-04 | 4 | -14/+83 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-04 | 3 | -6/+10 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Removed use of auto | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 3 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 130 | -1089/+22541 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Implemented bed homes | Tiger Wang | 2014-06-01 | 4 | -16/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change | ||||
| * | | | | | | | | | | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 23 | -92/+254 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Very minor code changes | Tiger Wang | 2014-05-29 | 3 | -3/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Cauldrons fill | Tiger Wang | 2014-05-29 | 4 | -3/+19 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisher | Mattes D | 2014-07-29 | 3 | -22/+92 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | ||||
| * | | | | | | | | | | | | | Some finishing touches | STRWarrior | 2014-07-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespace fixed dead bush comment | ||||
| * | | | | | | | | | | | | | Fixed comment above cFinishGenSingleTopBlock | STRWarrior | 2014-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | SingleTopBlock: All blocktypes and biometypes get initialized properly | STRWarrior | 2014-07-29 | 1 | -2/+14 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Using suggestions | STRWarrior | 2014-07-28 | 1 | -25/+20 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Forgot Mesa Plateau biome. | STRWarrior | 2014-07-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | STRWarrior | 2014-07-28 | 3 | -20/+82 |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks. | ||||
* | | | | | | | | | | | | | Merge pull request #1252 from mc-server/RoughRavinesGen | Mattes D | 2014-07-29 | 5 | -3/+451 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Rough ravines gen | ||||
| * | | | | | | | | | | | | Added a missing include for abs(float). | madmaxoft | 2014-07-27 | 1 | -0/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable. | madmaxoft | 2014-07-27 | 4 | -20/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges. | ||||
| * | | | | | | | | | | | | RoughRavines: Added per-height radius modifier. Ledges! | madmaxoft | 2014-07-27 | 1 | -32/+73 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | RoughRavines: More settings - size, width, roughness | madmaxoft | 2014-07-27 | 3 | -23/+84 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | RoughRavines: Initial generator implementation. | madmaxoft | 2014-07-27 | 4 | -3/+264 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values. | ||||
* | | | | | | | | | | | | DistortedHeightmap: Now generates gravel in deep ocean. | STRWarrior | 2014-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Hotfixed compilation problems. | madmaxoft | 2014-07-27 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1236 from Howaner/Inventory2 | Mattes D | 2014-07-27 | 17 | -72/+164 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix item durability. | ||||
| * | | | | | | | | | | | | Derp. | Howaner | 2014-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Rename function. | Howaner | 2014-07-26 | 4 | -6/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 108 | -663/+952 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| * | | | | | | | | | | | | | Fix item durability. | Howaner | 2014-07-23 | 16 | -69/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1181 | ||||
* | | | | | | | | | | | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fences | STRWarrior | 2014-07-27 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Updated NetherForts' weights. | madmaxoft | 2014-07-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1250 from mc-server/NetherCeiling | Mattes D | 2014-07-27 | 1 | -1/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a ceiling to disguise the bedrock above it. | ||||
| * | | | | | | | | | | | | | Removed forgotten comment | STRWarrior | 2014-07-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Made nether ceiling smooth. | STRWarrior | 2014-07-27 | 1 | -1/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added a ceiling to disguise the bedrock above it. | STRWarrior | 2014-07-27 | 1 | -1/+9 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | NetherClumpFoliage: Fixed assert | STRWarrior | 2014-07-27 | 1 | -8/+39 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content. | madmaxoft | 2014-07-27 | 1 | -37/+752 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1232 from mc-server/splash-entity | Mattes D | 2014-07-26 | 7 | -139/+162 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved potion static functions to EntityEffect to create splash potions through the world | ||||
| * | | | | | | | | | | | | SplashPotionEntity: Use `const cItem &` instead of a cItem | archshift | 2014-07-26 | 2 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpp | archshift | 2014-07-26 | 4 | -9/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Moved potion static functions to EntityEffect to create splash potions through world | archshift | 2014-07-26 | 7 | -139/+164 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1207 from Howaner/Inventory | Mattes D | 2014-07-26 | 4 | -10/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | Inventory fixes | ||||
| * | | | | | | | | | | | | Change comment. | Howaner | 2014-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into Inventory | Howaner | 2014-07-26 | 257 | -2009/+3248 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Git: Ignore AllFiles.lst (generated by cmake) | archshift | 2014-07-26 | 1 | -0/+1 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Endianness.h: undefined ntohll before redefining | archshift | 2014-07-26 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Removed the new old-style-cast warning from error treatment | archshift | 2014-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new warning included in clang that ships with OS X 10.10 Yosemite. | ||||
* | | | | | | | | | | | | Tweaks to NetherClumpFoliage | STRWarrior | 2014-07-25 | 1 | -34/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplefied the way NetherClupFoliage creates the X and Z coordinate. | ||||
* | | | | | | | | | | | | Speed up the NetherClumpFoliage finisher. | STRWarrior | 2014-07-25 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using IntNoiseXX instead of CubicNoiseXX. | ||||
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Tiger Wang | 2014-07-24 | 84 | -229/+470 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1235 from mc-server/redundant-semis | Mattes D | 2014-07-24 | 75 | -111/+111 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed redundant semicolons and re-added the warning | ||||
| | * | | | | | | | | | | | | Made redundant semi not an error, fixed one more. | archshift | 2014-07-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 74 | -110/+110 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 11 | -118/+349 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1196. | ||||
| * | | | | | | | | | | | | Made the cWorld::SpawnMobFinalize function more readable. | STRWarrior | 2014-07-24 | 1 | -0/+10 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed block drops | Tiger Wang | 2014-07-24 | 5 | -17/+59 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1242 (the issue addressed within) | ||||
* | | | | | | | | | | | | Merge pull request #1237 from tonibm19/master | Mattes D | 2014-07-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Moar view distance! | ||||
| * | | | | | | | | | | | | Moar view distance! | tonibm19 | 2014-07-23 | 1 | -2/+2 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's blow up our computers! :D | ||||
* | | | | | | | | | | | | TallGrass: Less grass on mountains. | STRWarrior | 2014-07-23 | 1 | -0/+11 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed possible crash in the NetherClumpFoliage finisher. | STRWarrior | 2014-07-23 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | BlockLeaves: Fixed comment style. | madmaxoft | 2014-07-23 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed MSVC bindings regeneration. | madmaxoft | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still one typo had been left in the cmake file. | ||||
* | | | | | | | | | | | | Fixed Bindings generation in MSVC. | madmaxoft | 2014-07-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bindings weren't regenerated because of the typo in the dependencies cmake variable. | ||||
* | | | | | | | | | | | | Merge pull request #1234 from mc-server/GeneratorTweaks | archshift | 2014-07-22 | 1 | -13/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only | ||||
| * | | | | | | | | | | | | Extreme Hills M variant only spawn with grass and stone | STRWarrior | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed gravel. | ||||
| * | | | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only | STRWarrior | 2014-07-21 | 1 | -12/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out only the M variants have stone and gravel in them. | ||||
* | | | | | | | | | | | | | Export SendEntityAnimation to ToLua | archshift | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fix misguided comment on bits... | Tiger Wang | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...obviously written by someone very confused, also known as me | ||||
* | | | | | | | | | | | | | Export BroadcastEntityAnimation with ToLua | archshift | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #752 | ||||
* | | | | | | | | | | | | | Merge pull request #1216 from mc-server/saplingsandleaves | Tiger Wang | 2014-07-22 | 10 | -141/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | Fixed issues relating to saplings and leaves | ||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into saplingsandleaves | Tiger Wang | 2014-07-22 | 111 | -937/+1094 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Defines.h | ||||
* | | | | | | | | | | | | | Updated prefabs to current Gallery content. | madmaxoft | 2014-07-22 | 3 | -226/+243 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merged branch 'origin/Foliage'. | madmaxoft | 2014-07-21 | 3 | -0/+100 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed a missing enter. | STRWarrior | 2014-07-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed y for-loop. | STRWarrior | 2014-07-21 | 1 | -27/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the top block now gets long grass. | ||||
| * | | | | | | | | | | | | Fixed indentation | STRWarrior | 2014-07-21 | 1 | -12/+12 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Changed CubicNoiseXX to IntNoiseXX | STRWarrior | 2014-07-20 | 2 | -40/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some comments | ||||
| * | | | | | | | | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrass | STRWarrior | 2014-07-20 | 3 | -17/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass. | ||||
| * | | | | | | | | | | | | Fixed warnings | STRWarrior | 2014-07-20 | 2 | -5/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | First attempt for a new foliage finisher | STRWarrior | 2014-07-20 | 3 | -0/+74 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Defines.h: Fixed a warning. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | CheckBasicStyle: Added a lua shebang. | madmaxoft | 2014-07-21 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | CheckBasicStyle: Doesn't require LuaFileSystem. | madmaxoft | 2014-07-21 | 1 | -34/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead it uses the list of files generated by CMake. | ||||
* | | | | | | | | | | | | CMake: generates a list of all source files. | madmaxoft | 2014-07-21 | 2 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used for the style-checking script. | ||||
* | | | | | | | | | | | | Normalized spaces after "catch". | madmaxoft | 2014-07-21 | 2 | -3/+4 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | CheckBasicStyle: Checks spaces after keywords, no space before ")". | madmaxoft | 2014-07-21 | 1 | -1/+16 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 94 | -535/+541 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 28 | -135/+137 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Cuboid: added explicit copy assignment operator | archshift | 2014-07-21 | 2 | -0/+13 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1213 from mc-server/chat-color | Mattes D | 2014-07-20 | 6 | -57/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored cChatColor | ||||
| * | | | | | | | | | | | | ChatColor.h: The @deprecated tag slipped. Oops. | archshift | 2014-07-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed attempts to call c_str on ChatColors | archshift | 2014-07-19 | 2 | -6/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed references to deprecated cChatColor::Color | archshift | 2014-07-19 | 2 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Refactored cChatColor | archshift | 2014-07-19 | 2 | -49/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed std::string fields to const char-pointers in order to wipe out potential issues with static initialization and global destructors - Deprecated cChatColor::Color() because the name does not match the value | ||||
* | | | | | | | | | | | | | Revert "Only one instance of server can be started" | Tiger Wang | 2014-07-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6484e9814a3a540518606f552398e0b82f91ab4d. * Fixes #1200 | ||||
* | | | | | | | | | | | | | Line tracer invalid chunk fix | Tiger Wang | 2014-07-20 | 2 | -26/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1230 * Additionally improved speed in some scenarios | ||||
| | | * | | | | | | | | | | Merge branch 'master' into saplingsandleaves | Tiger Wang | 2014-07-20 | 345 | -2335/+3502 |
| | | |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h | ||||
* | | | | | | | | | | | | | NBTChunkSerializer.cpp: Added break after serializing the splash potion | archshift | 2014-07-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1231 from mc-server/ticks-alive | Tiger Wang | 2014-07-20 | 3 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added m_TicksAlive to entities and allows projectiles to hit their creators | ||||
| * | | | | | | | | | | | | | Added m_TicksAlive to entities, allows projectiles to hit their creators | archshift | 2014-07-20 | 3 | -3/+14 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Added destroy-timer system to splash potion entities | archshift | 2014-07-20 | 2 | -3/+24 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1227 from mc-server/fixes | Mattes D | 2014-07-20 | 5 | -23/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a couple warnings | ||||
| * | | | | | | | | | | | | | main.cpp: field style fixes | archshift | 2014-07-20 | 3 | -12/+12 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Socket: removed unused Socket destructor | archshift | 2014-07-19 | 2 | -10/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATED | archshift | 2014-07-19 | 3 | -6/+6 |
|/ / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / | Monsters: Made IsUndead overridable by the respective mob classes | archshift | 2014-07-19 | 6 | -13/+11 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | CheckBasicStyle: Checks for braces not on separate lines. | madmaxoft | 2014-07-19 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the opening braces at the end of a line are checked, others (such as inline getters and setters or initializers) are valid. | ||||
* | | | | | | | | | | | | Code style: Fixed braces on separate lines. | madmaxoft | 2014-07-19 | 14 | -20/+38 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | CheckBasicStyle: Check spaces around commas. | madmaxoft | 2014-07-19 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want no space in front of and at least one space after a comma. | ||||
* | | | | | | | | | | | | Fixed spaces after commas in protocol data. | madmaxoft | 2014-07-19 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes. | ||||
* | | | | | | | | | | | | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 42 | -101/+100 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 16 | -214/+847 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake - Explicitly lists all source files | ||||
| * | | | | | | | | | | | | Fixed MSVC bindings generation. | madmaxoft | 2014-07-19 | 2 | -4/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Moved Windows custom command to src/CMakeLists.txt | archshift | 2014-07-19 | 2 | -15/+20 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | CMakeLists: Moved Bindings-specific code to subdir | archshift | 2014-07-19 | 3 | -120/+125 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Blocks/CMakeLists.txt: Fixed header list after merge of master | archshift | 2014-07-19 | 2 | -10/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | CMake: Add Bindings library from subdirectory | archshift | 2014-07-19 | 2 | -23/+12 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | src/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 2 | -20/+180 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MSVC, CMake will traverse all the CMakeLists and add their source and header files to one conglomerate SOURCE list. | ||||
| * | | | | | | | | | | | | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 13 | -19/+45 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | src/CMakeLists: Small changes for increased readability | archshift | 2014-07-19 | 1 | -5/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | OSSupport/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+32 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | HTTPServer/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+20 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Generating/Prefabs/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+22 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Simulator/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+28 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | WorldStorage/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+26 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Generating/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+54 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | BlockEntities/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+35 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | UI/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Protocol/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+23 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Blocks/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+92 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Items/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+47 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Entities/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+56 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Mobs/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+69 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1223 from mc-server/fixes | Mattes D | 2014-07-19 | 10 | -61/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed small issues throughout the codebase | ||||
| * | | | | | | | | | | | | | World.cpp: fixed not all enum fields being used in m_Dimension switch | archshift | 2014-07-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Minecart: slimmed down SpawnOn by keeping subtype in the payload enum | archshift | 2014-07-19 | 2 | -20/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Trees.cpp: removed unused "debug" fields | archshift | 2014-07-19 | 1 | -7/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed clamping issues | archshift | 2014-07-19 | 6 | -33/+6 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #1224 from mc-server/fixes-potions | Mattes D | 2014-07-19 | 5 | -14/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Fix for potion color after tossing | ||||
| * | | | | | | | | | | | | | Splash potions: Renamed PotionParticleType to PotionColor for clarity | archshift | 2014-07-19 | 5 | -15/+15 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed splash potion color on toss | archshift | 2014-07-19 | 2 | -0/+16 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Renamed AllToLua_lua script. | madmaxoft | 2014-07-19 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1222. | ||||
* | | | | | | | | | | | | | Authenticator.cpp: Killed a global destructor warning | archshift | 2014-07-19 | 1 | -53/+56 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'Inventory2' | madmaxoft | 2014-07-18 | 6 | -4/+101 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Debuggers: Optimized and commented the /rmitem handler. | madmaxoft | 2014-07-18 | 1 | -4/+8 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | APIDump: Documented RemoveItem(). | madmaxoft | 2014-07-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Clarified RemoveItem()'s comments. | madmaxoft | 2014-07-18 | 2 | -2/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added RemoveItem() function to the player inventory. | Howaner | 2014-07-18 | 5 | -4/+93 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'Entities' | madmaxoft | 2014-07-18 | 4 | -11/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed slime-related comments. | madmaxoft | 2014-07-18 | 3 | -5/+10 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Slime sizes are 1, 2 or 4 and not 1, 2 or 3. | Howaner | 2014-07-18 | 3 | -4/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Split into more lines. | Howaner | 2014-07-17 | 2 | -6/+10 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed many slime bugs. | Howaner | 2014-07-17 | 3 | -7/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed slime hurt/death sound - Added slime spawning on death. - Fixed the max health. - Fixed the attack damage. - Little slimes should not attack players. | ||||
* | | | | | | | | | | | | | Merge branch 'Sign' | madmaxoft | 2014-07-18 | 4 | -34/+122 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Normalized code style for both sign handlers. | madmaxoft | 2014-07-18 | 2 | -16/+20 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed cBlockSignPostHandler descend. | Howaner | 2014-07-18 | 1 | -2/+28 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added a extra wall sign handler. | Howaner | 2014-07-18 | 4 | -27/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1119 | ||||
* | | | | | | | | | | | | | Monster fixes | Tiger Wang | 2014-07-18 | 8 | -35/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627 | ||||
* | | | | | | | | | | | | | MCServer supports Minecraft v1.7.10 | archshift | 2014-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed creative players not being able to drink | archshift | 2014-07-18 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1215 | ||||
* | | | | | | | | | | | | | CheckBasicStyle: Proper spaces with commas. | madmaxoft | 2014-07-18 | 1 | -21/+48 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 7 | -14/+14 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Removed duplicate IPvX labels. | madmaxoft | 2014-07-18 | 3 | -6/+6 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1208 from Howaner/MobInventory | Mattes D | 2014-07-18 | 2 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spawns skeletons with a bow in their hands | ||||
| * | | | | | | | | | | | | | Skeletons should spawn with a bow in the hand. | Howaner | 2014-07-18 | 2 | -0/+17 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1184 | ||||
* | | | | | | | | | | | | | Moved ChatColor.h out of defines where it was not needed | archshift | 2014-07-18 | 2 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1210 from Howaner/API | Mattes D | 2014-07-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed special character in APIDump | ||||
| * | | | | | | | | | | | | | Removed special character in APIDump | Howaner | 2014-07-18 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #1212 from mc-server/never-read | Mattes D | 2014-07-18 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProtocolRecognizer.cpp: removed unused NumBytesRead | ||||
| * | | | | | | | | | | | | | ProtocolRecognizer.cpp: removed unused NumBytesRead | archshift | 2014-07-18 | 1 | -2/+0 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Generator: removed rnd definitions that are never read | archshift | 2014-07-18 | 2 | -2/+0 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1209 from Howaner/GlobalFixes | archshift | 2014-07-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Added Howaner to the CONTRIBUTORS list. | ||||
| * | | | | | | | | | | | | Added me to the CONTRIBUTORS list. I hope it is ok. | Howaner | 2014-07-18 | 1 | -0/+1 |
|/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | Proper comment for DropBlock() | Tiger Wang | 2014-07-20 | 1 | -2/+5 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed issues relating to saplings and leaves | Tiger Wang | 2014-07-17 | 10 | -139/+32 |
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201 | ||||
| | | * | | | | | | | | Add armor items directly to the armor slots. | Howaner | 2014-07-20 | 3 | -3/+16 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Moved comment. | Howaner | 2014-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary. | Howaner | 2014-07-18 | 2 | -9/+13 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Items should first added to the first slot, not the latest. | Howaner | 2014-07-18 | 1 | -3/+3 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Fixed NULL being passed instead of a double to AddEntityEffect | archshift | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed code style in Trees.cpp. | madmaxoft | 2014-07-17 | 1 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The src folder now has zero BasicStyle violations. | ||||
* | | | | | | | | | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 29 | -99/+115 |
| | | | | | | | | | | |||||
* | | | | | | | | | | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 13 | -25/+25 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Player.cpp: Fixed compile error | archshift | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Player.cpp: Added Wither death message | archshift | 2014-07-17 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Basic style fixes. | madmaxoft | 2014-07-17 | 130 | -286/+290 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | madmaxoft | 2014-07-17 | 3 | -25/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #1204 from Howaner/Blocks | Alexander Harkness | 2014-07-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | Fix sapling drop. | ||||
| | * | | | | | | | | | Fix sapling drop. | Howaner | 2014-07-17 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Fixed mob knockback | Tiger Wang | 2014-07-17 | 1 | -23/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #901 | ||||
| * | | | | | | | | | Fixed crash with entities in unloaded chunks | Tiger Wang | 2014-07-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1190 | ||||
* | | | | | | | | | | Initial version of a script to check basic style. | madmaxoft | 2014-07-17 | 1 | -0/+188 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script reports basic violations of the style, such as indentation using spaces, alignment using tabs, trailing whitespace etc. Passing this script does NOT mean that the style is clean, it's only for fast-checking purposes. | ||||
* | | | | | | | | | | Normalized comments. | madmaxoft | 2014-07-17 | 173 | -867/+893 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 34 | -139/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
* | | | | | | | | | | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 52 | -298/+306 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
* | | | | | | | | | Merge pull request #1183 from Howaner/Sounds | Tiger Wang | 2014-07-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Reset meta to zero when the blocks explode | ||||
| * | | | | | | | | | Derp. | Howaner | 2014-07-15 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Reset meta to zero when the block explode. | Howaner | 2014-07-14 | 1 | -4/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1079 from mc-server/potions | Mattes D | 2014-07-17 | 40 | -119/+1596 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added potions and entity effect accessors | ||||
| * | | | | | | | | | | Fixed 3 MSVC warnings in SplashPotionEntity. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Updated cPawn::KilledBy signature for custom death messages. | madmaxoft | 2014-07-17 | 2 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-17 | 21 | -41/+62 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 21 | -41/+62 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Death messages | ||||
| * | | | | | | | | | | | Resolved backwards compatibility issues | Tiger Wang | 2014-07-16 | 7 | -9/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Tailored death messages | Tiger Wang | 2014-07-04 | 20 | -40/+61 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Reformatted cItemPotionHandler. | madmaxoft | 2014-07-17 | 2 | -48/+79 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed formatting for cWitherSkullEntity | madmaxoft | 2014-07-17 | 2 | -3/+13 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 16 | -124/+261 |
| | |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Another fix for excessive food drain | Tiger Wang | 2014-07-16 | 2 | -1/+10 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed a bug with buckets | Tiger Wang | 2014-07-16 | 2 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Additionally fixed cLineBlockTracer's EntryFace parameter when a block was hit on the first iteration along the projected line | ||||
* | | | | | | | | | | | | Fixed another redstone simulator crash | Tiger Wang | 2014-07-16 | 1 | -0/+7 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 11 | -113/+233 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Skins | ||||
| * | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-16 | 1 | -2/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Function rename | Tiger Wang | 2014-07-16 | 2 | -3/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Unified functions | Tiger Wang | 2014-07-16 | 2 | -34/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @Howaner! | ||||
| * | | | | | | | | | | | | Store properties as Json::Value | Tiger Wang | 2014-07-16 | 9 | -21/+44 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 11 | -116/+216 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed a DropSpenser AddFace bug | Tiger Wang | 2014-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-15 | 7 | -80/+246 |
| | | |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1191 from Masy98/Blocks | Tiger Wang | 2014-07-15 | 1 | -13/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed stairs and carpet from IsSolid | ||||
| * | | | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. | Masy98 | 2014-07-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. | Masy98 | 2014-07-15 | 1 | -12/+0 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #1189 from Masy98/Blocks | Mattes D | 2014-07-15 | 2 | -63/+214 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added various missing blocks in the lists in BlockInfo.cpp | ||||
| * | | | | | | | | | | | | | Added Brick fence to m_Transparent | Masy98 | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added various missing blocks in the lists in BlockInfo.cpp | Masy98 | 2014-07-15 | 2 | -64/+214 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed code formatting. | madmaxoft | 2014-07-15 | 2 | -6/+9 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/ClearMetaMixin' | madmaxoft | 2014-07-15 | 4 | -12/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Added super typedef | Tycho | 2014-07-15 | 3 | -3/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | COnverted Lilypad back to mixin | Tycho | 2014-07-15 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Revert "Converted some blockhandlers to use cClearMetaOnDrop" | Tycho | 2014-07-15 | 9 | -21/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 333f4f982cbd24ffcb376594eddef439b3f05e9e. | ||||
| * | | | | | | | | | | | | | | Added documentation | Tycho | 2014-07-14 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Converted some blockhandlers to use cClearMetaOnDrop | Tycho | 2014-07-14 | 9 | -67/+21 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Simplified ClearMetaOnDrop | Tycho | 2014-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added cClearOnDrop Mixin to cPumpkin | Tycho | 2014-07-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added first implementation of cClearMetaOnDrop | Tycho | 2014-07-14 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #1188 from mc-server/FindClosestPlayerFix | Mattes D | 2014-07-15 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | Fixed FindClosestPlayer | ||||
| * | | | | | | | | | | | | | | Fixed FindClosestPlayer | Tycho | 2014-07-15 | 1 | -3/+6 |
|/ / / / / / / / / / / / / / | |||||
| | | | | * | | | | | | | | | Restructured cSplashPotionEntity code. | madmaxoft | 2014-07-15 | 5 | -72/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType. | ||||
| | | | | * | | | | | | | | | Only the cEntityEffect::effXXX constants are Lua-exported. | madmaxoft | 2014-07-15 | 2 | -72/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the classes don't need exporting, there's no interface using them anyway. | ||||
| | | | | * | | | | | | | | | Reformatted EntityEffect code. | madmaxoft | 2014-07-15 | 1 | -25/+29 |
| | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | Fixed a MSVC warning in cEntityEffect::CreateEntityEffect(). | madmaxoft | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 72 | -443/+699 |
| | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Pass cItem by reference. | madmaxoft | 2014-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 66445. | ||||
* | | | | | | | | | | | | | | Added missing member initialization to cGridStructGen. | madmaxoft | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68228. | ||||
* | | | | | | | | | | | | | | Fixed redstone simulator crash | Tiger Wang | 2014-07-15 | 2 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1176 * Fixed #1186 | ||||
* | | | | | | | | | | | | | | Fixed some meta resetting bugs | Tiger Wang | 2014-07-14 | 6 | -27/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1174 * Fixes #1171 | ||||
* | | | | | | | | | | | | | | Maybe improved arrow sinking | Tiger Wang | 2014-07-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed placing liquids over liquids | Tiger Wang | 2014-07-14 | 1 | -1/+1 |
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1182 | ||||
* | | | | | | | | | | | | | Merge pull request #1177 from mc-server/ChestFix | Mattes D | 2014-07-14 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ChestFix | Tycho | 2014-07-13 | 6 | -8/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes. | worktycho | 2014-07-13 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #1172 from mc-server/coverity_fixes | Mattes D | 2014-07-13 | 3 | -4/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverity fixes | ||||
| * | | | | | | | | | | | | | | | Added parenthasies | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | CopyPaste Error | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70460. | ||||
| * | | | | | | | | | | | | | | | Another COpyPaste Error | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70461 | ||||
| * | | | | | | | | | | | | | | | Fix CopyPaste error that ment a_MaxRelX wasdn't checked | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70464 | ||||
| * | | | | | | | | | | | | | | | Check GridSize for 0 | worktycho | 2014-06-26 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68226 and CID 66437 | ||||
| * | | | | | | | | | | | | | | | Add Null check to SendBlockTo | worktycho | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43611 | ||||
* | | | | | | | | | | | | | | | | Tolua driver: Fixed wrong indentation. | madmaxoft | 2014-07-13 | 1 | -15/+15 |
| |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #1178 from mc-server/projectilefix | Mattes D | 2014-07-13 | 6 | -8/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Made projectile a_Item into a pointer | ||||
| * | | | | | | | | | | | | | | Adjusted calls to CreateProjectile that passed Items | Tycho | 2014-07-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Made CreateProjectile a pointer | worktycho | 2014-07-13 | 4 | -6/+7 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | / / / / / / / / | Fixed MSVC warnings in SoundEffect functions. | madmaxoft | 2014-07-13 | 3 | -15/+7 |
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Update. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'master' into Sounds | Howaner | 2014-07-13 | 8 | -19/+86 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1167 from Howaner/Plugins | Mattes D | 2014-07-13 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed diamond mover plugin | ||||
| | * | | | | | | | | | | | | Fixed diamond mover plugin | Howaner | 2014-07-13 | 1 | -3/+5 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1133 from Howaner/Sheep | Mattes D | 2014-07-13 | 4 | -10/+75 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sheep fixes | ||||
| | * | | | | | | | | | | | | | Changed comments. | Howaner | 2014-07-13 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into Sheep | Howaner | 2014-07-13 | 117 | -2034/+2670 |
| | |\| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add doxy-comments. | Howaner | 2014-07-01 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Moved the random code to a function (cSheep::GenerateNaturalRandomColor()) | Howaner | 2014-06-30 | 2 | -36/+47 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Code fixes. | Howaner | 2014-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Save IsSheared from Sheep. | Howaner | 2014-06-28 | 2 | -4/+14 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix sheep color's, add shear sound. | Howaner | 2014-06-28 | 3 | -3/+42 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1166 from Howaner/GlobalFixes | Mattes D | 2014-07-13 | 3 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) | ||||
| | * | | | | | | | | | | | | | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) | Howaner | 2014-07-13 | 3 | -6/+6 |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
* | / | | | | | | | | | | | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 36 | -83/+77 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Only one instance of server can be started | Tiger Wang | 2014-07-13 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disallows the UDP multicasting that the original code enabled. xoft deterrent, in PR #1151 you implied that this was unwanted behaviour (but comments gone now as I force pushed - check emails?). Revert at will if unsatisfactory :P | ||||
* | | | | | | | | | | | | | Revert failed fix for #31 | Tiger Wang | 2014-07-13 | 2 | -31/+4 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e. | ||||
* | | | | | | | | | | | | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 26 | -218/+387 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented trapped chests & others | ||||
| * | | | | | | | | | | | | cNBTChunkSerializer: Fixed alignment. | madmaxoft | 2014-07-12 | 1 | -14/+14 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | cHopperEntity: Simplified chest conditions. | madmaxoft | 2014-07-12 | 1 | -10/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | cChestEntity: Renamed a member to avoid confusion. | madmaxoft | 2014-07-12 | 2 | -8/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed alignment. | madmaxoft | 2014-07-12 | 1 | -2/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 7 | -30/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 3 | -2/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-11 | 4 | -14/+18 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Improved LinkedPowering speed | Tiger Wang | 2014-07-11 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Additionally fixed wires powering other wires through blocks | ||||
| * | | | | | | | | | | | | Made things consistent | Tiger Wang | 2014-07-08 | 2 | -6/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed compilation and pressure plates | Tiger Wang | 2014-07-07 | 1 | -8/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 26 | -179/+340 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
* | | | | | | | | | | | | | Comment grammar correction | Tiger Wang | 2014-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Simplified buckets code slightly | Tiger Wang | 2014-07-12 | 1 | -32/+15 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1162 from daniel0916/Fixes | Tiger Wang | 2014-07-12 | 1 | -23/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bucket placing | ||||
| * | | | | | | | | | | | | | Changes | daniel0916 | 2014-07-12 | 1 | -5/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Changes | daniel0916 | 2014-07-11 | 1 | -24/+16 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Changes | daniel0916 | 2014-07-10 | 1 | -20/+22 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Maybe fixed whitespaces | daniel0916 | 2014-07-10 | 1 | -7/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Maybe fixed whitespaces | daniel0916 | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed Bucket Placing | daniel0916 | 2014-07-10 | 1 | -6/+57 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed Bucket placing | daniel0916 | 2014-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | ItemHandler.cpp: removed redundant food and drink checks | archshift | 2014-07-14 | 1 | -33/+0 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | Readability and clarity changes | archshift | 2014-07-14 | 4 | -59/+68 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | OnEntityAddEffect.lua: Removed Originator param | archshift | 2014-07-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | EntityEffect: Inlined functions, added explicit copy constructor and operator. | archshift | 2014-07-14 | 2 | -20/+29 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | Changed separating comment style from asterisks to slashes. | archshift | 2014-07-14 | 2 | -93/+93 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | Added splash potions to NBT serialization and retrieval | archshift | 2014-07-12 | 6 | -1/+50 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-12 | 14 | -161/+400 |
| | | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Simplified the player data loading. | madmaxoft | 2014-07-11 | 1 | -9/+8 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Player data filenames are based on UUID. | madmaxoft | 2014-07-11 | 4 | -67/+155 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed a missing return value. | madmaxoft | 2014-07-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Preparation for player UUID-based storage: LoadFromFile() | madmaxoft | 2014-07-11 | 2 | -21/+42 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed style consistency. | madmaxoft | 2014-07-10 | 2 | -61/+64 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | APIDump: Documented cWorld:SetChunkAlwaysTicked. | madmaxoft | 2014-07-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1160 | ||||
* | | | | | | | | | | | | | | Debuggers: Added forced chunk ticking test. | madmaxoft | 2014-07-10 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1160 | ||||
* | | | | | | | | | | | | | | Implemented support for forced chunk ticking. | madmaxoft | 2014-07-10 | 6 | -8/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1160. | ||||
* | | | | | | | | | | | | | | Merge pull request #1159 from mc-server/VectorFloorFix | Mattes D | 2014-07-10 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector floor fix | ||||
| * | | | | | | | | | | | | | | Fixed a missing "inline" keyword. | madmaxoft | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed Vector3.h compilation in MSVC2008. | madmaxoft | 2014-07-10 | 1 | -0/+9 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Removed lilypad from plains village prefabs. | madmaxoft | 2014-07-10 | 1 | -7/+8 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | For now, removed creator member from Entity Effect for pointer safety | archshift | 2014-07-12 | 12 | -104/+94 |
| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 156 | -5178/+7390 |
| | | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
* | | | | | | | | | | | | | | Merge pull request #1157 from Howaner/Window | Mattes D | 2014-07-09 | 3 | -41/+237 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more inventory actions. | ||||
| * | | | | | | | | | | | | | | Removed unused include line. | Howaner | 2014-07-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added inventory number click. | Howaner | 2014-07-09 | 2 | -1/+43 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added drop window action. | Howaner | 2014-07-06 | 3 | -25/+113 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add middle click. | Howaner | 2014-07-05 | 2 | -21/+88 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed bow charge | Tiger Wang | 2014-07-09 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed arrow collection animation | Tiger Wang | 2014-07-09 | 5 | -33/+4 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed piston extension non-solidness | ||||
* | | | | | | | | | | | | | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 19 | -110/+272 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to projectiles and the undead | ||||
| * | | | | | | | | | | | | | | Added extra space before comments | Tiger Wang | 2014-07-07 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Changed everything to callbacks | Tiger Wang | 2014-07-05 | 4 | -82/+53 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Crash and compile fix | Tiger Wang | 2014-07-04 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Compile fix | Tiger Wang | 2014-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-04 | 7 | -11/+20 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Various fixed | Tiger Wang | 2014-07-04 | 4 | -17/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential invalid pointer dereferencing, fixes #1117 * Fixed ender pearls not being loaded properly | ||||
| * | | | | | | | | | | | | | | Eps comparison | Tiger Wang | 2014-07-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-02 | 4 | -19/+31 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Vector clamping fixes | Tiger Wang | 2014-07-01 | 2 | -21/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you, @madmaxoft. | ||||
| * | | | | | | | | | | | | | | Implemented Vector3<>::Floor() | Tiger Wang | 2014-06-30 | 2 | -10/+19 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-29 | 3 | -3/+20 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | An unification of code style | Tiger Wang | 2014-06-28 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Bettered zombie and skeleton AI | Tiger Wang | 2014-06-22 | 2 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential issues with skylight detection | ||||
| * | | | | | | | | | | | | | Some Entity.cpp style improvements | Tiger Wang | 2014-06-22 | 2 | -13/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed multiple issues with projectiles | Tiger Wang | 2014-06-22 | 8 | -63/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed arrows not being collectable/not truly hitting a block/not lodging into blocks/not going in far enough * Fixed projectiles not playing their block hit animation owning to being destroyed too quickly | ||||
* | | | | | | | | | | | | | | Updated generator prefabs to current Gallery contents. | madmaxoft | 2014-07-08 | 3 | -7/+8 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed OpenSSL programs and tests being generated when testing disabled. | tycho | 2014-07-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1144 from mc-server/LuaCodeGen | Mattes D | 2014-07-06 | 5 | -624/+227 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lua code gen | ||||
| * | | | | | | | | | | | | | Tolua generates LuaState_Call.inc file. | madmaxoft | 2014-07-01 | 4 | -624/+31 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Initial codegen for LuaState_Call.inc. | madmaxoft | 2014-07-01 | 1 | -0/+196 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed crafting grid updating. | Mattes D | 2014-07-06 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1152. | ||||
* | | | | | | | | | | | | | | Fixed slime handling in cMonster::StringToMobType(). | madmaxoft | 2014-07-06 | 1 | -1/+1 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1151 from mc-server/immediatesocketrebind | Mattes D | 2014-07-04 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MCS sockets can be rebound immediately | ||||
| * | | | | | | | | | | | | | MCS WebAdmin sockets rebinds instantly | Tiger Wang | 2014-07-04 | 1 | -0/+2 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #272 * Fixes #1150 | ||||
* | | | | | | | | | | | | | cPluginManager: Reformatted the switch statement. | madmaxoft | 2014-07-04 | 1 | -7/+34 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/HandleCommand' | madmaxoft | 2014-07-04 | 3 | -32/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Removed useless sentence in cPluginManager:ExecuteCommand description. | STRWarrior | 2014-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Moved sending error messages to cPluginManager:CallHookChat | STRWarrior | 2014-07-04 | 1 | -4/+6 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed ExecuteCommand description. | STRWarrior | 2014-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed doxycomments | STRWarrior | 2014-06-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | (Force)ExecuteCommand returns the CommandResult enums | STRWarrior | 2014-06-18 | 3 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exported and documented the CommandResult enums | ||||
| * | | | | | | | | | | | | | Added crBlocked and crNoPermission | STRWarrior | 2014-06-17 | 2 | -2/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | HandleCommand now returns an CommandResult enum. | STRWarrior | 2014-06-17 | 2 | -23/+19 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed possible confusion. | STRWarrior | 2014-06-17 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a command handler gets an error then the player will receive an unknown command error. This can be confusing for players. | ||||
* | | | | | | | | | | | | | | Fixed c1deda5d8f01811efa5094e9375166acb69d50ed | Tiger Wang | 2014-07-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I keep on breaking stuff :P | ||||
* | | | | | | | | | | | | | | Removed world-saving log messages. | madmaxoft | 2014-07-04 | 3 | -35/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518 | ||||
* | | | | | | | | | | | | | | APIDump: Updated OnWeatherChanging docs after latest code changes. | madmaxoft | 2014-07-03 | 1 | -4/+7 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Changed OnWeatherChanging hook to always read the returned weather. | madmaxoft | 2014-07-03 | 3 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1512 | ||||
* | | | | | | | | | | | | | | CMake: Changed slash format to support MSYS. | madmaxoft | 2014-07-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044 | ||||
* | | | | | | | | | | | | | | SetFlags.cmake: don't use ${} expansion on if STREQUAL | archshift | 2014-07-03 | 1 | -1/+2 |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://stackoverflow.com/questions/19982340/cmake-compare-to-empty-string-with-strequal-failed | ||||
* | | | | | | | | | | | | | Merge pull request #1138 from mc-server/enderchest | Mattes D | 2014-07-02 | 7 | -113/+78 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly implemented enderchests | ||||
| * | | | | | | | | | | | | | Suggestion | Tiger Wang | 2014-07-02 | 1 | -13/+13 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed unneeded code | Tiger Wang | 2014-06-30 | 4 | -38/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed bad comment | Tiger Wang | 2014-06-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 10 | -99/+102 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Tiger Wang | 2014-07-02 | 9 | -30/+96 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1139 from Howaner/Hooks | Mattes D | 2014-07-02 | 8 | -28/+94 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE | ||||
| | * | | | | | | | | | | | | | | Update documentation | Howaner | 2014-07-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel() | Howaner | 2014-07-02 | 5 | -6/+6 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Change documentation | Howaner | 2014-07-01 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixes. | Howaner | 2014-06-30 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add documentation. | Howaner | 2014-06-30 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE | Howaner | 2014-06-30 | 6 | -26/+67 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Unnecessary return | Howaner | 2014-06-30 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | CMake: Use cmake for file-copying. | madmaxoft | 2014-07-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should enable MSYS builds. | ||||
* | | | | | | | | | | | | | | | | Fixed player teleport food drain | Tiger Wang | 2014-07-02 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Redstone simulator is alerted to lever unpowering | Tiger Wang | 2014-07-02 | 4 | -1/+6 |
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535 | ||||
* | | | / / / / / / / / / / / | Fixed printf formats for Win builds | madmaxoft | 2014-07-01 | 2 | -4/+4 |
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed a possibly unused variable. | madmaxoft | 2014-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #1122 from mc-server/LuaProxy | Mattes D | 2014-07-01 | 6 | -0/+324 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lua proxy DLL builds as part of MCS build. | ||||
| * | | | | | | | | | | | | | | LuaProxy compilation under MinGW. | Mattes D | 2014-07-01 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into LuaProxy | Mattes D | 2014-07-01 | 59 | -1147/+1191 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Added a missing endline. | madmaxoft | 2014-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added the Lua Proxy DLL. | madmaxoft | 2014-06-24 | 6 | -0/+321 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This builds the lua5.1.dll file on Windows, making it 64-bit if so required. | ||||
* | | | | | | | | | | | | | | | | Merge pull request #1141 from Howaner/GlobalFixes | Mattes D | 2014-07-01 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Fix server-crash with non-existing items. | ||||
| * | | | | | | | | | | | | | | | Only fixes the server crash. | Howaner | 2014-07-01 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix server-crash with non-existing items. | Howaner | 2014-07-01 | 2 | -2/+8 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge pull request #1140 from mc-server/FixMingw | Mattes D | 2014-07-01 | 6 | -13/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mingw | ||||
| * | | | | | | | | | | | | | | | Proper sqlite dependency fix. | Mattes D | 2014-07-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Ignore Code:::Blocks project files. | Mattes D | 2014-07-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed linking order under MinGW. | Mattes D | 2014-07-01 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044 | ||||
| * | | | | | | | | | | | | | | | typo | worktycho | 2014-06-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added dependecy of tolualib on lua | worktycho | 2014-06-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed size_t printfing under MinGW. | Mattes D | 2014-06-30 | 1 | -3/+18 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed lua compilation under MinGW. | Mattes D | 2014-06-30 | 1 | -8/+4 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Fixed cFile compilation under MinGW. | madmaxoft | 2014-06-30 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed tolua linking order. | Mattes D | 2014-06-30 | 1 | -3/+1 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044. | ||||
* | | | | | | | | | | | | | | Fixed respawning | Tiger Wang | 2014-06-29 | 12 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1103 | ||||
* | | | | | | | | | | | | | | Fixed offline UUID generator. | Mattes D | 2014-06-29 | 1 | -2/+4 |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It generated invalid UUIDs, too many hex chars. | ||||
* | | | | | | | | | | | | | Merge pull request #1136 from Howaner/GlobalFixes | Mattes D | 2014-06-29 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send statistics to the player on login. | ||||
| * | | | | | | | | | | | | | Send statistics to the player, when he logged in. | Howaner | 2014-06-29 | 2 | -2/+4 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #1132 from mc-server/RemoveMD5 | Mattes D | 2014-06-29 | 7 | -499/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL. | ||||
| * | | | | | | | | | | | | | Fixed a silly path error in #include. | Mattes D | 2014-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | CMake: Added polarssl include dir as non-system. | Mattes D | 2014-06-28 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Changed include folders to work for Bindings, too. | Mattes D | 2014-06-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added PolarSSL dependency to Bindings. | Mattes D | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL. | Mattes D | 2014-06-27 | 7 | -494/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1130. | ||||
* | | | | | | | | | | | | | | Likely fixed too quick food depletion | Tiger Wang | 2014-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS427 properly, hopefully | ||||
* | | | | | | | | | | | | | | Fixed issue with breaking blocks at -1 coordinates | Tiger Wang | 2014-06-28 | 1 | -6/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Implemented tripwire(s) (hooks) | Tiger Wang | 2014-06-28 | 9 | -17/+324 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #944 | ||||
* | | | | | | | | | | | | | | Added more block exceptions to torches | Tiger Wang | 2014-06-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Minor change to buttons and levers | Tiger Wang | 2014-06-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + They now detect if the block they are on occupies its voxel, instead of just being solid | ||||
* | | | | | | | | | | | | | | Fixed bad water/redstone simulator communication | Tiger Wang | 2014-06-28 | 1 | -32/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #713 | ||||
* | | | | | | | | | | | | | | Fixed server forcing players afloat | Tiger Wang | 2014-06-28 | 1 | -1/+4 |
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1131 | ||||
* | | | | | | | | | | | | | Added generic entity-collecting. | Mattes D | 2014-06-27 | 17 | -25/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
* | | | | | | | | | | | | | Merge pull request #1129 from mc-server/CodeCoverageCondition | worktycho | 2014-06-27 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Moved CodeCoverage into a separate cmake condition. | ||||
| * | | | | | | | | | | | | Added MSVC guard | worktycho | 2014-06-27 | 1 | -4/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update SetFlags.cmake | worktycho | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update SetFlags.cmake | worktycho | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | CMake: Added log message for coverage. | madmaxoft | 2014-06-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Moved CodeCoverage into a separate cmake condition. | madmaxoft | 2014-06-27 | 1 | -2/+6 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | CMake: pthread is used only on Unix. | madmaxoft | 2014-06-27 | 1 | -4/+8 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merged branch 'howaner/Bow'. | Mattes D | 2014-06-26 | 4 | -23/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the pickup collection broadcast due to bad code. | ||||
| * | | | | | | | | | | | | Add comment. | Howaner | 2014-06-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | GameMode check | Howaner | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into Bow | Howaner | 2014-06-26 | 82 | -3427/+5264 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | derp | Howaner | 2014-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | The same: Float, not Double | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Float, not Double | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Split Broadcast Sound Effect function call in multiple lines. | Howaner | 2014-06-16 | 2 | -3/+24 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | This isn't needed | Howaner | 2014-06-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix bow sound and creative arrow pickup. | Howaner | 2014-06-16 | 2 | -19/+30 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add bow charging animation | Howaner | 2014-06-16 | 2 | -2/+6 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merged branch 'howaner/Pickups'. | Mattes D | 2014-06-26 | 2 | -7/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fixed a comment and changed CombineCount to short. | Howaner | 2014-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into Pickups | Howaner | 2014-06-26 | 4 | -397/+382 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Optimize combining. | Howaner | 2014-06-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Better combining. | Howaner | 2014-06-24 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix pickup combining over the maximum stack size. | Howaner | 2014-06-24 | 2 | -5/+9 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | FurnaceRecipe parsing: Fixed whitespace removing. | Mattes D | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed misformed trimming. | Mattes D | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | FurnaceRecipe: Moved the parsing into separate functions for clarity. | Mattes D | 2014-06-26 | 2 | -60/+68 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | FurnaceRecipe parser: Made the parser more forgiving. | Mattes D | 2014-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errors don't cause a stop in the parsing, but rather just skip the offending line. | ||||
* | | | | | | | | | | | | | | FurnaceRecipe parser: Added an else branch, changed to a switch. | Mattes D | 2014-06-26 | 1 | -45/+69 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing' | Mattes D | 2014-06-26 | 2 | -92/+170 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Parenthesised comparison | Tiger Wang | 2014-06-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsing | Tiger Wang | 2014-06-22 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/FurnaceRecipe.cpp | ||||
| | * | | | | | | | | | | | | | | Fixed compile errors | worktycho | 2014-06-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-22 | 1 | -6/+7 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-22 | 2 | -40/+30 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Removed debugging code | Tiger Wang | 2014-06-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Rewrote furnace recipe parser | Tiger Wang | 2014-06-21 | 2 | -93/+181 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #110 | ||||
* | | | | | | | | | | | | | | | Merged branch 'tonibm19/master'. | Mattes D | 2014-06-26 | 2 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added pig riding. | tonibm19 | 2014-06-20 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now you can ride a pig using a carrot on a stick. | ||||
* | | | | | | | | | | | | | | | Merge pull request #1126 from mc-server/BlockInfoInit | Mattes D | 2014-06-25 | 2 | -381/+374 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton. | ||||
| * | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton. | madmaxoft | 2014-06-25 | 2 | -381/+374 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is properly initialized before it is ever used. | ||||
* | | | | | | | | | | | | | | Merge pull request #1125 from Howaner/Entities | worktycho | 2014-06-24 | 2 | -16/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Add entity health saving. | ||||
| * | | | | | | | | | | | | | Add entity health saving. | Howaner | 2014-06-24 | 2 | -16/+8 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Fixed BlockInfo initialization. | madmaxoft | 2014-06-24 | 1 | -15/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now cBlockInfo is initialized in the getter, instead of "at any time during startup", which included "after it was already needed". | ||||
* | | | | | | | | | | | | | Added asserts for cChunk::GetBlockEntity() coords. | Mattes D | 2014-06-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed crashes in HopperEntity. | Mattes D | 2014-06-24 | 1 | -19/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the coords were off and some functions were assuming too much. Fixes the crash reported in http://forum.mc-server.org/showthread.php?tid=1497 | ||||
* | | | | | | | | | | | | | Debuggers: Fixed the Blaze rod query tool. | madmaxoft | 2014-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | VoronoiMap: Added a missing initializer. | madmaxoft | 2014-06-23 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68410. | ||||
* | | | | | | | | | | | | | Added a (disabled) block meta mirror / rotate test code. | madmaxoft | 2014-06-23 | 1 | -2/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will perform basic sanity checks on block metadata mirroring and rotating. cMetaRotator must disable its asserts in order for this to work. | ||||
* | | | | | | | | | | | | | Fixed the slab vertical mirroring. | madmaxoft | 2014-06-23 | 1 | -9/+6 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed sign and lever rotations. | madmaxoft | 2014-06-23 | 2 | -8/+9 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Prefabs don't draw into chunk if they don't intersect. | madmaxoft | 2014-06-23 | 1 | -0/+11 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1105 from Howaner/Blocks | Mattes D | 2014-06-22 | 3 | -4/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | Added door and fence gate sounds. | ||||
| * | | | | | | | | | | | | Changed 0xFFFFFFFB to ~0x04 | Howaner | 2014-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into Blocks | Howaner | 2014-06-17 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix fence gate sound (Redstone simulator). | Howaner | 2014-06-17 | 1 | -4/+10 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add fence gate sound. | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add UNUSED() Tags | Howaner | 2014-06-17 | 1 | -0/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add door sound | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-06-22 | 5 | -6/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fixed missing break | worktycho | 2014-06-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68409 | ||||
| * | | | | | | | | | | | | | Fixed invalid iterator | worktycho | 2014-06-22 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 60408 | ||||
| * | | | | | | | | | | | | | Added cClientHandle::IsUUIDOnline function. | madmaxoft | 2014-06-21 | 3 | -2/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #771 | ||||
| * | | | | | | | | | | | | | Restored style continuity. | Alexander Harkness | 2014-06-21 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed another daylight sensor bug | Tiger Wang | 2014-06-22 | 1 | -20/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally fixed unpowering across chunks. | ||||
* | | | | | | | | | | | | | Chests don't open if obstructed | Tiger Wang | 2014-06-22 | 1 | -0/+13 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS383 | ||||
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2014-06-21 | 6 | -2/+669 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Added a TestRails generator. | madmaxoft | 2014-06-21 | 5 | -0/+667 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for debugging purposes only. | ||||
| * | | | | | | | | | | | | Fixed a caching bug in GridStructGen. | madmaxoft | 2014-06-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use. | ||||
* | | | | | | | | | | | | | Updated CONTRIBUTORS file | STRWarrior | 2014-06-21 | 1 | -0/+2 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Updated prefabs to the latest Gallery content. | madmaxoft | 2014-06-21 | 4 | -2049/+2644 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Updated all prefabs to current Gallery content. | madmaxoft | 2014-06-20 | 2 | -650/+824 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | MCA saver marks chunks as populated. | madmaxoft | 2014-06-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #140. | ||||
* | | | | | | | | | | | | Fixed the BiomeVisualiser project. | madmaxoft | 2014-06-20 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiles under MSVC2008 again, was missing some shared files. | ||||
* | | | | | | | | | | | | Optimized Voronoi calculation. | madmaxoft | 2014-06-20 | 4 | -21/+81 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #818. | ||||
* | | | | | | | | | | | Merge pull request #1112 from mc-server/danglingptrs | Mattes D | 2014-06-19 | 35 | -18/+75 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | Nullify deleted pointers. | ||||
| * | | | | | | | | | | Nullify deleted pointers. | archshift | 2014-06-19 | 35 | -18/+75 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1096 from mc-server/redstonerefactor | Alexander Harkness | 2014-06-18 | 3 | -140/+79 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Moved delayed repeaters to be handled in a seperate pass | ||||
| * | | | | | | | | | | FIxed second weird enum | Tycho | 2014-06-16 | 1 | -20/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Refactored reversing logic into seperate function | Tycho | 2014-06-16 | 2 | -16/+16 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed tigers weird enums | Tycho | 2014-06-16 | 1 | -14/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into redstonerefactor | Tycho | 2014-06-16 | 35 | -469/+899 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | | | | | | | | | | Moved repeater handling to seperate pass | Tycho | 2014-06-16 | 2 | -97/+64 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1045 from Howaner/GlobalFixes | Mattes D | 2014-06-18 | 12 | -61/+158 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Little fixes | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 224 | -2010/+26942 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Check block type from cBlockEntity | Howaner | 2014-06-17 | 1 | -8/+8 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add more documentation. | Howaner | 2014-06-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add comment. | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Revert "Fix right click bugs." | Howaner | 2014-06-17 | 1 | -41/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 61b6fdde7553dac6e2d5c5a071b9a13fa0d71b2f. | ||||
| * | | | | | | | | | | | | The motion is already set in AddBasicEntity() | Howaner | 2014-06-17 | 1 | -5/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add DoWithBlockEntityAt() to WorldInterface.h | Howaner | 2014-06-17 | 4 | -40/+64 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Wrong arrow commit. | Howaner | 2014-05-30 | 1 | -4/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Code improvements | Howaner | 2014-05-28 | 3 | -12/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix hay place sound. | Howaner | 2014-05-28 | 2 | -1/+31 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix fire break. | Howaner | 2014-05-28 | 2 | -18/+19 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add throw sound and fix arrow server crash. | Howaner | 2014-05-28 | 4 | -5/+16 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix Y-Position from arrow entity. | Howaner | 2014-05-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix right click bugs. | Howaner | 2014-05-28 | 1 | -40/+41 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix skull bugs. | Howaner | 2014-05-28 | 2 | -2/+46 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1100 from Howaner/Slabs | archshift | 2014-06-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix doubleslab meta. | Howaner | 2014-06-16 | 1 | -0/+1 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
| | | | | | | * | | | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 15 | -320/+748 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result. | ||||
| | | | | | | * | | | | | Entity effects: changed User to Creator, removed pawn pass-by-value | archshift | 2014-06-17 | 6 | -36/+20 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | APIDump: Added OnEntityAddEffect hook documentation. | madmaxoft | 2014-06-17 | 1 | -0/+34 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Added the OnEntityAddEffect hook. | madmaxoft | 2014-06-17 | 7 | -0/+57 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Entity Effects: Clarified user, added it to AddEntityEffect | archshift | 2014-06-17 | 7 | -15/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class. | ||||
| | | | | | | * | | | | | Changed the AddEntityEffect() params for easier calls. | madmaxoft | 2014-06-17 | 7 | -50/+52 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Entity Effect: Separates total duration and ticks of activity | archshift | 2014-06-17 | 3 | -22/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter | ||||
| | | | | | | * | | | | | Fixed MSVC compilation. | madmaxoft | 2014-06-17 | 3 | -14/+17 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 8 | -10/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| | | | | | | * | | | | | Cave spider now poisons its victim, added IsPawn function to Entity | archshift | 2014-06-17 | 5 | -5/+24 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Added wither damage type, wither entity effect. | archshift | 2014-06-17 | 4 | -1/+21 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Monster: added IsUndead(), undead-specific entity effects | archshift | 2014-06-17 | 3 | -6/+71 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Applies splash potion effects to mobs as well as players | archshift | 2014-06-17 | 2 | -8/+12 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Removed long function wrapping | archshift | 2014-06-17 | 2 | -12/+3 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | ItemHandler: changed IsDrinkable() to take a short argument | archshift | 2014-06-17 | 5 | -18/+14 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Splash potion: Adjusted speed, fixed spawn position | archshift | 2014-06-17 | 1 | -6/+3 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Entity effect type: use 'eff' as a prefix instead of 'ef' | archshift | 2014-06-17 | 5 | -74/+74 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Added splash potion functionality | archshift | 2014-06-17 | 6 | -15/+122 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Entity: only fire critical hit if damage type is physical | archshift | 2014-06-17 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Player: made healing instantaneous | archshift | 2014-06-17 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Implemented drinkable potions, noeffect entity effect, | archshift | 2014-06-17 | 8 | -6/+165 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clears entity effects on death | ||||
| | | | | | | * | | | | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 7 | -5/+86 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Pawn.cpp: fixed effect iterator BAD_ACCESS | archshift | 2014-06-17 | 2 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erasure was occurring before the iterator increased, causing a bad access. Solved by storing map pairs in variables and manually updating iterator before erasure. Fixed mix-up in function arguments on food poisoning | ||||
| | | | | | | * | | | | | Pawn: Enabled entity effect broadcast, added typedef | archshift | 2014-06-17 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap | ||||
| | | | | | | * | | | | | EntityEffect: read-only getters, added user and distance modifier fields | archshift | 2014-06-17 | 3 | -11/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User: the pawn that uses or produces the entity effect (drinks/throws a potion) Distance modifier: the potency modifier from splash potion effectivity radius | ||||
| | | | | | | * | | | | | Player: Removed food-poisoning-specific code, set duration to 30 seconds | archshift | 2014-06-17 | 3 | -27/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior | ||||
| | | | | | | * | | | | | Entity effects: Added handlers for entity effects | archshift | 2014-06-17 | 4 | -13/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations | ||||
| | | | | | | * | | | | | Added iterator on tick to manage entity effect duration | archshift | 2014-06-17 | 1 | -1/+18 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | cPawn: Remove unused m_bBurnable | archshift | 2014-06-17 | 2 | -2/+0 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Moved Effects.h to EntityEffects.h, added initial impl | archshift | 2014-06-17 | 9 | -36/+115 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | Added classes for splash potions and wither skulls | archshift | 2014-06-17 | 5 | -0/+149 |
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1101 from Howaner/FenceGate | worktycho | 2014-06-17 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | Fix fence gate redstone simulator. | ||||
| * | | | | | | | | | | Fix fence gate redstone simulator. | Howaner | 2014-06-17 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1099 from Howaner/Blocks | Mattes D | 2014-06-17 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Glass-made blocks don't drop pickups. | ||||
| * | | | | | | | | | | | Glass shouldn't drop. | Howaner | 2014-06-16 | 1 | -0/+3 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1102 from Howaner/PressurePlate | Mattes D | 2014-06-17 | 3 | -0/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Add pressure plate handler | ||||
| * | | | | | | | | | | Add parenthesis | Howaner | 2014-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add end lines to BlockPressurePlate.h | Howaner | 2014-06-17 | 1 | -1/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add pressure plate handler | Howaner | 2014-06-17 | 3 | -0/+41 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Fixed GCC compilation. | madmaxoft | 2014-06-16 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed MSVC builds. | madmaxoft | 2014-06-16 | 1 | -9/+0 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #883 from mc-server/CutOffLighting | worktycho | 2014-06-16 | 3 | -16/+96 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Lighting reads blocktypes only for blocks under heightmap. | ||||
| * | | | | | | | | | Fixed link errors | Tycho | 2014-04-12 | 1 | -0/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed member construction order. | madmaxoft | 2014-04-12 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Lighting reads blocktypes only for blocks under heightmap. | madmaxoft | 2014-04-12 | 2 | -16/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should theoretically speed it up, since less data is copied back and forth. Also implemented a possibly more cache-friendly blocklight starter algorithm (PrepareBlockLight2()), is disabled by default, needs perf testing. | ||||
* | | | | | | | | | | Fixed gcc compilation. | madmaxoft | 2014-06-16 | 1 | -1/+1 |
| |_|_|/ / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge pull request #1024 from worktycho/AllocationPool | Mattes D | 2014-06-16 | 12 | -55/+281 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | First attempt at implementing an Allocation pool | ||||
| | * | | | | | | | | Added override | Tycho | 2014-06-16 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Changed names of callbacks | Tycho | 2014-06-14 | 2 | -10/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed spaces | Tycho | 2014-06-14 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Documented starvation callbacks | Tycho | 2014-06-14 | 1 | -0/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Documented cAllocationPool | Tycho | 2014-06-14 | 1 | -0/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Reformated ChunkMap.h | Tycho | 2014-06-14 | 2 | -4/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Moved m_Sections | Tycho | 2014-06-14 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added generic Allocation Pool Interface | Tycho | 2014-06-14 | 12 | -69/+110 |
| | | | | | | | | | | |||||
| | * | | | | | | | | reverted accedental android changes | Tycho | 2014-06-14 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fixed spaces | Tycho | 2014-06-14 | 8 | -14/+16 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fixed spaces | Tycho | 2014-06-14 | 8 | -16/+16 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fixed compile | Tycho | 2014-06-14 | 2 | -2/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fixed const issue | Tycho | 2014-06-14 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fill with buffer on startup | Tycho | 2014-06-14 | 1 | -0/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed comments | Tycho | 2014-06-14 | 2 | -6/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added logging | Tycho | 2014-06-14 | 1 | -3/+12 |
| | | | | | | | | | | |||||
| | * | | | | | | | | merge master | Tycho | 2014-06-14 | 194 | -2164/+25270 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixed bad merge | Tycho | 2014-05-25 | 3 | -10/+17 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPool | Tycho | 2014-05-25 | 89 | -1603/+2713 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkData.cpp src/ChunkData.h tests/ChunkData/Coordinates.cpp | ||||
| | * | | | | | | | | | | Fixed bug in freeing NULL pointers | Tycho | 2014-05-25 | 1 | -13/+15 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Implemented Allocation Pool use by cChunkData | Tycho | 2014-05-23 | 11 | -45/+125 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use placement new to initalise objects | Tycho | 2014-05-23 | 1 | -2/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPool | Tycho | 2014-05-23 | 16 | -144/+228 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Added callback for stopping starvation mode | Tycho | 2014-05-21 | 1 | -0/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Implemented Allocation Pool | Tycho | 2014-05-21 | 1 | -0/+50 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed a copypasta error in WormNestCaves generator settings. | madmaxoft | 2014-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Updated the SandFlatRoofVillage prefabs. | madmaxoft | 2014-06-16 | 1 | -288/+381 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added random offsets to cGridStructGen. | madmaxoft | 2014-06-15 | 17 | -85/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #740. | ||||
| * | | | | | | | | | | | | Merge pull request #1090 from mc-server/saveoncrash | Mattes D | 2014-06-15 | 2 | -2/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Data is saved on crash | ||||
| | * | | | | | | | | | | | | Players are saved regularly | Tiger Wang | 2014-06-15 | 2 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1076 | ||||
| * | | | | | | | | | | | | | Fixed bad comparison crash | Tiger Wang | 2014-06-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1095 | ||||
| * | | | | | | | | | | | | | Fixed daylight sensor unpowering | Tiger Wang | 2014-06-15 | 1 | -6/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1094 | ||||
| * | | | | | | | | | | | | | Merge pull request #1019 from mc-server/cPlayerSetSpeed | Mattes D | 2014-06-14 | 4 | -31/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | cPlayer set speed | ||||
| | * | | | | | | | | | | | | Removed an unused tolua_end and tolua_begin pair. | madmaxoft | 2014-06-14 | 1 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Simplified speed clamping. | madmaxoft | 2014-06-14 | 1 | -8/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Refactored speed-setting to use a common function for all cases. | madmaxoft | 2014-06-14 | 4 | -93/+44 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into cPlayerSetSpeed | madmaxoft | 2014-06-14 | 216 | -1988/+26550 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Player.h: Moved doxy-comments to Entity.h | archshift | 2014-06-11 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved doxy-comments to the defining function in Entity.h rather than the overloaded functions in Player.h Comment for each function (instead of assumed encapsulating comments) @deprecated tag for ForceSetSpeed() | ||||
| | * | | | | | | | | | | | | | Added doxy-comments | STRWarrior | 2014-05-22 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | cEntity::SetSpeed(a_Vector3d) isn't virtualized anymore | STRWarrior | 2014-05-22 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | cPlayer overrides the SetSpeedXX functions | STRWarrior | 2014-05-22 | 3 | -4/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compile error | ||||
| | * | | | | | | | | | | | | | Both SetSpeed functions are now overridden by cPlayer | STRWarrior | 2014-05-22 | 3 | -6/+32 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 35 | -469/+900 |
| |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fix a few warnings | Tycho | 2014-06-16 | 1 | -3/+3 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #1093 from mc-server/BindingsFix | Mattes D | 2014-06-14 | 3 | -9/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed MSVC Bindings generation. | ||||
| * | | | | | | | | | | | | | Fixed bindings generation for Win64 builds. | Mattes D | 2014-06-14 | 3 | -9/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1092. | ||||
| * | | | | | | | | | | | | | Fixed MSVC Bindings generation. | Mattes D | 2014-06-14 | 1 | -0/+3 |
|/ / / / / / / / / / / / / | |||||
* | / / / / / / / / / / / | Remove windows bindings crutch | worktycho | 2014-06-14 | 1 | -10/+0 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed a repeater issue | Tiger Wang | 2014-06-14 | 2 | -17/+16 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Repeaters now properly continuously update their powering * Minor cosmetic improvements | ||||
* | | | | | | | | | | | Reduced cPluginManager code duplication | Tiger Wang | 2014-06-14 | 1 | -286/+178 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed ChunkWorx stop button giving an error | STRWarrior | 2014-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1089 from mc-server/tolua-auto | Mattes D | 2014-06-13 | 2 | -84/+85 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | automaticlly build tolua and generate bindings as part of build. | ||||
| * | | | | | | | | | | | automaticlly build tolua and generate bindings as part of build. | tycho | 2014-06-12 | 2 | -84/+85 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Removed an unused fwd declaration. | madmaxoft | 2014-06-13 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | APIDump: Added the Info.lua article. | madmaxoft | 2014-06-13 | 2 | -0/+247 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #504. | ||||
* | | | | | | | | | | | Typo Correction | Alexander Harkness | 2014-06-12 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Fixed two redstone bugs | Tiger Wang | 2014-06-12 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed chunk border powering * Fixed quick place-replace powering | ||||
* | | | | | | | | | | Merge pull request #1082 from mc-server/cauldronfixes | Alexander Harkness | 2014-06-12 | 4 | -73/+112 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add biome-aware downfall functions. | ||||
| * | | | | | | | | | | Fixed constness | worktycho | 2014-06-11 | 3 | -72/+79 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Compile fix | Tiger Wang | 2014-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Reduced code duplication | Tiger Wang | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call @maxmaxoft! calling... call connected (0:20) call ended | ||||
| * | | | | | | | | | | IsWeatherSunnyAt does something useful :D | Tiger Wang | 2014-06-11 | 1 | -9/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Update APIDesc.lua | Alexander Harkness | 2014-06-11 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Update APIDesc.lua | Tiger Wang | 2014-06-11 | 1 | -3/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | SMICOLOSL | Alexander Harkness | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meant to be semicolons up there. | ||||
| * | | | | | | | | | | Updated unnecessary function :/ | Tiger Wang | 2014-06-11 | 1 | -1/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add DoxyComments to he weather things. | Alexander Harkness | 2014-06-11 | 1 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed the function names. | ||||
| * | | | | | | | | | | Add new IsWeatherWet hook for cauldrons. | Alexander Harkness | 2014-06-11 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment? | ||||
* | | | | | | | | | | | Merge pull request #1086 from qaisjp/patch-1 | Mattes D | 2014-06-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in handy_functions.lua | ||||
| * | | | | | | | | | | | Fix typo in handy_functions.lua | Qais Patankar | 2014-06-12 | 1 | -2/+2 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #1084 from mc-server/PlankRoads | STRWarrior | 2014-06-11 | 1 | -4/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Plank Roads | ||||
| * | | | | | | | | | | | Roads in villages are made out of wooden planks if they generate on water. | STRWarrior | 2014-06-11 | 1 | -4/+17 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | DispenserEntity code cleanup after PR merge. | madmaxoft | 2014-06-11 | 2 | -30/+30 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge remote-tracking branch 'joannis/master' | madmaxoft | 2014-06-11 | 2 | -19/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | - Fixed a lot of alignment | JoannisO | 2014-06-05 | 1 | -7/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | - Removed the code that removed fireworks from a dispenser even thought | JoannisO | 2014-06-04 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they weren't launched. | ||||
| * | | | | | | | | | | | | - Fixed variable names in a function. | JoannisO | 2014-06-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | - Fixed a lot of astethics | JoannisO | 2014-06-04 | 2 | -14/+17 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | - Fixed an issue where there were 2 "DispChunk"-s in the same function. | JoannisO | 2014-06-03 | 1 | -16/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resused the initial one. | ||||
| * | | | | | | | | | | | | - Fixed a bug where I didn't return anything in the GetShootVector | JoannisO | 2014-06-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function. This was however passed as "working" by GCC. | ||||
| * | | | | | | | | | | | | - Fixed a bug where I used the FireCharge ITEM instead of the Projectile | JoannisO | 2014-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENUM | ||||
| * | | | | | | | | | | | | - Cleaned up the code massively | JoannisO | 2014-06-03 | 2 | -90/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Stopped using cChunk in the GetShootVector class. Parameter is now the Metadata of the block - Stopped using cChunk in the SpawnProjectileFromDispenser method now using coordinates and finding the chunk by itself. - Removed the matrix calculations from GetShootVector. | ||||
| * | | | | | | | | | | | | - Added doxy comments and exported to lua | Joannis | 2014-06-03 | 2 | -22/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Manipulation of the ShootVector is not to be done by the function that wants to spawn a projectile. | ||||
| * | | | | | | | | | | | | - Changed the name of the ProjectileLookVector method. | JoannisO | 2014-05-31 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: I still think the new name is unclear. Any other suggestions are welcome. | ||||
| * | | | | | | | | | | | | - Prefixed all args with "a_" | JoannisO | 2014-05-29 | 2 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added braces around the cases. | ||||
| * | | | | | | | | | | | | - Removed breaks. I thought it wouldn't compile without them but the | JoannisO | 2014-05-28 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue was appearantly solved with an earlier commit. | ||||
| * | | | | | | | | | | | | - Fixed an issue where dispensers would only shoot arrows (appearantly | JoannisO | 2014-05-28 | 1 | -33/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some commits didn't come through) - Cleaned up the code according to suggestions. | ||||
| * | | | | | | | | | | | | - Implemented vertical dispensing for projectiles. | Joannis | 2014-05-28 | 2 | -16/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some terrible commit issues on my side. | ||||
| * | | | | | | | | | | | | - Fixed the ampersands and asterisks to fit the format. | Joannis | 2014-05-27 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing. | ||||
| * | | | | | | | | | | | | - Added support for more types of projectiles in the Dispenser | JoannisO | 2014-05-26 | 2 | -38/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improved the method of spawning projectiles in the world - Added another method for spawning the projectiles | ||||
| * | | | | | | | | | | | | Added Arrow- and FireCharge-Dispensing to DispenserEntity. | JoannisO | 2014-05-26 | 2 | -27/+95 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Changed the teleport permissions to the new ones. | Alexander Harkness | 2014-06-11 | 1 | -1/+1 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | APIDump: Documented cBlockArea:GetCoordRange(). | madmaxoft | 2014-06-11 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Added cBlockArea:GetCoordRange to Lua API. | madmaxoft | 2014-06-11 | 1 | -0/+32 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Revert "Initial Mesa Bryce implementation." | madmaxoft | 2014-06-11 | 4 | -116/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1ff1a93866ab81e3868588a256f446a902a1a8c4. | ||||
* | | | | | | | | | | | | Added coverity badge | worktycho | 2014-06-11 | 1 | -1/+1 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Removed assert that is now informed by type system | worktycho | 2014-06-11 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Update GETTING-STARTED.md | worktycho | 2014-06-11 | 1 | -11/+11 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Update GETTING-STARTED.md | Alexander Harkness | 2014-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Test | Alexander Harkness | 2014-06-11 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Removed derpbadge. | Alexander Harkness | 2014-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Initial Mesa Bryce implementation. | madmaxoft | 2014-06-10 | 4 | -4/+116 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Fixed clang warnings about abs() in Noise.cpp. | madmaxoft | 2014-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC provides a float overload of abs(), clang does not. Using the proper fabs(). | ||||
* | | | | | | | | | | Fixed a race condition when adding a player to a world. | madmaxoft | 2014-06-10 | 3 | -4/+29 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed gcc compilation. | madmaxoft | 2014-06-10 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added an experimental height generator, Mountains. | madmaxoft | 2014-06-09 | 2 | -0/+87 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added cRidgedMultiNoise, fixed cPerlinNoise. | madmaxoft | 2014-06-09 | 2 | -1/+233 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added Y coord checks and documentation to cBlockDoorHandler. | madmaxoft | 2014-06-09 | 1 | -19/+40 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge remote-tracking branch 'howaner/Redstone' | madmaxoft | 2014-06-09 | 3 | -35/+62 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Moved the IsDoor check before the meta get. | Howaner | 2014-05-31 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add doxy-comment | Howaner | 2014-05-31 | 1 | -3/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Better SetOpen() and IsOpen() function from the doors. | Howaner | 2014-05-30 | 2 | -77/+27 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug. | Howaner | 2014-05-29 | 2 | -13/+90 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | docs/Generator: Fixed typo. | madmaxoft | 2014-06-09 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed debugging code in tolua++ driver script. | madmaxoft | 2014-06-09 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | ToLua can now be run in pure-lua mode. | madmaxoft | 2014-06-09 | 6 | -8/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the src/Bindings/AllToLua_lua.bat for usage example. | ||||
* | | | | | | | | | | docs/Generator: Added SmallFoliage illlustrations. | madmaxoft | 2014-06-09 | 4 | -0/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed a crash when creating negative-size blockareas. | madmaxoft | 2014-06-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the server emits a warning instead and continues execution. | ||||
* | | | | | | | | | | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 32 | -96/+204 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
* | | | | | | | | | | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 6 | -7/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | | | | | | | | | Small change for easier understanding. | Alexander Harkness | 2014-06-08 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Proper fix for long interaction. | madmaxoft | 2014-06-08 | 1 | -7/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1078 and #1038. | ||||
* | | | | | | | | | | Merge pull request #1077 from mc-server/fuelfixes | worktycho | 2014-06-07 | 1 | -15/+27 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Corrected the furnace fuels. Solves #1071 | ||||
| * | | | | | | | | | | Corrected the furnace fuels. Solves #1071 | Alexander Harkness | 2014-06-07 | 1 | -15/+27 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | docs/Generator: fixed grass confusion. | Mattes D | 2014-06-07 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | docs/Generator: Added the easy Finishers. | madmaxoft | 2014-06-07 | 2 | -3/+130 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added RainbowRoads finisher generator. | madmaxoft | 2014-06-07 | 5 | -3/+1594 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Further improvements on redstone speed | Tiger Wang | 2014-06-07 | 3 | -68/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on suggestions of @worktycho * Repeaters now walk their data structure only when needed * Fixed a bug with cChunkData returning an incorrect value for whether a meta had changed | ||||
* | | | | | | | | | | Fixed mob hitbox sizes, removed TODOs | archshift | 2014-06-07 | 3 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Measured bat and blaze in vanilla, updated values. Cavespiders are, in fact, passive in the day. | ||||
* | | | | | | | | | | Fixed a typo. | Mattes D | 2014-06-07 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Further reduced redstone idle CPU consumption | Tiger Wang | 2014-06-06 | 1 | -7/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Repeaters and wires are no longer unnecessarily ticked * Fixed #1063, likely addressed #1062 * Fixed bugs regarding duplicate values | ||||
* | | | | | | | | | | Grammar | worktycho | 2014-06-06 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Expanded GPU section | worktycho | 2014-06-06 | 1 | -1/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed numbers | worktycho | 2014-06-06 | 1 | -1/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | typo | worktycho | 2014-06-06 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | docs/Generator: Added basic terrain composition. | madmaxoft | 2014-06-05 | 4 | -1/+31 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Typographical error | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Start of GPU section. | worktycho | 2014-06-05 | 1 | -0/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | docs/Generator: Added the TerrainHeight section. | madmaxoft | 2014-06-05 | 4 | -0/+54 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Redstone fixes and improvements [SEE DESC] | Tiger Wang | 2014-06-05 | 3 | -61/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Haha, see desc. * Improved redstone speed through a marking dirty system. Only a select few devices are still continuously simulated * Fixed redstone crashing with recent piston changes | ||||
* | | | | | | | | | | Merge pull request #1011 from SphinxC0re/SomeWarningFixes | Mattes D | 2014-06-04 | 4 | -3/+17 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed some warnings | ||||
| * | | | | | | | | | | Update IncrementalRedstoneSimulator.cpp | Julian Laubstein | 2014-06-04 | 1 | -8/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Update Globals.h | Julian Laubstein | 2014-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Changed the m_slotarea position | Julian Laubstein | 2014-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed warnings in IncrementalRedstoneSimulator | Julian Laubstein | 2014-05-19 | 1 | -1/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed some warnings in Server.cpp, and in UI/ | Julian Laubstein | 2014-05-19 | 3 | -3/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Rolled some changes back | Julian Laubstein | 2014-05-19 | 1 | -12/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed some warnings | Julian Laubstein | 2014-05-19 | 2 | -2/+13 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1060 from Howaner/Inventory | Mattes D | 2014-06-04 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Fix itemframe break. | ||||
| * | | | | | | | | | | Fix itemframe break. | Howaner | 2014-06-04 | 1 | -1/+3 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1059 from mc-server/coverity_fixes | worktycho | 2014-06-04 | 4 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Coverity fixes | ||||
| * | | | | | | | | | | derp | worktycho | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed bad coordinate | worktycho | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Make sure m_StackSizeToBeUsedInRepair Always has a valid value | worktycho | 2014-06-04 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed unused field test | worktycho | 2014-06-04 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Initialise m_Callbacks field to NULL in empty constructor. | worktycho | 2014-06-04 | 1 | -1/+2 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Fixed buffer overflow in JSON. | madmaxoft | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on Coverity as CID 43614. | ||||
* | | | | | | | | | | Exploded creepers drop nothing, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -2/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed mob loading, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed #1057 | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | docs/Generator: Re-fixed the wording. | madmaxoft | 2014-06-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Player permissions aren't logged to console anymore. | madmaxoft | 2014-06-03 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was only logspam on most servers and there are alternative ways to list players' permissions. | ||||
* | | | | | | | | | | Merge remote-tracking branch 'howaner/Inventory' | madmaxoft | 2014-06-03 | 2 | -2/+133 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Players can't set items in the result slot, when they shift a item. | Howaner | 2014-06-01 | 2 | -0/+39 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add HandleSmeltItem() call for achievements. | Howaner | 2014-06-01 | 1 | -7/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Missing return; | Howaner | 2014-06-01 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Set DraggingItem to Slot directly. | Howaner | 2014-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix DBL bug. | Howaner | 2014-05-31 | 1 | -5/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0" | Howaner | 2014-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix the furnace result slot. | Howaner | 2014-05-30 | 1 | -2/+90 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed OnProjectileHitBlock bindings. | madmaxoft | 2014-06-03 | 3 | -82/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also sorted the various cLuaState::Push() functions. | ||||
* | | | | | | | | | | | docs/Generator: Updated PerlinRivers with better images. | madmaxoft | 2014-06-03 | 5 | -1/+5 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1028 from mc-server/pistonfixes | Mattes D | 2014-06-03 | 15 | -457/+401 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Piston fixes | ||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 15 | -457/+401 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| | * | | | | | | | | | | | Suggestions two | Tiger Wang | 2014-06-01 | 2 | -10/+12 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Suggestions | Tiger Wang | 2014-05-29 | 1 | -1/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | More comments! | Tiger Wang | 2014-05-29 | 1 | -5/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Revert "Fixed a food saturation issue" | Tiger Wang | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67308e4337b422ebefb249049e662266072b0ba2. | ||||
| | * | | | | | | | | | | | Changed block send queue to use vectors | Tiger Wang | 2014-05-29 | 3 | -21/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by @worktycho. | ||||
| | * | | | | | | | | | | | Fixed piston power checking | Tiger Wang | 2014-05-29 | 1 | -11/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed a food saturation issue | Tiger Wang | 2014-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 15 | -437/+372 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | | | | | | | | | | | | docs/Generator: Shrunk the hand-drawn images by 50 %. | madmaxoft | 2014-06-03 | 13 | -0/+0 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'GeneratorArticle' | madmaxoft | 2014-06-03 | 27 | -47/+374 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Generator article: Added TOC with links. | madmaxoft | 2014-06-03 | 1 | -7/+44 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Generator article: fixed bad wording. | madmaxoft | 2014-06-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Generator article: Finished the Biome-gen section and images. | madmaxoft | 2014-06-02 | 8 | -14/+25 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | AnvilStats: Added new biome colors. | Mattes D | 2014-06-01 | 2 | -34/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Generator article now has all biome genertors and most their imgs. | Mattes D | 2014-06-01 | 15 | -8/+156 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Hot-fixed AnvilStats compilation for MSVC2013. | Mattes D | 2014-06-01 | 3 | -13/+56 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into GeneratorArticle | Mattes D | 2014-06-01 | 138 | -910/+20904 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Initial commit of the Generator article. | Mattes D | 2014-05-30 | 1 | -0/+119 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #1052 from mc-server/UnderwaterBaseGen | Mattes D | 2014-06-02 | 5 | -0/+2489 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | Underwater base gen | ||||
| * | | | | | | | | | | | | | | Update UnderwaterBase prefabs. | madmaxoft | 2014-06-01 | 1 | -12/+378 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights. | ||||
| * | | | | | | | | | | | | | | Updated UnderwaterBase prefabs. | madmaxoft | 2014-06-01 | 1 | -103/+123 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added an initial version of the underwater base generator. | madmaxoft | 2014-05-31 | 5 | -0/+2103 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Small tweak for mobs | STRWarrior | 2014-06-02 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs move a bit smoother and aren't able to move allot when in air. | ||||
* | | | | | | | | | | | | | | | cBlockArea reading hotfix. | madmaxoft | 2014-06-02 | 1 | -63/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the crashes introduced with chunksparsing. Not the most performant solution, but at least it should work. Ref.: #1056 | ||||
* | | | | | | | | | | | | | | | APIDump: Fixed crash | STRWarrior | 2014-06-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Added OnProjectileHitBlock example in Debuggers | STRWarrior | 2014-06-02 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Updated OnProjectileHitBlock documentation. | STRWarrior | 2014-06-02 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #844 from mc-server/ProjectileHitBlock | Mattes D | 2014-06-01 | 6 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnProjectileHitBlock tweak. | ||||
| * | | | | | | | | | | | | | | | Made a_BlockHitPos a reference | STRWarrior | 2014-06-01 | 5 | -6/+6 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Used recommendations | STRWarrior | 2014-05-31 | 6 | -9/+8 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Using recommendations (I think) | STRWarrior | 2014-03-30 | 6 | -6/+7 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added a BlockHitPos parameter to OnProjectileHitBlock | STRWarrior | 2014-03-30 | 6 | -9/+9 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added a blockface parameter to the OnProjectileHitBlock hook. | STRWarrior | 2014-03-30 | 6 | -8/+8 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | abort does not take a parameter. | worktycho | 2014-06-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Use abort in SIGSEGV and SIGABRT handlers | worktycho | 2014-06-01 | 1 | -2/+2 |
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should cause Mcserver to generate core dumps when it crashes. | ||||
* | | | | | | | | | | | | | | | Updated AlchemistVillage prefabs. | madmaxoft | 2014-06-01 | 1 | -103/+105 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #1018 from mc-server/VillageGen | Mattes D | 2014-05-31 | 25 | -23/+17115 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Village gen | ||||
| * | | | | | | | | | | | | | | Updated PlainsVillage prefabs. | madmaxoft | 2014-05-31 | 1 | -73/+85 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a memory leak in VillagGen. | madmaxoft | 2014-05-31 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Updated PlainsVillage and AlchemistVillage. | madmaxoft | 2014-05-30 | 2 | -239/+1270 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a memory leak in cPOCPieceGenerator | madmaxoft | 2014-05-29 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into VillageGen | madmaxoft | 2014-05-29 | 4 | -1/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a crash in message formatter. | madmaxoft | 2014-05-28 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code would fail if a message is sent to a player not yet added to a world. | ||||
| * | | | | | | | | | | | | | | Merge branch 'master' into VillageGen | madmaxoft | 2014-05-27 | 14 | -79/+157 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added AlchemistVillage prefabs (Thanks, KingsCraftAu). | madmaxoft | 2014-05-27 | 3 | -9/+3007 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed testing weights in PlainsVillages. | madmaxoft | 2014-05-27 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | cPieceGenerator chooses starting pieces based on weights. | madmaxoft | 2014-05-27 | 4 | -1/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1033. | ||||
| * | | | | | | | | | | | | | | Biome generators: biome lists can contain spaces. | madmaxoft | 2014-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed prefab test initialization. | madmaxoft | 2014-05-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added support for Miners' Village. | madmaxoft | 2014-05-25 | 10 | -2234/+4438 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors. Fixes #1027. | ||||
| * | | | | | | | | | | | | | | Added Japanese village prefabs. | madmaxoft | 2014-05-24 | 5 | -4/+2442 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into VillageGen | Mattes D | 2014-05-23 | 12 | -19/+177 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fixed profiling flags for MSVC. Fixed cWither::KilledBy Cleaned up cPlayer::UpdateMovementStats; Wither achievements Fixed MCADefrag compilation. Derp Should have fixed assumptions about entity width. Fixed clanging errors. Implemented cacti damage | ||||
| * | | | | | | | | | | | | | | | Updated plains village prefabs. | madmaxoft | 2014-05-22 | 1 | -186/+171 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects. | ||||
| * | | | | | | | | | | | | | | | Villages have min and max density setting. | madmaxoft | 2014-05-22 | 5 | -17/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020. | ||||
| * | | | | | | | | | | | | | | | Updated plains village prefabs. | madmaxoft | 2014-05-22 | 1 | -44/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes. | ||||
| * | | | | | | | | | | | | | | | Changed desert village roads to gravel. | madmaxoft | 2014-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added second kind of desert village (FlatRoof). | madmaxoft | 2014-05-21 | 3 | -4/+1535 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merged branch 'master' into VillageGen. | madmaxoft | 2014-05-18 | 60 | -328/+1589 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Updated SandVillage prefabs to latest Gallery content. | madmaxoft | 2014-05-18 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes sand village generation. | ||||
| * | | | | | | | | | | | | | | | | Village roads are drawn properly. | madmaxoft | 2014-05-17 | 2 | -8/+35 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Village houses are height-adjusted onto the terrain. | madmaxoft | 2014-05-17 | 5 | -7/+67 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Updated PlainsVillage prefabs to the latest Gallery contents. | madmaxoft | 2014-05-17 | 1 | -2265/+2892 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed a NULL ptr failure in GridStructGen. | madmaxoft | 2014-05-15 | 2 | -9/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead. | ||||
| * | | | | | | | | | | | | | | | | Changed village generator defaults to more reasonable values. | madmaxoft | 2014-05-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Changed village road generation to use multiple prefabs. | madmaxoft | 2014-05-15 | 3 | -39/+38 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | VillageGen rewritten using BFSPieceGenerator. | madmaxoft | 2014-05-15 | 5 | -412/+406 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params. | ||||
| * | | | | | | | | | | | | | | | | cPrefab can be constructed in code. | madmaxoft | 2014-05-15 | 2 | -0/+51 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | VillageGen: Added well placement and the general algorithm description. | madmaxoft | 2014-05-12 | 3 | -6/+152 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Initial VillageGen implementation. | madmaxoft | 2014-05-11 | 6 | -0/+5807 |
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP, doesn't generate anything yet. Ref.: 740. | ||||
* | | | | | | | | | | | | | | | | Merge pull request #951 from worktycho/chunksparsing/structs | Mattes D | 2014-05-31 | 40 | -484/+1844 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | Chunksparsing with segments | ||||
| * | | | | | | | | | | | | | | | Reduced the number of cChunkData::CopyBlockTypes() tests, added progress. | Mattes D | 2014-05-30 | 1 | -7/+16 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix bugs in test | Tycho | 2014-05-30 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added a cChunkData::CopyBlockTypes() unit test. | Mattes D | 2014-05-30 | 2 | -0/+68 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | removed NULL assignment to const value | Tycho | 2014-05-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | removed unneded addressof | Tycho | 2014-05-30 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed cChunkData nibble copying. | madmaxoft | 2014-05-30 | 2 | -13/+13 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Test failures break into MSVC debugger. | madmaxoft | 2014-05-30 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Test failures are reported verbosely and into the debug console on Win. | madmaxoft | 2014-05-30 | 2 | -3/+19 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed sign comparison. | madmaxoft | 2014-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed test return values. | madmaxoft | 2014-05-30 | 2 | -38/+41 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed wrong copy sizes in cChunkData. | madmaxoft | 2014-05-30 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Attempt at fixing an unresolved symbol in gcc / clang. | madmaxoft | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix bug when a_Idx is not a multiple of SectionBLockCount | worktycho | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Derp | worktycho | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | fix underflow | worktycho | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wish c++ could specify saturating unsigned underflow. | ||||
| * | | | | | | | | | | | | | | | Fixed wrong block sizes for copying / setting. | madmaxoft | 2014-05-29 | 3 | -58/+52 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed Wrong types in nibble sizeofs | worktycho | 2014-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed test compilation. | madmaxoft | 2014-05-29 | 2 | -16/+16 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed overflow bug | worktycho | 2014-05-29 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added comments, reformatted code. | madmaxoft | 2014-05-29 | 6 | -280/+226 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add comment | worktycho | 2014-05-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed forgotten changes. | madmaxoft | 2014-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | cChunkData: Normalized code style. | madmaxoft | 2014-05-28 | 2 | -89/+106 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed cChunkData formatting. | madmaxoft | 2014-05-28 | 2 | -39/+101 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix cmake errors in msvc | worktycho | 2014-05-28 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed test globals to work with precompiled headers | Tycho | 2014-05-27 | 7 | -159/+40 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | inject TestGlobals.h correctly | Tycho | 2014-05-24 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Moved accessors to cpp file | Tycho | 2014-05-24 | 2 | -216/+241 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Implemented style changes | Tycho | 2014-05-24 | 9 | -268/+182 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-24 | 78 | -1170/+2341 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Ignore CTest files | Tycho | 2014-05-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed if spaces | Tycho | 2014-05-21 | 2 | -22/+23 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed reversed comparisons to null | Tycho | 2014-05-21 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added space to ChunkData.cpp | Tycho | 2014-05-21 | 1 | -20/+100 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Changed cChunkData::SetMeta to return a bool indicating whether the value changed | Tycho | 2014-05-21 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed stylistic issues | Tycho | 2014-05-21 | 4 | -25/+25 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Renamed cChunkBuffer to cChunkData | Tycho | 2014-05-21 | 15 | -87/+87 |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed minor style issues | Tycho | 2014-05-21 | 4 | -7/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed issue with types not being defined for an unused parameter | Tycho | 2014-05-18 | 8 | -107/+111 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | derp | Tycho | 2014-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | C++11 | Tycho | 2014-05-17 | 1 | -0/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fixed assignment bugs and Skylight bug | Tycho | 2014-05-17 | 2 | -4/+6 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix assignment operators test | worktycho | 2014-05-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix assignment ops 2 | worktycho | 2014-05-17 | 1 | -3/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add test for zeros | worktycho | 2014-05-17 | 1 | -0/+35 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix assignment operators | worktycho | 2014-05-17 | 1 | -10/+14 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add tests for assignment operator | worktycho | 2014-05-17 | 1 | -0/+11 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Rewrote array copies test | worktycho | 2014-05-17 | 1 | -36/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved each patten test into its own scope to test all unallocated section code paths. Moved 0's around so that they test the allocated sections code paths. | ||||
| * | | | | | | | | | | | | | excluding tests excludes everything | worktycho | 2014-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | test code does not need testing | worktycho | 2014-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Don't start mcserver up in coverage builds | worktycho | 2014-05-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting the server up is not a test. | ||||
| * | | | | | | | | | | | | | Added some more tests | Tycho | 2014-05-11 | 2 | -116/+242 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added several more testsfor arrays and coordinates | Tycho | 2014-05-11 | 3 | -5/+21 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed bug that caused Array Setters to always create segments | Tycho | 2014-05-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | test 0 values | Tycho | 2014-05-11 | 1 | -0/+45 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | SkyLight defaults to 0xFF | Tycho | 2014-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Cerated array copy tests for block and skylight | Tycho | 2014-05-11 | 1 | -0/+36 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a bug in writting zeros to a non-allocated section | Tycho | 2014-05-11 | 3 | -93/+134 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Coverage builds are called MCServer not MCServer_debug | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed stupid error | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fail build on error | Tycho | 2014-05-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Don't run start test under gcov | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | quite gcov take 4 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed stupid buffer overflow in array setblocks | Tycho | 2014-05-10 | 3 | -13/+13 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add arries copies tests | Tycho | 2014-05-10 | 1 | -0/+53 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added new test | Tycho | 2014-05-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added some more tests | Tycho | 2014-05-10 | 2 | -6/+100 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed bug in setting metas | Tycho | 2014-05-10 | 2 | -19/+7 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | quieted gcov 4 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | quieted gcov 3 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | quieted gcov 2 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find them 3 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | rewrote exclustions | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | quieted gcov | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find them take 2 | Tycho | 2014-05-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find them | Tycho | 2014-05-10 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add qutes to scripts | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix spaces in bash | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Make scripts executable | Tycho | 2014-05-10 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed missing Dollar signs | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed paths | Tycho | 2014-05-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix bash ifs | Tycho | 2014-05-10 | 3 | -3/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 105 | -940/+2002 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | | | | | | | | | | | | | | | Maybe coverage working? | Tycho | 2014-05-10 | 9 | -33/+409 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-03 | 36 | -92/+198 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| * | | | | | | | | | | | | | | | | cCHunkBuffer that compiles with TestGlobals.h | Tycho | 2014-05-03 | 7 | -2/+27 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed polarssl programs included | Tycho | 2014-05-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Tests off by default take 2 | Tycho | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Disable polarssl tests by default | Tycho | 2014-05-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 129 | -2393/+4043 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Added Testing capability | Tycho | 2014-04-27 | 5 | -2/+30 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fixed bad comment | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fixed a couple of segfaults and made Free a seperate function | Tycho | 2014-04-27 | 2 | -6/+39 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Added other half of implementation | Tycho | 2014-04-27 | 1 | -14/+133 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fixed issues with gcc | Tycho | 2014-04-27 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fixed MobProximity Counter to remove chunk copys | Tycho | 2014-04-27 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fixed bad merge | Tycho | 2014-04-27 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 188 | -4917/+11174 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | | | | | | | | | | | | | | | | | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 17 | -401/+610 |
| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Fixed bindings for cCompositeChat:SetMessageType(). | madmaxoft | 2014-05-30 | 1 | -2/+2 |
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Cmake system name not System name | worktycho | 2014-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | derp | worktycho | 2014-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | FreeBSD requires __POSIX_VISIBLE macro to be defined | worktycho | 2014-05-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | for compiliers other than msvc we need to tell lua that its building as a dll | worktycho | 2014-05-28 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Fixed a memory leak in cPrefabPiecePool. | madmaxoft | 2014-05-28 | 2 | -1/+34 |
| |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pool pieces weren't freed upon pool destruction. | ||||
* | | | | | | | | | | | | | | | | | Stuff. | Alexander Harkness | 2014-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #1041 from mc-server/fixes | Mattes D | 2014-05-27 | 1 | -22/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClientHandle.cpp: remove redundant code | ||||
| * | | | | | | | | | | | | | | | | | ClientHandle.cpp: Process look before pos | archshift | 2014-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | ClientHandle.cpp: remove redundant code | archshift | 2014-05-26 | 1 | -22/+2 |
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy. | ||||
* | | | | | | | | | | | | | | | | | Update main.css | Alexander Harkness | 2014-05-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Revert "Add more move checks" | madmaxoft | 2014-05-26 | 2 | -59/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06. | ||||
* | | | | | | | | | | | | | | | | | Minor fixes. | Alexander Harkness | 2014-05-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #1003 from Howaner/GlobalFixes | Mattes D | 2014-05-26 | 2 | -17/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more move checks | ||||
| * | | | | | | | | | | | | | | | | | Add more move checks | Howaner | 2014-05-16 | 2 | -17/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size) | ||||
* | | | | | | | | | | | | | | | | | | SEMICOLONS! | Alexander Harkness | 2014-05-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Update GroupManager.h | worktycho | 2014-05-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #1030 from mc-server/betterthan950 | worktycho | 2014-05-25 | 1 | -5/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A fix that is better than #950. | ||||
| * | | | | | | | | | | | | | | | | | | A fix that is better than #950. | Alexander Harkness | 2014-05-25 | 1 | -5/+15 |
|/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Updated the installation instructions in the README. | Alexander Harkness | 2014-05-25 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #1013 from mc-server/achievementtranslate | Mattes D | 2014-05-25 | 6 | -32/+109 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | Proper achievement informing | ||||
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into achievementtranslate | Tiger Wang | 2014-05-25 | 13 | -22/+163 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| * | | | | | | | | | | | | | | | | | Update CompositeChat.h | Tiger Wang | 2014-05-20 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Update Player.cpp | Alexander Harkness | 2014-05-20 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fixed a cactus Y position issue | Tiger Wang | 2014-05-19 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Simplified cacti conditions | Tiger Wang | 2014-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | cCompositeChat message type is now formatted | Tiger Wang | 2014-05-19 | 4 | -5/+13 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Added client translation to achievements | Tiger Wang | 2014-05-19 | 4 | -4/+70 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Updated Core | Tiger Wang | 2014-05-25 | 1 | -0/+0 |
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Standardised a badge. | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+3 |
| |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge pull request #1022 from mc-server/FixMineshafts | Mattes D | 2014-05-23 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mineshafts | ||||
| * | | | | | | | | | | | | | | | | Fixed Mineshaft system size. | Mattes D | 2014-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Auto-enlargement for cGridStructGen cache. | Mattes D | 2014-05-23 | 1 | -0/+9 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | / / / / / | Fixed datatype conversion warning. | Mattes D | 2014-05-23 | 1 | -2/+2 |
| |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed profiling flags for MSVC. | Mattes D | 2014-05-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The profiler output contained no useful symbols before, because there were no symbols in the PDBs. | ||||
* | | | | | | | | | | | | | | | Merge pull request #1015 from mc-server/Stats | xdot | 2014-05-21 | 7 | -15/+130 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | Statistics | ||||
| * | | | | | | | | | | | | | | Fixed cWither::KilledBy | andrew | 2014-05-21 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 7 | -15/+128 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed MCADefrag compilation. | madmaxoft | 2014-05-20 | 1 | -0/+15 |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #1010 from mc-server/cactidamage | Alexander Harkness | 2014-05-19 | 3 | -2/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Implemented cacti damage | ||||
| * | | | | | | | | | | | | Derp | Alexander Harkness | 2014-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Should have fixed assumptions about entity width. | Alexander Harkness | 2014-05-19 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment? | ||||
| * | | | | | | | | | | | | Fixed clanging errors. | Alexander Harkness | 2014-05-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please @tigerw make sure this is correct. | ||||
| * | | | | | | | | | | | | Implemented cacti damage | Tiger Wang | 2014-05-18 | 3 | -2/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug) | ||||
* | | | | | | | | | | | | | There's no "round" function in MSVC2008. | madmaxoft | 2014-05-18 | 2 | -4/+4 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed datatype truncation in Diff() template. | madmaxoft | 2014-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 24 | -61/+711 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Statistic Manager | ||||
| * | | | | | | | | | | | | Fixes | andrew | 2014-05-13 | 5 | -20/+23 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Movement Statistics | andrew | 2014-05-12 | 6 | -14/+101 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 8 | -10/+143 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed compilation | andrew | 2014-05-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed stat serialization | andrew | 2014-05-11 | 4 | -24/+44 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Statistic Manager | andrew | 2014-05-11 | 16 | -43/+448 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1005 from SphinxC0re/LoadPluginfolder | worktycho | 2014-05-18 | 1 | -1/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | Load pluginfolder | ||||
| * | | | | | | | | | | | removed the <list> include | Julian Laubstein | 2014-05-18 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added unload <pluginname> command | Julian Laubstein | 2014-05-18 | 1 | -5/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added load cmd | Julian Laubstein | 2014-05-17 | 1 | -5/+29 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added load command in the cServer class | Julian Laubstein | 2014-05-17 | 1 | -0/+6 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #1002 from tonibm19/patch-1 | Mattes D | 2014-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed anvil exp removing | ||||
| * | | | | | | | | | | | Fixed anvil exp removing | tonibm19 | 2014-05-16 | 1 | -1/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #994 from Howaner/GlobalFixes | Mattes D | 2014-05-15 | 5 | -36/+125 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | Add place/break radius, add dig cancel packet and add item resend on break/place cancel. | ||||
| * | | | | | | | | | | Fix compile error. | Howaner | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Move radius check. | Howaner | 2014-05-15 | 1 | -25/+40 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Rename HandleBlockDigCancel to FinishDigAnimtion. | Howaner | 2014-05-11 | 2 | -5/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add block place/break distance check. | Howaner | 2014-05-09 | 2 | -0/+31 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. | Howaner | 2014-05-09 | 4 | -36/+79 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Added doxy-comment requirement | Mattes D | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #999 from mc-server/fixes | Mattes D | 2014-05-12 | 6 | -54/+80 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | A few warning fixes | ||||
| * | | | | | | | | | | More switch warnings. | archshift | 2014-05-12 | 2 | -7/+34 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed a few more switch warnings. | archshift | 2014-05-12 | 3 | -32/+35 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed a warning and a complaint about a never-read variable. | archshift | 2014-05-11 | 2 | -15/+11 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #972 from mc-server/SslWebAdmin | Mattes D | 2014-05-11 | 28 | -174/+637 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | Ssl web admin | ||||
| * | | | | | | | | | Merge branch 'master' into SslWebAdmin | Mattes D | 2014-05-10 | 131 | -1841/+2756 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #993 from mc-server/GridStructGen | Mattes D | 2014-05-10 | 12 | -838/+581 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | Grid struct gen | ||||
| * | | | | | | | | | Merged branch 'master' into GridStructGen. | Mattes D | 2014-05-09 | 9 | -31/+38 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Removed unused constants from MineShafts and Ravines. | Mattes D | 2014-05-09 | 2 | -9/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed an unused NetherFortGen variable. | Mattes D | 2014-05-09 | 1 | -6/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed an unused macro. | Mattes D | 2014-05-09 | 1 | -7/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Ravines rewritten using cGridStructGen. | Mattes D | 2014-05-09 | 2 | -182/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987. | ||||
| * | | | | | | | | | | cWormNestCaves rewritten using cGridStructGen. | Mattes D | 2014-05-09 | 2 | -223/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987. | ||||
| * | | | | | | | | | | Mineshafts generator rewritten to use GridStructGen. | Mattes D | 2014-05-09 | 2 | -156/+33 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed cGridStructGen. | Mattes D | 2014-05-08 | 1 | -18/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now cNetherFortGen works with the new architecture. | ||||
| * | | | | | | | | | | Merge branch 'master' into GridStructGen | Mattes D | 2014-05-08 | 86 | -347/+1151 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-08 | 47 | -159/+176 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | cNetherFortGen uses cGridStructGen. | madmaxoft | 2014-05-07 | 5 | -264/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP, this doesn't work properly yet. | ||||
| * | | | | | | | | | | | Initial cPrefabPiecePool refactoring. | madmaxoft | 2014-05-07 | 2 | -0/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #986. | ||||
| * | | | | | | | | | | | Initial cGridStructGen refactoring. | madmaxoft | 2014-05-06 | 2 | -0/+262 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987. | ||||
* | | | | | | | | | | | | Fixed the console saying no plugins are loaded. | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #995 from mc-server/Portal_Pigman | Mattes D | 2014-05-10 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | Portal zombie pigman | ||||
| * | | | | | | | | | | | Fixed compile problem. | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | A portal block now chooses a number between 2000 and 0 | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman. | STRWarrior | 2014-05-10 | 1 | -0/+14 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | 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 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | World pre-generation distance is settable in world.ini. | Mattes D | 2014-05-09 | 1 | -2/+6 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Lighting thread disabled its chunkstays before deleting them. | Mattes D | 2014-05-09 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 47 | -159/+176 |
|/ / / / / / / / / / | |||||
* | / / / / / / / / | Initialise m_HasTeleported in both constructors | worktycho | 2014-05-09 | 1 | -0/+1 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #989 from Howaner/Anvil | Mattes D | 2014-05-07 | 9 | -55/+118 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ... | ||||
| * | | | | | | | | | Missing comma | Howaner | 2014-05-07 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Send item back to the client when the item get damage. | Howaner | 2014-05-07 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Change m_RepairCost to int. | Howaner | 2014-05-07 | 6 | -16/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Where is the problem with clang? | 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 | 8 | -57/+125 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #853 from Howaner/Slabs | Mattes D | 2014-05-07 | 11 | -4/+53 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Grass now grows under up-side-down slabs | ||||
| * | | | | | | | | | | Superfluous method override. | Howaner | 2014-05-07 | 1 | -6/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add lava and water check to block handlers. | Howaner | 2014-05-07 | 2 | -2/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Rename CanChangeDirtToGrass to CanDirtGrowGrass | Howaner | 2014-05-07 | 6 | -9/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-05-07 | 274 | -7330/+16184 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove old import | Howaner | 2014-04-06 | 2 | -3/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-04-06 | 56 | -334/+540 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add CanChangeDirtToGrass function to Block Handlers. | Howaner | 2014-04-06 | 9 | -4/+45 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-04-03 | 335 | -6807/+18153 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockDirt.h | ||||
| * | | | | | | | | | | | | | Remove old function | Howaner | 2014-04-03 | 1 | -6/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Grass now grows under up-side-down slabs | Howaner | 2014-04-03 | 1 | -3/+12 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #990 from Howaner/Entities | Tiger Wang | 2014-05-07 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | Fix MagmaCube save. | ||||
| * | | | | | | | | | | | | | Fix MagmaCube save. | Howaner | 2014-05-07 | 2 | -3/+9 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Fixed wires powering wires diagonally below them | Tiger Wang | 2014-05-07 | 1 | -5/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #985 from Howaner/Anvil | Mattes D | 2014-05-06 | 16 | -3/+671 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | Add anvil inventory. | ||||
| * | | | | | | | | | | | | Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() | Howaner | 2014-05-06 | 9 | -34/+33 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Simplified the HandleAnvilItemName() code. | Howaner | 2014-05-06 | 1 | -7/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change int to size_t return. | Howaner | 2014-05-05 | 2 | -3/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix SetRepairedItemName() in SlotArea.cpp | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add comments to CanTakeResultItem() | Howaner | 2014-05-05 | 1 | -5/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add doxycomments to cSlotAreaAnvil functions. | Howaner | 2014-05-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Changed HandleAnvilItemName() length to size_t in ClientHandle.h | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add anvil shift click. | Howaner | 2014-05-05 | 2 | -5/+86 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | This isn't a enchantment table :D | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 7 | -18/+210 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add MC|ItemName plugin message. | Howaner | 2014-05-05 | 6 | -8/+51 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add anvil window and slot area. | Howaner | 2014-05-05 | 13 | -0/+356 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #927 from mc-server/fixes | Mattes D | 2014-05-06 | 12 | -155/+160 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | Small fixes | ||||
| * | | | | | | | | | | | | Merge branch 'master' into fixes | Tiger Wang | 2014-05-06 | 21 | -510/+743 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Vector3.h | ||||
| * | | | | | | | | | | | | Suggestions'd #2 | Tiger Wang | 2014-05-06 | 2 | -1/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Suggestions'd | Tiger Wang | 2014-05-06 | 3 | -7/+11 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | A bit of reformatting. | madmaxoft | 2014-05-02 | 1 | -5/+10 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 181 | -2524/+4641 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | A tiny speed improvement in ApplyFoodExhaustion() | Tiger Wang | 2014-04-27 | 1 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | More comments! | Tiger Wang | 2014-04-27 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated. | ||||
| * | | | | | | | | | | | | | Implemented suggestions | Tiger Wang | 2014-04-24 | 1 | -7/+6 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 78 | -565/+3146 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | | | | | | | | | | | | | Some change to Entity.cpp | Tiger Wang | 2014-04-23 | 7 | -123/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer | ||||
| * | | | | | | | | | | | | | | Small changes | Tiger Wang | 2014-04-23 | 4 | -12/+15 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Changed cPieceGenerator to support pairings. | madmaxoft | 2014-05-05 | 3 | -57/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #982. | ||||
* | | | | | | | | | | | | | | | Prefabs can specify that they don't want flooring. | madmaxoft | 2014-05-05 | 1 | -30/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the flag was ignored. | ||||
* | | | | | | | | | | | | | | | Fixed a flipped condition in cBlockArea::Merge(). | madmaxoft | 2014-05-05 | 1 | -2/+2 |
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #978 from mc-server/VectorAssignmentOperator | Mattes D | 2014-05-05 | 1 | -12/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector3 warning fixes | ||||
| * | | | | | | | | | | | | | | Removed convert-assign operator. | madmaxoft | 2014-05-04 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want all conversions to be explicit, not hidden. | ||||
| * | | | | | | | | | | | | | | Removed the controversial Vector3::operator <. | madmaxoft | 2014-05-03 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It hasn't been used in any C++ code and Lua doesn't need it. | ||||
| * | | | | | | | | | | | | | | Fixed float comparison warnings in Vector3. | madmaxoft | 2014-05-03 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a bitwise comparison (Equals), and there's Eps-based comparison (EqualsEps). | ||||
| * | | | | | | | | | | | | | | Implemented a true assignment operator for Vector3. | madmaxoft | 2014-05-03 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Attempted fix for CLang warnings in Vector3.h. | madmaxoft | 2014-05-02 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++11 seems to have deprecated classes that have custom copy-constructor but not a custom assignment operator. | ||||
* | | | | | | | | | | | | | | | Fixed crash on creating a world during plugin initialisation | worktycho | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed formatting | Tiger Wang | 2014-05-05 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #956 from mc-server/redstoneimprovements | Tiger Wang | 2014-05-04 | 9 | -458/+627 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redstone simulator performance and functionality improvements. | ||||
| * | | | | | | | | | | | | | | | Fixed 027efe09ea3d3222c3cbf169643e57773c1614ae | Tiger Wang | 2014-05-04 | 1 | -3/+49 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 145 | -2323/+4081 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | | | | | | | | | | | | | | | Fixed lever and button powering direction | Tiger Wang | 2014-05-04 | 1 | -16/+8 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 10 | -453/+586 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | | | | | | | | | | | | | | | | Fixed ProtoProxy compilation in MSVC2013. | madmaxoft | 2014-05-04 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #983. | ||||
* | | | | | | | | | | | | | | | | Fixed pressure plate oversights | Tiger Wang | 2014-05-04 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed stone pressure plates not checking for the correct distance for players * Fixed pressure plates in general not link powering the blocks beneath them | ||||
* | | | | | | | | | | | | | | | | Fixed portal Z direction loop coding failure | Tiger Wang | 2014-05-04 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed portals created in the ZP/ZM direction eating its frame * Changed return type of a function | ||||
* | | | | | | | | | | | | | | | | Hotfixed Chunked transfer encoding in Yggdrasil. | madmaxoft | 2014-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed. | ||||
* | | | | | | | | | | | | | | | | Fixed connection encryption. | madmaxoft | 2014-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #975. | ||||
* | | | | | | | | | | | | | | | | Fixed vanilla fluid simulator. | madmaxoft | 2014-05-03 | 1 | -4/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #919. | ||||
* | | | | | | | | | | | | | | | Seperate instructions for OSX and Linux | archshift | 2014-05-03 | 1 | -3/+38 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed vanilla fluid simulator. | madmaxoft | 2014-05-02 | 4 | -14/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #919. | ||||
* | | | | | | | | | | | | | | Fixed a buffer overflow in cChunk:SetLight(). | madmaxoft | 2014-05-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are only half as many bytes for light than there are blocktypes. | ||||
* | | | | | | | | | | | | | | Open files in shared mode on windows, so that other tools may read them. | madmaxoft | 2014-05-02 | 1 | -2/+2 |
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode. | ||||
* | | | | | | | | | | | | | Fixed MagmaCube spawning. | madmaxoft | 2014-05-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #928. | ||||
* | | | | | | | | | | | | | Added a sanitizer for Spawn egg damage value. | madmaxoft | 2014-05-02 | 1 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928. | ||||
* | | | | | | | | | | | | | APIDump: Updated the OnDisconnect hook docs. | madmaxoft | 2014-05-02 | 1 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #655. | ||||
* | | | | | | | | | | | | | APIDump: Improved error handling in API file loader. | madmaxoft | 2014-05-02 | 1 | -1/+5 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | HOOK_DISCONNECT has cClientHandle as its first parameter. | madmaxoft | 2014-05-02 | 6 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #655. | ||||
* | | | | | | | | | | | | | Fixed warnings in ManualBindings. | madmaxoft | 2014-05-01 | 1 | -20/+20 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warnings in Lua helpers. | madmaxoft | 2014-05-01 | 2 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Client cert is not requested. | Mattes D | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Fixed cert filename in Linux script. | madmaxoft | 2014-05-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Fixed an extra space. | madmaxoft | 2014-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | WebAdmin outputs a log message about HTTP / HTTPS status. | madmaxoft | 2014-05-02 | 1 | -18/+31 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Made the cert generation script executable on Linux | Mattes D | 2014-05-02 | 1 | -0/+0 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Merged branch 'master' into SslWebAdmin. | madmaxoft | 2014-05-01 | 17 | -31/+34 |
| | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed a warning in Noise. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | More ClientHandle fixes. | madmaxoft | 2014-05-01 | 2 | -3/+3 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 8 | -9/+9 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warnings in cByteBuffer. | madmaxoft | 2014-05-01 | 2 | -14/+14 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warning in BlockID. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warnings in cBlockArea. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warnings in FastNBT. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warning in cCallbackSslContext::cDataCallbacks. | madmaxoft | 2014-05-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed warning in cBlockArea. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Merge branch 'master' into SslWebAdmin | madmaxoft | 2014-05-01 | 5 | -2/+13 |
| | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #973 from mc-server/ItemNoCopyConstructor | Mattes D | 2014-05-01 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | Removed the explicit copy constructor for cItem. | ||||
| * | | | | | | | | | | | | Removed the explicit copy constructor for cItem. | madmaxoft | 2014-05-01 | 1 | -0/+6 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler generates an implicit one with the same contents and warns about it. The function left in for ToLua to generate the binding for it. | ||||
* | | | | | | | | | | | | Fixed MSVC2013 compilation. | Mattes D | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #971 from worktycho/polarssl-local | worktycho | 2014-05-01 | 2 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep a cloned copy of polarssl | ||||
| * | | | | | | | | | | | | Merged change to enable testing to be disabled | Tycho | 2014-05-01 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is confirmed upstream but is unlikely to get into the repository for several weeks | ||||
| * | | | | | | | | | | | | Changed polarssl repo to point to cloned copy of polarssl | Tycho | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Anvil saver pads data to 4K boundaries. | madmaxoft | 2014-05-01 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #524. | ||||
| | | | | | | | * | | | | | Added a missing return statement. | madmaxoft | 2014-05-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | cSslContext has virtual destructor now. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | ProtoProxy: Renamed PublicKey to CryptoKey. | madmaxoft | 2014-05-01 | 2 | -4/+4 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | Renamed PublicKey to CryptoKey in CMakeLists.txt | Mattes D | 2014-05-01 | 1 | -3/+2 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | Renamed cPublicKey to cCryptoKey. | madmaxoft | 2014-05-01 | 9 | -41/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class can hold both the private key and the public key, bad naming on PolarSSL's part. Also somewhat fixed the cert and key loading in cHTTPServer. | ||||
| | | | | | | | * | | | | | Fixed crashes in the SSL HTTP connection. | madmaxoft | 2014-05-01 | 9 | -23/+36 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | Added a mention to run as admin. | madmaxoft | 2014-05-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | Added scripts for generating HTTPS cert and key. | madmaxoft | 2014-05-01 | 2 | -0/+19 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | Implemented SSL connection for WebAdmin. | madmaxoft | 2014-05-01 | 5 | -2/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes FS-319. | ||||
| | | | | | | | * | | | | | Fixed HTTP message parsing, prepared for SSL. | madmaxoft | 2014-05-01 | 2 | -3/+4 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | Added a (disabled) test of low-security ciphersuites. | madmaxoft | 2014-05-01 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling this allows the connection to be sniffed and decoded using Wireshark, when given the SSL private key. | ||||
| | | | | | | | * | | | | | Fixed BufferedSslContext's buffer reading and writing. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | cSslContext supports setting own cert / privkey. | madmaxoft | 2014-05-01 | 5 | -7/+187 |
| | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | Added cBufferedSslContext implementation. | madmaxoft | 2014-05-01 | 2 | -20/+51 |
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | If webadmin.ini doesn't exist, example one is written immediately. | madmaxoft | 2014-04-30 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed a warning when an empty item is being created. | madmaxoft | 2014-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Ladders set as transparent. | madmaxoft | 2014-04-30 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Removed the unused cBlockingTCPLink class. | madmaxoft | 2014-04-30 | 3 | -171/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #965 from mc-server/SslWrappers | Mattes D | 2014-04-30 | 44 | -874/+2129 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Ssl wrappers | ||||
| * | | | | | | | | | | | | Removed unneeded #includes. | madmaxoft | 2014-04-29 | 1 | -6/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Moved the rest of the Crypto objects into their own respective files. | madmaxoft | 2014-04-29 | 17 | -436/+477 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Moved cPublicKey to its separate file in PolarSSL++. | madmaxoft | 2014-04-29 | 8 | -109/+127 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into SslWrappers | madmaxoft | 2014-04-29 | 3 | -12/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Added BiomeToString() API function. | madmaxoft | 2014-04-29 | 2 | -81/+106 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed ProtoProxy. | madmaxoft | 2014-04-29 | 4 | -3/+25 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added missing initialization. | madmaxoft | 2014-04-29 | 1 | -2/+5 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. | madmaxoft | 2014-04-29 | 9 | -225/+244 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merged branch 'master' into SslWrappers. | madmaxoft | 2014-04-28 | 114 | -1350/+2209 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added the G1 root cert. | madmaxoft | 2014-04-28 | 1 | -2/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the authenticator finally works. | ||||
| * | | | | | | | | | | | | | Added a debug cert printing function. | madmaxoft | 2014-04-28 | 2 | -0/+65 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Reordered constructors. | madmaxoft | 2014-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a late-night typo. | madmaxoft | 2014-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes. | madmaxoft | 2014-04-27 | 1 | -91/+45 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | PolarSSL wrappers for the SSL context. | madmaxoft | 2014-04-27 | 10 | -5/+847 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | cSocket creates the socket in Connect if no socket is present yet. | madmaxoft | 2014-04-27 | 1 | -2/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed C++11 check for SharedPtr. | madmaxoft | 2014-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added shared_ptr handling for C++03 mode. | madmaxoft | 2014-04-25 | 1 | -3/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Replaced MSVC-specific decorators with our universal ones. | madmaxoft | 2014-04-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | cByteBuffer uses void * instead of char * in data interface. | madmaxoft | 2014-04-24 | 2 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it compatible with any pointer type. | ||||
| * | | | | | | | | | | | | | Declared a SharedPtr that hopefully resolves on all platforms. | madmaxoft | 2014-04-24 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC2008 has it in std::tr1, all the others in std. | ||||
| * | | | | | | | | | | | | | Fixed filename case. | madmaxoft | 2014-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Attempted CMake inclusion for PolarSSL++. | madmaxoft | 2014-04-24 | 2 | -2/+19 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Authenticator uses some C++ SSL objects. | madmaxoft | 2014-04-24 | 1 | -19/+40 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Initial C++ SSL classes. | madmaxoft | 2014-04-24 | 7 | -2/+248 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Delayed sending the KeepAlive packet for 3 seconds after login. | madmaxoft | 2014-04-29 | 1 | -0/+5 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should alleviate #889. | ||||
* | | | | | | | | | | | | | Added BiomeToString() API function. | madmaxoft | 2014-04-29 | 2 | -81/+106 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Disabled MSVC warnings about constant bool expressions. | madmaxoft | 2014-04-28 | 1 | -2/+19 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Hopefully fixed repeated clang warnings. | madmaxoft | 2014-04-28 | 1 | -9/+9 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed a MSVC warning. | madmaxoft | 2014-04-28 | 1 | -1/+1 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 26 | -68/+132 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add entity invulnerable | ||||
| * | | | | | | | | | | | | Revert "Withers now use the new invulnerable." | Howaner | 2014-04-28 | 2 | -10/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 619592b5a0ab651e714d55932bc7909e4204cee9. | ||||
| * | | | | | | | | | | | | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 5 | -28/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| * | | | | | | | | | | | | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 5 | -4/+28 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Withers now use the new invulnerable. | Howaner | 2014-04-26 | 2 | -26/+10 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixes | Howaner | 2014-04-26 | 8 | -23/+26 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change m_InvulnerableTicks description again again :D | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change m_InvulnerableTicks description again. | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change m_InvulnerableTicks description | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into GlobalFixes | Howaner | 2014-04-26 | 2 | -11/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add entity invulnerable | Howaner | 2014-04-26 | 22 | -50/+111 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed braces. | madmaxoft | 2014-04-28 | 1 | -1/+5 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed missing return value warning in MSVC. | madmaxoft | 2014-04-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge remote-tracking branch 'worktycho/master' | madmaxoft | 2014-04-28 | 7 | -177/+225 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Removed static from combinators. | Tycho | 2014-04-28 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THis allows us to use the functions in template params at the cost of polluting the global namespace. | ||||
| * | | | | | | | | | | | | | | Fixed unbraced ifs | Tycho | 2014-04-28 | 1 | -10/+40 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Removed inlines from combinators | Tycho | 2014-04-28 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc requires external linkage for functions provided to template parameters | ||||
| * | | | | | | | | | | | | | | Template Magic | Tycho | 2014-04-28 | 4 | -173/+183 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed need to allocate a fake meta block by using templates to provide a version of the code that does not use metas. Also changed the function to a template argument to make sure that the compilier is able to inline it. | ||||
| * | | | | | | | | | | | | | | Worked around const pointer | Tycho | 2014-04-27 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixes to uninitallsed array access in Noise.cpp | Tycho | 2014-04-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CID 43634, 43634 | ||||
| * | | | | | | | | | | | | | | Initalize counter in fastrandom | Tycho | 2014-04-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43622 | ||||
| * | | | | | | | | | | | | | | Initialised MetaArrays in BlockArea | Tycho | 2014-04-27 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43621 | ||||
| * | | | | | | | | | | | | | | Removed unneeded assert | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed CID 43610 | ||||
* | | | | | | | | | | | | | | | Merge pull request #954 from mc-server/projectiles-split | Mattes D | 2014-04-28 | 27 | -857/+932 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files. | ||||
| * | | | | | | | | | | | | | | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 26 | -80/+80 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed ToLua errors, added newlines | archshift | 2014-04-27 | 18 | -19/+19 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed ToLua issues | archshift | 2014-04-27 | 9 | -19/+24 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cFireworkEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -115/+116 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cGhastFireballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 6 | -74/+85 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cFireChargeEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 6 | -82/+90 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cThrownSnowballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -74/+84 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cExpBottleEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -52/+61 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cThrownEnderPearl out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -86/+95 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cThrownEggEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -91/+100 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 10 | -284/+297 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed warnings. | madmaxoft | 2014-04-27 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed player spawning #953. | madmaxoft | 2014-04-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #958 from worktycho/bugfix | Mattes D | 2014-04-27 | 3 | -8/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix | ||||
| * | | | | | | | | | | | | | | | Removed Old Asserts | Tycho | 2014-04-27 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed asserts about non-negative numbers on what are now unsigned types Fixes CID 43608 | ||||
| * | | | | | | | | | | | | | | | Removed old unused code | Tycho | 2014-04-27 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed OnPluginMessage hook not exiting early. | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnPluginMessage hook would call all plugins even after one returned true. Fixes CID 43512 | ||||
* | | | | | | | | | | | | | | | | Merge pull request #959 from mc-server/fixes-2 | worktycho | 2014-04-27 | 4 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Coverity fixes | ||||
| * | | | | | | | | | | | | | | | Revert "Creative players cannot throw ender pearls." | archshift | 2014-04-27 | 1 | -16/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 75bb36574b4bb78e8b5975bf905a97402fd8a4bb. | ||||
| * | | | | | | | | | | | | | | | Creative players cannot throw ender pearls. | archshift | 2014-04-27 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added static const, initialized fields. | archshift | 2014-04-27 | 4 | -2/+7 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Update CoverityModel.cpp | worktycho | 2014-04-27 | 1 | -3/+15 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Create CoverityModel.cpp | worktycho | 2014-04-27 | 1 | -0/+5 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #864 from mc-server/Stat | Mattes D | 2014-04-27 | 2 | -0/+255 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Statistic/Achievement defs | ||||
| * | | | | | | | | | | | | | | Added some comments | andrew | 2014-04-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Statistic/Achievement defs | andrew | 2014-04-07 | 2 | -0/+255 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Another attempt at #889. | madmaxoft | 2014-04-27 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime. | ||||
* | | | | | | | | | | | | | | | Merge pull request #948 from jfhumann/staticFixes | Mattes D | 2014-04-27 | 5 | -3/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fixes motivated by Coverity #1 | ||||
| * | | | | | | | | | | | | | | Fixed unitialized member in gZipFile (CID 43673) | jfhumann | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618) | jfhumann | 2014-04-26 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixes resource leaks in the yggdrasil authenticator. (CID 43617) | jfhumann | 2014-04-26 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix for minor resource leak (CID 43616) | jfhumann | 2014-04-26 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Should fix CIDs 43631, 43632 and 43633 | jfhumann | 2014-04-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #941 from archshift/master | Mattes D | 2014-04-26 | 19 | -174/+172 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | Fixed lots of warnings, and other small changes. | ||||
| * | | | | | | | | | | | | | | More small fixes. | archshift | 2014-04-26 | 3 | -11/+11 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Moar alignment. | archshift | 2014-04-26 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 11 | -90/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other small changes. | ||||
| * | | | | | | | | | | | | | | Fixed mobs that don't naturally spawn. | archshift | 2014-04-26 | 3 | -7/+11 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Moved switch{} out of GetArmorCoverAgainst(). | archshift | 2014-04-26 | 2 | -5/+29 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Removed unused assignments. | archshift | 2014-04-26 | 3 | -6/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a couple more warnings. | archshift | 2014-04-26 | 2 | -21/+17 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Moved the weather picker out of TickWeather(), squashing a warning and improving readability. | archshift | 2014-04-26 | 2 | -25/+30 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Removed impossible default case. | archshift | 2014-04-26 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning. | ||||
| * | | | | | | | | | | | | | | Removed extraneous switch{} in Start() | archshift | 2014-04-26 | 2 | -17/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning. | ||||
| * | | | | | | | | | | | | | | Moved huge conditional out of InStateChasing(), improving readability | archshift | 2014-04-26 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning. | ||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | archshift | 2014-04-25 | 18 | -17/+201 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Small changes; warning fixing. | archshift | 2014-04-25 | 6 | -14/+12 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Oops, fixed that. | archshift | 2014-04-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Giants! | archshift | 2014-04-25 | 2 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning. | ||||
| * | | | | | | | | | | | | | | | Refactored SendChat(), placing the message-type formatting into its own function. | archshift | 2014-04-25 | 2 | -84/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed default case warning in the process. | ||||
* | | | | | | | | | | | | | | | | Merge pull request #863 from mc-server/chunkysparsing | Mattes D | 2014-04-26 | 3 | -67/+166 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chunky sparsing | ||||
| * | | | | | | | | | | | | | | | | Implemented comments | Tiger Wang | 2014-04-25 | 3 | -33/+52 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed indent | Tiger Wang | 2014-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Another small speed improvement? | Tiger Wang | 2014-04-24 | 1 | -12/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Implemented suggestions | Tiger Wang | 2014-04-24 | 2 | -89/+16 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Replaced all the .data() calls so the code compiles in VS2008 | Tycho | 2014-04-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Maybe speed improvements? | Tiger Wang | 2014-04-07 | 2 | -48/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use a single index to determine from when to begin copying data * Use heightmap to determine first nonair block | ||||
| * | | | | | | | | | | | | | | | Attempt to fix errors | Tiger Wang | 2014-04-07 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Blocklight and skylight now compressed | Tiger Wang | 2014-04-07 | 3 | -32/+90 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Nibbletypes are compressed | Tiger Wang | 2014-04-05 | 3 | -18/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added nibble compression * Fixed an off by one | ||||
| * | | | | | | | | | | | | | | | Speed and memory improvements | Tiger Wang | 2014-04-04 | 2 | -62/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed array to be continuous, so no more layer splitting | ||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into chunkysparsing | Tiger Wang | 2014-04-03 | 154 | -1003/+6127 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Fixed some bugs | Tiger Wang | 2014-04-03 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed undefined behaviour * Fixed compression failure | ||||
| * | | | | | | | | | | | | | | | | Performance improvements and chunk flipping fixed | Tiger Wang | 2014-04-02 | 1 | -30/+32 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Sort of implementation of chunk sparsing | Tiger Wang | 2014-03-23 | 2 | -18/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues: * Chunks are flipped * Slow/inefficient/badly coded * Only blocktypes are 'compressed' | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #936 from archshift/patch-1 | Mattes D | 2014-04-26 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | Use libc++ on OSX | ||||
| * | | | | | | | | | | | | | | | | Needs the -stdlib linker flag too. | archshift | 2014-04-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Move to line 47. | archshift | 2014-04-25 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Use libc++ on OSX | archshift | 2014-04-25 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues with https://github.com/mc-server/MCServer/commit/f3dfc0349d7008efa50855c739d86918bdbf4a88 in XCode. Tested on Mac (Makefile and XCode) and Linux. | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #920 from axisd/master | Mattes D | 2014-04-25 | 1 | -7/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining | ||||
| * | | | | | | | | | | | | | | | | | Fix formatting | r.ramazanov | 2014-04-25 | 1 | -9/+15 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fix for clang | r.ramazanov | 2014-04-25 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining & Mob Knockback is far too much | r.ramazanov | 2014-04-25 | 1 | -8/+5 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-25 | 13 | -24/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-24 | 4 | -9/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-23 | 58 | -531/+1259 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-23 | 1 | -9/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mob Knockback is far too much #776 | ||||
| * | | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-21 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Updated MSVC side of CMake files after recent changes. | madmaxoft | 2014-04-25 | 1 | -4/+2 |
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #935 from archshift/projectile-fixes | Mattes D | 2014-04-25 | 2 | -7/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chicken eggs and ender pearls can hit entities. | ||||
| * | | | | | | | | | | | | | | | | | | | | Creator not user. | archshift | 2014-04-25 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Comments for TrySpawnChicken() and TeleportUser(). | archshift | 2014-04-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Rename spawn chicken method, Initialize m_HasTeleported. | archshift | 2014-04-25 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Chicken eggs and ender pearls can hit entities. | archshift | 2014-04-25 | 2 | -7/+66 |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed warning by adding dedicated m_HasTeleported for fired arrows. | ||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #938 from archshift/xcode-oops | Mattes D | 2014-04-25 | 7 | -3/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Oops, forgot some CMakeLists in #937 | ||||
| * | | | | | | | | | | | | | | | | | | | Missed these CMakeLists. | archshift | 2014-04-25 | 7 | -3/+17 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #937 from archshift/xcode-headers | worktycho | 2014-04-25 | 12 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Cmake generated projects for IDEs include headers in project files. | ||||
| * | | | | | | | | | | | | | | | | | | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 12 | -0/+12 |
|/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #932 from Howaner/Inventory | Mattes D | 2014-04-25 | 6 | -17/+189 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Fix armor in survival mode. | ||||
| * | | | | | | | | | | | | | | | | | Add commit what the code is doing. | Howaner | 2014-04-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Add unkown armor warning and fix armor stacks. | Howaner | 2014-04-25 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Add armor to switch() in ItemHandler.cpp | Howaner | 2014-04-24 | 2 | -7/+26 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fix armor in survival mode. | Howaner | 2014-04-24 | 6 | -17/+157 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #929 from archshift/master | Mattes D | 2014-04-24 | 11 | -22/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | Renamed mob source files to better fit the CamelCase naming style. | ||||
| * | | | | | | | | | | | | | | | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 4 | -7/+7 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed references to renamed files. | archshift | 2014-04-24 | 6 | -9/+9 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Rename mob source files to fit CamelCase. | archshift | 2014-04-24 | 6 | -6/+0 |
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Cavespider.cpp to CaveSpider.cpp Rename Cavespider.h to CaveSpider.h Rename Magmacube.cpp to MagmaCube.cpp Rename Magmacube.h to MagmaCube.h Rename Zombiepigman.cpp to ZombiePigman.cpp Rename Zombiepigman.h to ZombiePigman.h | ||||
* / / / / / / / / / / / / / / | Changed cByteBuffer constructor to take a size_t instead of int. | madmaxoft | 2014-04-24 | 2 | -2/+2 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Updated docs for StringToEnchantmentID. | madmaxoft | 2014-04-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: mc-server/Core#67 | ||||
* | | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content. | madmaxoft | 2014-04-23 | 1 | -7/+29 |
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | The new leaves don't decay anymore. | STRWarrior | 2014-04-23 | 1 | -0/+1 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #792 | ||||
* | | | | | | | | | | | | Merge pull request #925 from archshift/master | Mattes D | 2014-04-23 | 4 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added monsters.ini rule for fireproof mobs. | ||||
| * | | | | | | | | | | | | Renamed getter and setter for IsFireproof. | archshift | 2014-04-23 | 3 | -4/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Declaration that a mob is not fireproof is implicit. | archshift | 2014-04-23 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed explicitly declaring mobs as not fireproof. | ||||
| * | | | | | | | | | | | | Added IsFireproof hook for monsters.ini | archshift | 2014-04-23 | 2 | -0/+29 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fireproof status getter and setter. | archshift | 2014-04-23 | 2 | -0/+16 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Updated NetherFort prefabs from the Gallery server. | madmaxoft | 2014-04-22 | 1 | -274/+785 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #923 from archshift/master | Mattes D | 2014-04-22 | 3 | -5/+17 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added flag for fireproof entities. | ||||
| * | | | | | | | | | | | | Fixed indentation and changed m_Fireproof to m_IsFireproof. | archshift | 2014-04-22 | 2 | -14/+14 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed capitalization issues | archshift | 2014-04-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wasn't parsing correctly before, as some items were not capitalized correctly. | ||||
| * | | | | | | | | | | | | Lay foundation for fireproof entities. | archshift | 2014-04-22 | 2 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage. | ||||
* | | | | | | | | | | | | | Revert moving gcc to g++11 in 18c3b1 | worktycho | 2014-04-22 | 1 | -8/+0 |
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 48 | -218/+263 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp | ||||
| * | | | | | | | | | | | reverted the revert of the minecart collision detection fix. | jfhumann | 2014-04-21 | 1 | -2/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed Flint and Steel, reverted Minecart change, renamed a parameter name | jfhumann | 2014-04-19 | 4 | -9/+10 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Declared one mutex as mutable in order to allow for const correct get accessors. | jfhumann | 2014-04-19 | 3 | -7/+7 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does. | jfhumann | 2014-04-18 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Small style changes | jfhumann | 2014-04-18 | 4 | -9/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 46 | -811/+2166 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | | | | | | | | | | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 48 | -212/+257 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Added prefab hitboxes. | madmaxoft | 2014-04-21 | 3 | -11/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish. | ||||
* | | | | | | | | | | | | | Added enchantment combining into cEnchantments. | madmaxoft | 2014-04-21 | 2 | -16/+33 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Replaced X.size() with X.empty(), where applicable. | madmaxoft | 2014-04-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed a warning in CraftingRecipes. | Mattes D | 2014-04-21 | 1 | -1/+1 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Allow 1.6.4 Forge clients to log in. | Mattes D | 2014-04-21 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #913. | ||||
* | | | | | | | | | | | | Fixed enchanting return values. | Mattes D | 2014-04-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items are enchanted in those cases, so return true. Ref.: #914. | ||||
* | | | | | | | | | | | | Updated the nightbuild script. | madmaxoft | 2014-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed MSVC compilation. | madmaxoft | 2014-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #890 from daniel0916/Enchanting | Mattes D | 2014-04-20 | 18 | -9/+1509 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Enchanting | ||||
| * | | | | | | | | | | | | Fixed Code | daniel0916 | 2014-04-19 | 2 | -145/+148 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-19 | 10 | -29/+377 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | APIDump: Added a ChunkStay article. | madmaxoft | 2014-04-19 | 3 | -27/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #772. | ||||
* | | | | | | | | | | | | | Fixed formatting, made function static. | madmaxoft | 2014-04-19 | 2 | -13/+18 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/Beacons' | madmaxoft | 2014-04-19 | 4 | -0/+159 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Some tweaks | STRWarrior | 2014-04-12 | 1 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetPyramidLevel returns 0 when no layers were found, 1 for one layer etc. Auto adjust the minY and/or maxY to 0 if the beacon is low. | ||||
| * | | | | | | | | | | | | Removed debug message. | STRWarrior | 2014-04-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Simplefied GetPyramidLevel | STRWarrior | 2014-04-12 | 1 | -10/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Implemented the skeleton code for the beacon. | STRWarrior | 2014-04-12 | 4 | -0/+155 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon. | ||||
* | | | | | | | | | | | | Compilation fix | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-04-18 | 2 | -0/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed #906 | Tiger Wang | 2014-04-18 | 2 | -1/+12 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed #904 | Tiger Wang | 2014-04-18 | 2 | -1/+6 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed Code (2) | daniel0916 | 2014-04-19 | 1 | -97/+93 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed Code | daniel0916 | 2014-04-19 | 5 | -411/+418 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-18 | 29 | -426/+1507 |
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Added performance test of the nether fort generator. | madmaxoft | 2014-04-18 | 2 | -0/+35 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Removed unsupported C++11 features. | madmaxoft | 2014-04-18 | 1 | -13/+19 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 18 | -330/+457 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to redstone & general | ||||
| * | | | | | | | | | | | Compile fix? | Tiger Wang | 2014-04-17 | 2 | -2/+10 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Implemented weighted pressure plates | Tiger Wang | 2014-04-17 | 3 | -29/+175 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Rewrote redstone powering to use power levels | Tiger Wang | 2014-04-15 | 6 | -183/+157 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 10 | -123/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
| * | | | | | | | | | | | Simplified pickup speed randomisation | Tiger Wang | 2014-04-12 | 1 | -4/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Added area flooring. | madmaxoft | 2014-04-17 | 1 | -1/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #743. | ||||
* | | | | | | | | | | | | Added new AI rules | Tiger Wang | 2014-04-17 | 7 | -55/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT | ||||
* | | | | | | | | | | | | Added Prefab initializers to SELFTEST code. | madmaxoft | 2014-04-17 | 1 | -1/+13 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Prefabs can have per-piece per-placement weights. | madmaxoft | 2014-04-17 | 5 | -32/+752 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #753. Also upgraded NetherFortPrefabs to lates Gallery contents. | ||||
* | | | | | | | | | | | | Merge pull request #896 from axisd/master | Mattes D | 2014-04-17 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs rotation | ||||
| * | | | | | | | | | | | | Mobs rotation | r.ramazanov | 2014-04-17 | 1 | -4/+6 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Added asserts for proper game state. | madmaxoft | 2014-04-16 | 1 | -5/+131 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help hunt #889. | ||||
| | | * | | | | | | | | | Fixed Errors | daniel0916 | 2014-04-18 | 3 | -5/+23 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Removed old include | daniel0916 | 2014-04-18 | 2 | -2/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed some Errors (not all) | daniel0916 | 2014-04-17 | 4 | -20/+21 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Modified many things | daniel0916 | 2014-04-17 | 10 | -918/+1000 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed conflicting enchantments checking | daniel0916 | 2014-04-16 | 2 | -24/+24 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Added deletions from merge conflict | daniel0916 | 2014-04-16 | 1 | -0/+875 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-16 | 24 | -382/+696 |
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Attempted fix for the client crash with the new protocols. | madmaxoft | 2014-04-15 | 2 | -6/+16 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Added support for per-piece per-placement weights in cPieceGenerator. | madmaxoft | 2014-04-15 | 2 | -28/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #753. | ||||
* | | | | | | | | | | | | NetherFortPrefabs: Fixed a connector in MidStaircase. | madmaxoft | 2014-04-15 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #888 from mc-server/Proto176 | Mattes D | 2014-04-15 | 16 | -333/+571 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Protocol 1.7.6 | ||||
| * | | | | | | | | | | | | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 10 | -128/+198 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Server works both in online and offline modes with 1.7.9. | ||||
| * | | | | | | | | | | | | A client UUID is generated when the server is in offline mode. | madmaxoft | 2014-04-14 | 3 | -5/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.7.9 client works with these changes in offline mode. | ||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176 | madmaxoft | 2014-04-14 | 10 | -296/+362 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fixed mistake | daniel0916 | 2014-04-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed Error? | daniel0916 | 2014-04-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Code Update | daniel0916 | 2014-04-13 | 1 | -4/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added Yggdrasil Authentication System | daniel0916 | 2014-04-13 | 9 | -295/+360 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code by Howaner. Fixes/Changes by me. | ||||
| * | | | | | | | | | | | | | Initial 1.7.6 protocol support. | madmaxoft | 2014-04-14 | 4 | -2/+69 |
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't work yet because of missing UUIDs. | ||||
* | | | | / / / / / / / / | ProtoProxy: Fixed weird gcc compilation errors. | madmaxoft | 2014-04-14 | 1 | -16/+22 |
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | ProtoProxy: Added 1.7.9 compatibility. | madmaxoft | 2014-04-14 | 1 | -0/+29 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | ChunkStay must be disabled while being deleted.ProtoProxy_1.7.2_001 | madmaxoft | 2014-04-12 | 3 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #758. | ||||
* | | | | | | | | | | | | Fixed chunkstays not being removed on auto-delete. | madmaxoft | 2014-04-12 | 2 | -10/+19 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #837. | ||||
| | | * | | | | | | | | Fixed merge conflict | daniel0916 | 2014-04-16 | 1 | -877/+0 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed double enchanting items | daniel0916 | 2014-04-16 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Code Optimization | daniel0916 | 2014-04-15 | 2 | -358/+183 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Added Book Enchanting | daniel0916 | 2014-04-15 | 2 | -2/+311 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Add more checks to cSlotAreaEnchanting | Howaner | 2014-04-15 | 3 | -99/+212 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Modified names | daniel0916 | 2014-04-15 | 2 | -49/+49 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Add linux compatibility | Howaner | 2014-04-15 | 1 | -61/+71 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Added ItemPlaceCount in SlotArea | daniel0916 | 2014-04-14 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Howaner for helping | ||||
| | | * | | | | | | | | Removed Debug Message | daniel0916 | 2014-04-14 | 1 | -2/+0 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Added/Modified last things for Enchanting System | daniel0916 | 2014-04-14 | 1 | -15/+53 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Blocked enchanting a item twice | daniel0916 | 2014-04-14 | 2 | -8/+10 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed Bookshelf Checking | daniel0916 | 2014-04-14 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code by LO1ZB | ||||
| | | * | | | | | | | | Bug fixes | daniel0916 | 2014-04-14 | 4 | -26/+21 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed invisibility enchantments | daniel0916 | 2014-04-13 | 4 | -1/+8 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed mistake | daniel0916 | 2014-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed Server Crash | daniel0916 | 2014-04-13 | 1 | -0/+6 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Some Fixes | daniel0916 | 2014-04-13 | 2 | -2/+9 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-12 | 12 | -2057/+3454 |
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Updated the NetherFort prefabs to current Gallery contents. | madmaxoft | 2014-04-12 | 3 | -1958/+3329 |
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code exported from the Gallery server by the GalExport plugin. | ||||
* | | | | | | | | | | Fixed issues with 64-bit MSVC compilation. | madmaxoft | 2014-04-11 | 3 | -21/+35 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Fixed enchantment parsing. | madmaxoft | 2014-04-10 | 1 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #880. Enchantment parsing now reports in detail which value failed to parse | ||||
* | | | | | | | | | InfoReg uses cCompositeChat for subcommand lists. | madmaxoft | 2014-04-10 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed an issue with console commands. | ||||
* | | | | | | | | | Merge pull request #878 from mc-server/mobexp | Mattes D | 2014-04-10 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | @axisd Changes | ||||
| * | | | | | | | | | Fixed GitHuB WebEdit fail. | Alexander Harkness | 2014-04-10 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update Monster.cpp | Alexander Harkness | 2014-04-10 | 1 | -2/+4 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #871 from worktycho/worldstorage | Mattes D | 2014-04-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removed check for enqueuing a chunk that is already enqueued to be loaded | ||||
| * | | | | | | | | | 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 | ||||
* | | | | | | | | | | cRedstoneSimulator.cpp style improvements | Tiger Wang | 2014-04-08 | 1 | -40/+41 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #872 from worktycho/bugfix | Alexander Harkness | 2014-04-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed missing - that caused all neighbour lookups to go to the chunkmap | ||||
| * | | | | | | | | | | Fixed missing - that caused all neighbour lookups to go to the chunkmap | Tycho | 2014-04-08 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #870 from wiseoldman95/patch-1 | Alexander Harkness | 2014-04-08 | 1 | -10/+11 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Comments: Inverted Z axis. | ||||
| * | | | | | | | | | | Uppercased Z | wiseoldman95 | 2014-04-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor, no code changed. | ||||
| * | | | | | | | | | | Comments: Inverted Z axis. | wiseoldman95 | 2014-04-08 | 1 | -9/+10 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Comments fix, No code has been changed. -Inverted the Z axis in the comments and changed all dependent comments accordingly. -Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN. | ||||
* | | | | | | | | | | Merge pull request #869 from wiseoldman95/patch-1 | Alexander Harkness | 2014-04-08 | 1 | -9/+31 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added comments regarding latching and orientation | ||||
| * | | | | | | | | | | Added comments regarding latching and orientation | wiseoldman95 | 2014-04-08 | 1 | -9/+31 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | No real code was changed. | ||||
* | | | | | | | | | | Fixed the thing properly. | Alexander Harkness | 2014-04-08 | 1 | -8/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #862 from mc-server/redstonefix | Alexander Harkness | 2014-04-08 | 1 | -23/+3 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed #859 | ||||
| * | | | | | | | | | | Fixed #859 | Tiger Wang | 2014-04-07 | 1 | -23/+3 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #865 from wiseoldman95/patch-2 | Alexander Harkness | 2014-04-07 | 1 | -13/+13 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Redstone simulator - cleaning up repeater lock code | ||||
| * | | | | | | | | | | Fixed IsOn | wiseoldman95 | 2014-04-07 | 1 | -3/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed stray IsLocked | wiseoldman95 | 2014-04-07 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed unneeded spacings | wiseoldman95 | 2014-04-07 | 1 | -6/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Slight cleanup | wiseoldman95 | 2014-04-07 | 1 | -13/+17 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | It is more efficient and readable if we do nothing unless we're not locked. | ||||
| | | * | | | | | | | Fixed Bookshelves Checking (not completly) | daniel0916 | 2014-04-12 | 1 | -7/+10 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Added complete Enchanting System | daniel0916 | 2014-04-12 | 8 | -147/+803 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Enchantment_mechanics | ||||
| | | * | | | | | | | Modified comment | daniel0916 | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fixed Errors | daniel0916 | 2014-04-07 | 2 | -3/+3 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Added deleted things for merging | daniel0916 | 2014-04-07 | 1 | -0/+3 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 711 | -62011/+38666 |
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Fixed some more minor issues with the redstone simulator. | Alexander Harkness | 2014-04-07 | 1 | -34/+39 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Improved the speed a little more. | Alexander Harkness | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed the redstone simulator. | Alexander Harkness | 2014-04-07 | 1 | -49/+40 |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||||
* | | | | | | | | | Fix some of the comments in the PR tycho just did. | Alexander Harkness | 2014-04-07 | 1 | -8/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #861 from worktycho/simulator | Alexander Harkness | 2014-04-07 | 2 | -2/+65 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added support for redstone latching | ||||
| * | | | | | | | | | Added support for redstone latching | Tycho | 2014-04-06 | 2 | -2/+65 |
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | fixes #856 | ||||
* | | | | | | | | | Fixed HTTP chunked encoding. | madmaxoft | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #858. | ||||
* | | | | | | | | | Added the generated ZBS API file to ignore list. | madmaxoft | 2014-04-06 | 1 | -0/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed 1.6.4 client crash on composite chat messages. | madmaxoft | 2014-04-06 | 2 | -0/+14 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed crash in protocols sending 64-bit ints. | madmaxoft | 2014-04-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #855. | ||||
* | | | | | | | | | Updated the tolua executable for Windows. | madmaxoft | 2014-04-06 | 1 | -0/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge remote-tracking branch 'worktycho/override' | madmaxoft | 2014-04-06 | 7 | -1325/+1648 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Added forgoten lua file | Tycho | 2014-04-06 | 1 | -0/+1476 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into override | Tycho | 2014-04-05 | 200 | -1373/+6707 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt | ||||
| * | | | | | | | | Fixed tolua++ override support | Tycho | 2014-04-02 | 5 | -1319/+164 |
| | | | | | | | | | |||||
| * | | | | | | | | Added override specifier to functions declared in cWorld | Tycho | 2014-03-22 | 1 | -8/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | FIrst attempt at adding override support to tolua | Tycho | 2014-03-22 | 1 | -5/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Updated cWorld::CreateProjectile() documentation | Tiger Wang | 2014-04-06 | 1 | -1/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Fixed Endiannes conversion routines for floats and doubles. | madmaxoft | 2014-04-05 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7. This change fixes #854. | ||||
* | | | | | | | | Fixed double projectile spawning. | madmaxoft | 2014-04-05 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two spawn packets were sent per projectile. | ||||
* | | | | | | | | Removed debugging log from entity physics handling. | madmaxoft | 2014-04-05 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Added more API documentation to cCompositeChat. | madmaxoft | 2014-04-05 | 1 | -1/+17 |
| | | | | | | | | |||||
* | | | | | | | | Added cPlayer:SendRotation() API function. | madmaxoft | 2014-04-05 | 2 | -0/+17 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #840 from Howaner/NewBlocks | Mattes D | 2014-04-04 | 3 | -5/+152 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add tall flower handler. | ||||
| * | | | | | | | | Change CanBeAt() from big flower | Howaner | 2014-04-03 | 1 | -5/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add "a_RelY < cChunkDef::Height" to BlockBigFlower | Howaner | 2014-03-29 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add tallgrass drop to big flowers. | Howaner | 2014-03-28 | 2 | -8/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tallgrass drop, when a players break a tallgrass with the shear. | ||||
| * | | | | | | | | door -> flower | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add tall flower handler. | Howaner | 2014-03-28 | 2 | -0/+99 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into HTTPSizeT | madmaxoft | 2014-04-04 | 39 | -581/+359 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Explicit change record size. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Changed cNoise seed to signed. | madmaxoft | 2014-04-04 | 2 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed format string mismatch. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 6 | -81/+82 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed CreateHexDump's format string. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed CreateHexDump's signedness. | madmaxoft | 2014-04-04 | 3 | -11/+11 |
| | | | | | | | | | | |||||
| * | | | | | | | | | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 3 | -30/+39 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed silly Clang's warnings in FastNBT. | madmaxoft | 2014-04-04 | 1 | -28/+28 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 13 | -43/+51 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed Clang warnings in itemhandlers. | madmaxoft | 2014-04-04 | 6 | -20/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | ProtoProxy: Fixed a few Clang and MSVC warnings. | madmaxoft | 2014-04-04 | 2 | -4/+8 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | APIDump: Added angular specifics. | madmaxoft | 2014-04-03 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Documented the units and range for entity rotations. | madmaxoft | 2014-04-03 | 2 | -10/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Removed unneeded asserts. | madmaxoft | 2014-04-03 | 1 | -2/+0 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Fixed a few MSVC type warnings. | Mattes D | 2014-04-03 | 3 | -2/+5 |
| | | | | | | | | |||||
| * | | | | | | | Removed the bindings to set old g_BlockXXX arrays. | Mattes D | 2014-04-03 | 1 | -297/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those were supposed to be read-only; there's no point in writing to them anyway. Also fixed MSVC type warnings in the code. | ||||
| * | | | | | | | Merge pull request #849 from mc-server/minorfixes | Mattes D | 2014-04-02 | 6 | -48/+34 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Minor fixes | ||||
| | * | | | | | | | With eXtra line! | Tiger Wang | 2014-04-02 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Removed extra brackets | Tiger Wang | 2014-04-02 | 1 | -5/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Final realisation of suggestions | Tiger Wang | 2014-03-31 | 1 | -5/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | Realised suggestions | Tiger Wang | 2014-03-31 | 2 | -6/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Simplified and fixed slabs, fixes #835 | Tiger Wang | 2014-03-31 | 3 | -36/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed a few Y too high/low asserts | Tiger Wang | 2014-03-31 | 3 | -12/+15 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into HTTPSizeT | Tycho | 2014-04-02 | 24 | -30/+45 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/HTTPServer/EnvelopeParser.h src/HTTPServer/HTTPFormParser.h src/HTTPServer/MultipartParser.h | ||||
| * | | | | | | | | Fixed boat placement code. | madmaxoft | 2014-04-02 | 1 | -9/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed more virtual destructors for interfaces. | madmaxoft | 2014-04-02 | 4 | -0/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 19 | -19/+21 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp | ||||
| | * | | | | | | | | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. | Samuel Barney | 2014-03-25 | 16 | -15/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
| | * | | | | | | | | Added one more missing newline. | Samuel Barney | 2014-03-25 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added newlines. Without them, the files would not compile. | Samuel Barney | 2014-03-25 | 4 | -4/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into HTTPSizeT | Tycho | 2014-04-02 | 14 | -18/+375 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into globals | Tycho | 2014-04-02 | 178 | -4454/+11512 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #831 from mc-server/Wither | Mattes D | 2014-04-02 | 5 | -3/+153 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Wither | ||||
| | | * | | | | | | | | | Fixed clang compilation | andrew | 2014-03-25 | 2 | -14/+17 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed wither summoning | andrew | 2014-03-25 | 3 | -3/+37 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Protocol: Wither metadata | andrew | 2014-03-25 | 5 | -3/+116 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Debuggers: Added a Base64 API roundtrip test. | madmaxoft | 2014-04-02 | 1 | -4/+23 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added schematic string serializer self-test. | madmaxoft | 2014-04-02 | 1 | -0/+33 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed StringCompression's GZIP handling for larger strings. | madmaxoft | 2014-04-02 | 2 | -5/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Exported the Base64 encoding and decoding functions to Lua API. | madmaxoft | 2014-04-01 | 2 | -2/+48 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merged branch 'msDifference'. | madmaxoft | 2014-04-01 | 3 | -1/+52 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | APIDump: Gave msDifference it's own table. | STRWarrior | 2014-04-01 | 1 | -9/+21 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added extra table which should make it more clear what msDifference does. | STRWarrior | 2014-03-31 | 1 | -1/+3 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Fixed typo | STRWarrior | 2014-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Documented msDifference | STRWarrior | 2014-03-31 | 1 | -6/+8 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added new merge strategy "msDifference" | STRWarrior | 2014-03-31 | 2 | -0/+35 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | cBlockArea: Added the msMask merge strategy. | madmaxoft | 2014-04-01 | 3 | -3/+59 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into globals | Tycho | 2014-03-15 | 11 | -40/+146 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into globals | Tycho | 2014-03-14 | 4 | -11/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| * | | | | | | | | | | | | | | Disable global constructors and exit-time destructors warnings | Tycho | 2014-03-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed All signedness warnings in HTTPServer.cpp | Tycho | 2014-04-02 | 10 | -14/+17 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed format string in HTTPConnection | Tycho | 2014-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed Comparison to -1 in HTTPMessage.h | Tycho | 2014-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Rewritten HTTPServer to use size_t for data lengths. | madmaxoft | 2014-04-01 | 16 | -90/+97 |
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Removed the exit-time-destructors flag from clang. | madmaxoft | 2014-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't care about exit-time destructors, at least for now. | ||||
* | | | | | | | | | | | | | | More cFile warning fixes. | madmaxoft | 2014-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'RemoveClangFlags' | madmaxoft | 2014-04-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Attempt at disabling the useless clang warnings. | madmaxoft | 2014-04-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #846, #847 | ||||
* | | | | | | | | | | | | | | | Fixed clang warnings in cGZipFile. | madmaxoft | 2014-04-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed clang warnings in BlockHandlers. | madmaxoft | 2014-04-01 | 4 | -5/+6 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed clang warnings in cFile. | madmaxoft | 2014-04-01 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only support 32-bit filesizes (files < 2 GiB). | ||||
* | | | | | | | | | | | | | | | Simplified the anvil placement code. | madmaxoft | 2014-04-01 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Removed an unneeded code branch. | madmaxoft | 2014-04-01 | 1 | -5/+0 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | LOG() API reads the LogLevel from the cCompositeChat's MessageType. | madmaxoft | 2014-04-01 | 6 | -24/+81 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | APIDump: Documented the cCompositeChat support in logging functions. | madmaxoft | 2014-03-31 | 1 | -5/+25 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Console logging supports cCompositeChat as its parameters. | madmaxoft | 2014-03-31 | 5 | -34/+78 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | APIDump: Added code completion support file to ZBS tutorial. | madmaxoft | 2014-03-31 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | APIDump: Renamed the ZBS API dump file to mcserver_api.lua. | madmaxoft | 2014-03-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid confusion with ZBS, where two "mcserver.lua" files were present. | ||||
* | | | | | | | | | | | | | | cCompositeChat has a MessageType param in the constructor. | madmaxoft | 2014-03-31 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make it easier to use. | ||||
* | | | | | | | | | | | | | | Fixed a few Clang warnings in BlockHandlers. | madmaxoft | 2014-03-30 | 11 | -48/+54 |
| |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed a few clang warnings. | madmaxoft | 2014-03-30 | 4 | -7/+13 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'NetherFortGen'. | madmaxoft | 2014-03-30 | 12 | -26/+3248 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added all current NetherFort prefabs. | madmaxoft | 2014-03-30 | 1 | -3/+1547 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added asserts for critical data in cPrefab. | madmaxoft | 2014-03-30 | 1 | -0/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Re-fixed nether fort piece count check. | madmaxoft | 2014-03-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed chest rotator. | madmaxoft | 2014-03-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | NetherForts have a minimum number of pieces. | madmaxoft | 2014-03-30 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces. | ||||
| * | | | | | | | | | | | | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-29 | 17 | -27/+285 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | NetherFortGen: Added several more prefabs. | madmaxoft | 2014-03-28 | 2 | -2/+783 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also extended the defauls MaxDepth value to 12. | ||||
| * | | | | | | | | | | | | | Added Prefabs to *nix builds. | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-28 | 11 | -37/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Implemented the msSpongePrint merge strategy. | madmaxoft | 2014-03-28 | 4 | -13/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block. | ||||
| * | | | | | | | | | | | | | | NetherFort: Added BalconyTee2 prefab. | madmaxoft | 2014-03-28 | 1 | -29/+158 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a memory leak in NetherFortGen. | madmaxoft | 2014-03-28 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Sponged the netherfort balcony prefab. | madmaxoft | 2014-03-28 | 1 | -30/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks. | ||||
| * | | | | | | | | | | | | | | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Initial NetherFortGen import. | madmaxoft | 2014-03-28 | 8 | -15/+713 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple fortresses of 2 different rooms will generate. | ||||
* | | | | | | | | | | | | | | | APIDump: Added article: Setting up ZeroBrane Studio. | madmaxoft | 2014-03-30 | 4 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #824. | ||||
* | | | | | | | | | | | | | | | Merge pull request #845 from mc-server/License | Alexander Harkness | 2014-03-30 | 1 | -1/+196 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License | ||||
| * | | | | | | | | | | | | | | | Apache license | andrew | 2014-03-30 | 1 | -1/+196 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge pull request #834 from narroo/issue503 | Mattes D | 2014-03-30 | 23 | -121/+372 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue503 pull Request | ||||
| * | | | | | | | | | | | | | | | Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler. | narroo | 2014-03-29 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet. | narroo | 2014-03-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed Minor typos. | narroo | 2014-03-26 | 3 | -9/+12 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added a comment about the behavior of doors under mirros. Simply put, the current implementation of MetaMirror causes glitchy behavior. The door class itself needs to be edited. (I've got an idea on that....) | narroo | 2014-03-25 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed spelling; Rotater to Rotator. | narroo | 2014-03-25 | 15 | -46/+46 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Changed Rotater to Rotator. Added partial sign post rotation support. | narroo | 2014-03-25 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added MetaRotate/Mirror Support for a number of classes. | narroo | 2014-03-24 | 12 | -84/+295 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 10 | -13/+162 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | Lilypads | ||||
| * | | | | | | | | | | | | | | | Another curly | Tiger Wang | 2014-03-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Compare for inequality in FACE_NONE checks | Tiger Wang | 2014-03-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Removed leftover clienthandle code | Tiger Wang | 2014-03-29 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Curly brackets | Tiger Wang | 2014-03-29 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed infinite minecart items | Tiger Wang | 2014-03-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed block interaction rate check | Tiger Wang | 2014-03-28 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed a potential crash | Tiger Wang | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Some fixes to lilypads | Tiger Wang | 2014-03-28 | 5 | -62/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed placement on lava * Fixed placement on side of blocks * Fixed placement through blocks + Added washing-away of pads + Added ice as a block that fully occupies its voxel | ||||
| * | | | | | | | | | | | | | | | Implemented lilypad placement | Tiger Wang | 2014-03-23 | 4 | -8/+98 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | cPrefab now uses a struct for block type definition in CharMap. | madmaxoft | 2014-03-29 | 2 | -10/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by worktycho in 7b585290fccd3dc074b1f9feef0af754ab3dd632, instead of packing the two values into a single int, they're packed into a struct. Also added a test code for the prefab parsing in SELF_TEST. | ||||
* | | | | | | | | | | | | | | | | Merge pull request #842 from mc-server/ProjectileHooks | Mattes D | 2014-03-29 | 10 | -1/+167 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | Projectile hooks | ||||
| * | | | | | | | | | | | | | | | Fixed the OnProjectileHitBlock hook not stopping projectiles. | STRWarrior | 2014-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Documented both hooks. | STRWarrior | 2014-03-29 | 2 | -0/+49 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added HOOK_PROJECTILE_HIT_BLOCK. | STRWarrior | 2014-03-29 | 6 | -0/+50 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed error when the hook gets called. | STRWarrior | 2014-03-29 | 3 | -1/+14 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added HOOK_PROJECTILE_HIT_ENTITY | STRWarrior | 2014-03-29 | 6 | -0/+54 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Renamed lua dll for tolua++.exe. | madmaxoft | 2014-03-29 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #843. | ||||
* | | | | | | | | | | | | | | | Updated the android files | STRWarrior | 2014-03-29 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed players not updating after world change | Tiger Wang | 2014-03-29 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526 | ||||
* | | | | | | | | | | | | | | | Fixed #721 and FS439 | Tiger Wang | 2014-03-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fixed a minor ini key duplication bug | Tiger Wang | 2014-03-29 | 1 | -0/+1 |
|/ / / / / / / / / / / / / / | |||||
* | | | / / / / / / / / / / | Fixed non-virtual destructors warnings. | madmaxoft | 2014-03-28 | 11 | -37/+61 |
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed compilation after last PR merge. | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'howaner/GlobalFixes'. | madmaxoft | 2014-03-28 | 14 | -6/+132 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add missing ChunkDesc import. | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix merge conflicts | Howaner | 2014-03-27 | 1 | -7/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change documentation text | Howaner | 2014-03-27 | 2 | -4/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change SpreadSource documentation | Howaner | 2014-03-27 | 2 | -6/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change SpreadSource prefix to ss | Howaner | 2014-03-27 | 4 | -8/+8 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Wrong if in BlockLeaves | Howaner | 2014-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add documentation for new Block spread | Howaner | 2014-03-27 | 2 | -0/+49 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add SpreadSource | Howaner | 2014-03-27 | 11 | -10/+34 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add HOOK_BLOCK_SPREAD | Howaner | 2014-03-27 | 6 | -3/+57 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add new leaves to all classes. | Howaner | 2014-03-27 | 2 | -1/+8 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fixed Prefab's rotations. | madmaxoft | 2014-03-28 | 2 | -7/+39 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Debuggers: Deactivated the chunk generator callback. | madmaxoft | 2014-03-28 | 1 | -1/+3 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | cPrefab can draw itself into a cChunkDesc. | madmaxoft | 2014-03-27 | 2 | -6/+9 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed chunk neighbor-getting for long distances. | madmaxoft | 2014-03-27 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a server hang when teleporting to coords too far away. | ||||
* | | | | | | | | | | | | Prefabs support connectors, rotations and merge strategy. | madmaxoft | 2014-03-26 | 2 | -3/+72 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Ignoring the default GalExports folder. | madmaxoft | 2014-03-25 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Removed unused constants. | madmaxoft | 2014-03-25 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now. | ||||
* | | | | | | | | | | | | Added a basic cPrefab class. | madmaxoft | 2014-03-25 | 2 | -0/+222 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be defined in the source by GalExport's cpp output. | ||||
* | | | | | | | | | | | | BlockArea: Create() can take the size as Vector3i, too. | madmaxoft | 2014-03-25 | 2 | -2/+17 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | BlockArea: Switched internal coords to Vector3i. | madmaxoft | 2014-03-25 | 4 | -200/+176 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Added Vector3::Move(const Vector3 &). | madmaxoft | 2014-03-25 | 1 | -0/+7 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | InfoReg updated for multi-verb console commands. | madmaxoft | 2014-03-25 | 1 | -12/+39 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #833 from mc-server/EnderCrystal | Mattes D | 2014-03-25 | 7 | -11/+137 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Ender crystals | ||||
| * | | | | | | | | | | | Ender crystals | andrew | 2014-03-25 | 7 | -11/+137 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #828 from mc-server/Wither | Mattes D | 2014-03-25 | 9 | -15/+109 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | Wither invulnerability | ||||
| * | | | | | | | | | | | Minor fixes | andrew | 2014-03-25 | 3 | -14/+13 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Wither invulnerability | andrew | 2014-03-24 | 8 | -5/+100 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #829 from Howaner/Cake | Mattes D | 2014-03-24 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Add log pickups. | ||||
| * | | | | | | | | | | Add log pickups. | Howaner | 2014-03-24 | 1 | -1/+7 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed bad cmake document interpretation | Tiger Wang | 2014-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs say: "If nothing is found, the result will be <VAR>-NOTFOUND" | ||||
* | | | | | | | | | | | Updated the ToLua windows executable. | madmaxoft | 2014-03-23 | 1 | -0/+0 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #826 from worktycho/xxd_check | Mattes D | 2014-03-23 | 1 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Added better check for xxd existance | ||||
| * | | | | | | | | | | Added Additonal check for xxd existance | Tycho | 2014-03-22 | 1 | -6/+9 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #810 from worktycho/size_t_lua | Mattes D | 2014-03-22 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | gave tolua awareness of size_t | ||||
| * | | | | | | | | | | Merge branch 'master' into size_t_lua | Tycho | 2014-03-22 | 75 | -3909/+5072 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tolua++/src/bin/basic_lua.h | ||||
* | | | | | | | | | | | Implemented faster upscaling using templates. | madmaxoft | 2014-03-21 | 6 | -36/+38 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #819. | ||||
* | | | | | | | | | | Updated the tolua++ executable for Win builds. | madmaxoft | 2014-03-20 | 1 | -0/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'unreachable' | madmaxoft | 2014-03-20 | 19 | -2762/+3656 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fixed enum checking functions not being called in generated code | Tycho | 2014-03-20 | 8 | -2569/+2572 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed bugs in patched tolua output | Tycho | 2014-03-19 | 10 | -2211/+2531 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-19 | 6 | -459/+420 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Added unreachable lines backit prtected by preprocessor guards | Tycho | 2014-03-19 | 2 | -0/+10 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed tolua emitting isnumber insteand of is<Enum> | Tycho | 2014-03-19 | 4 | -449/+462 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed type error in lua bindings | Tycho | 2014-03-19 | 2 | -162/+163 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed =~ bug | Tycho | 2014-03-17 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-17 | 40 | -246/+878 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Made buffers static const | Tycho | 2014-03-16 | 4 | -6/+6 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Plugins can set flying speed. | madmaxoft | 2014-03-20 | 4 | -80/+124 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | APIDump: Fixed wrong escaped strings. | madmaxoft | 2014-03-20 | 1 | -5/+5 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Rewritten player speeds to be relative unit-less. | madmaxoft | 2014-03-20 | 5 | -17/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof. | ||||
* | | | | | | | | | | | | ProtoProxy: Fixed MSVC compilation. | madmaxoft | 2014-03-20 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed code style after recent merge. | madmaxoft | 2014-03-20 | 2 | -31/+33 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Made pushing plain pointer to Lua a valid operation, with a warning. | madmaxoft | 2014-03-20 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used for exotic explosions, and the NORETURNDEBUG macro caused MSVC warnings across the entire cLuaState class (MSVC marked ALL Push() function overloads as non-returning) | ||||
* | | | | | | | | | | | | Merge pull request #790 from mc-server/awesometnt | Mattes D | 2014-03-20 | 9 | -217/+258 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | TNT Shrapnel | ||||
| * | | | | | | | | | | | | Added braces | Tiger Wang | 2014-03-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Minor Entity.cpp cleanup | Tiger Wang | 2014-03-20 | 1 | -12/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 4 | -15/+17 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 135 | -1116/+3244 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | | | | | | | | | | | | | Added levels of shrapnel | Tiger Wang | 2014-03-18 | 3 | -8/+18 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 32 | -213/+802 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 88 | -626/+2146 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Shrapnel now configurable | Tiger Wang | 2014-03-10 | 3 | -3/+8 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 7 | -209/+232 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug | ||||
* | | | | | | | | | | | | | | | | Errors in Lua don't include the error handler in the stack trace. | madmaxoft | 2014-03-19 | 2 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #817. | ||||
* | | | | | | | | | | | | | | | | APIDump: Updated comments to reflect current code. | madmaxoft | 2014-03-19 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | APIDump: Added ZeroBraneStudio API export. | madmaxoft | 2014-03-19 | 1 | -5/+128 |
| |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #821. | ||||
* | | | | | | | | | | | | | | | APIDump: Reformatted the plugin to avoid all ZBS Analyzer issues. | madmaxoft | 2014-03-19 | 1 | -443/+404 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | LuaChunkStay: Removed a debugging output. | madmaxoft | 2014-03-19 | 1 | -3/+0 |
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed chunkmap tree block replacing. | madmaxoft | 2014-03-18 | 1 | -8/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Debuggers: Using binary file mode for .schematics. | madmaxoft | 2014-03-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed cGZipFile::ReadRestOfFile returning incorrect value. | madmaxoft | 2014-03-18 | 1 | -1/+4 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed a crash in firework rockets. | madmaxoft | 2014-03-17 | 1 | -2/+8 |
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #816. | ||||
* | | | | | | | | | | | | | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 4 | -52/+53 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Added override specifier where appropriate in cWorld. | madmaxoft | 2014-03-16 | 1 | -37/+38 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #811 from mc-server/DumpInfo | Mattes D | 2014-03-16 | 1 | -0/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a small plugin for InfoDump | ||||
| * | | | | | | | | | | | | | Only check for "Info.lua" with capital I | STRWarrior | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Created a small plugin for InfoDump | STRWarrior | 2014-03-15 | 1 | -0/+49 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows you to dump the info of a plugin by pressing a button in the webadmin. | ||||
* | | | | | | | | | | | | | Merge pull request #782 from mc-server/beds | Mattes D | 2014-03-16 | 5 | -17/+94 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beds now work properly, fixes #707 | ||||
| * | | | | | | | | | | | | | Fixed VERIFY | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Beds now work properly fixes #707 | Tiger Wang | 2014-03-09 | 5 | -17/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp | ||||
* | | | | | | | | | | | | | | Merge pull request #809 from Howaner/BlockEntitys | Mattes D | 2014-03-16 | 19 | -99/+512 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More entity saving. | ||||
| * | | | | | | | | | | | | | | Fix anvil pickups. | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add anvil direction. | Howaner | 2014-03-16 | 3 | -1/+74 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Remove old debug messages. | Howaner | 2014-03-15 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-15 | 139 | -1288/+3421 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add item frame saving. | Howaner | 2014-03-15 | 9 | -46/+251 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add health and age load to pickup's. | Howaner | 2014-03-15 | 5 | -22/+43 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add ExpOrb saving. | Howaner | 2014-03-15 | 7 | -38/+124 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add fireball interact | Howaner | 2014-03-14 | 4 | -2/+33 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Wrong if in BlockLeaves | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Add new leaves to all classes. | Howaner | 2014-03-16 | 9 | -5/+18 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Fixed InfoReg.lua's handling of multi-level commands. | madmaxoft | 2014-03-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Removed the @EnableMobDebug.lua file. | madmaxoft | 2014-03-16 | 1 | -29/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not needed anymore, ZeroBrane Studio now has direct support for invoking the debugger in MCS plugins. | ||||
* | | | | | | | | | | | | | | | | Added common eMessageType aliases. | madmaxoft | 2014-03-16 | 1 | -10/+16 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge pull request #814 from Howaner/Cake | Mattes D | 2014-03-16 | 4 | -0/+101 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | Add cake | ||||
| * | | | | | | | | | | | | | | Change if-clause in BlockCake.h | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add cake | Howaner | 2014-03-16 | 4 | -0/+101 |
|/ / / / / / / / / / / / / / | |||||
| | | | | | | | * / / / / / | Patched tolua to understand size_t | Tycho | 2014-03-15 | 2 | -1/+4 |
| | | | | | | |/ / / / / / | |||||
| | | | | | | * | | | | | | Fix indentation | Tycho | 2014-03-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Fixed unessicary return | Tycho | 2014-03-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-15 | 11 | -38/+143 |
| | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
* | | | | | | | | | | | | | Debuggers: Added a test for WE selection API. | madmaxoft | 2014-03-15 | 1 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tests mc-server/WorldEdit#34. | ||||
* | | | | | | | | | | | | | APIDump: Documented a forgotten cCuboid constructor. | madmaxoft | 2014-03-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #800 from mc-server/EntireCommandError | Mattes D | 2014-03-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entire unknown command is echoed back to the user on error. | ||||
| * | | | | | | | | | | | | | The entire unknown command is echoed back to the user on error. | madmaxoft | 2014-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | APIDump: Fixed missing return statement. | madmaxoft | 2014-03-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Added cCuboid:Assign(OtherCuboid) API function. | madmaxoft | 2014-03-15 | 3 | -2/+21 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Ignoring all config and SQLite files in the output folder. | madmaxoft | 2014-03-14 | 1 | -4/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | APIDump: Trigger the dump manually. | madmaxoft | 2014-03-14 | 1 | -26/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #715. The dump can be triggerred by issuing an "api" console command, or in the webadmin. | ||||
* | | | | | | | | | | | | | Merge pull request #808 from worktycho/noreturn | Mattes D | 2014-03-14 | 4 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | Noreturn | ||||
| * | | | | | | | | | | | | Merge branch 'master' into noreturn | Tycho | 2014-03-14 | 4 | -11/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| * | | | | | | | | | | | | Added Noreturn attribtes to a couple of functions and made a missing noreturn an error | Tycho | 2014-03-14 | 4 | -5/+12 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added NORETURN macro | Tycho | 2014-03-14 | 1 | -0/+4 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| | | | | | | | * | | | | Patched tolua to emit range checks for enums | Tycho | 2014-03-15 | 8 | -1747/+2303 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Fixed a couple of unneeded returns in ProtoProxy | Tycho | 2014-03-14 | 1 | -4/+0 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-14 | 4 | -11/+3 |
| | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
* | | | | | | | | | | | | Merge pull request #805 from worktycho/undef | Mattes D | 2014-03-14 | 4 | -11/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a couple of missing defs | ||||
| * | | | | | | | | | | | | Fixed a couple of missing defs | Tycho | 2014-03-14 | 4 | -11/+3 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #798 from worktycho/warnings | worktycho | 2014-03-14 | 45 | -202/+224 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | Fixed Format string warnings | ||||
| | | | | | | | | * | | | | Made unreachable code an error | Tycho | 2014-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Fixed a few unneeded breaks | Tycho | 2014-03-14 | 3 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Removed missiterperatable malfunctioning error handling code | Tycho | 2014-03-14 | 1 | -2/+0 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Removed invalid block face handling code | Tycho | 2014-03-14 | 1 | -1/+0 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for handling invalid block faces is removed by gcc and clang as it is undefined behavior for a enum to contain a value that is not part of the enum. Since the only way that the line can be executed is through undefined behavior clang and gcc remove it so the function fits in the caches better. | ||||
| * | | | | | | | | | | | Merge branch 'master' into warnings | Tycho | 2014-03-14 | 2 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | |||||
* | | | | | | | | | | | cPlugin:BindConsoleCommand can be called statically. | madmaxoft | 2014-03-14 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been documented before it was written. | ||||
* | | | | | | | | | | | Fixed a warning. | madmaxoft | 2014-03-14 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed xofts issues | Tycho | 2014-03-14 | 10 | -23/+24 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into warnings | Tycho | 2014-03-14 | 3 | -15/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #793 from xdot/master | Mattes D | 2014-03-14 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Unified Vector classes | ||||
| * | | | | | | | | | | | Vector3: More casts | andrew | 2014-03-12 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | cPluginManager:Bind[Console]Command returns true on success. | madmaxoft | 2014-03-14 | 2 | -6/+8 |
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #801. | ||||
| | * | | | | | | | | | Fixed comma | Tycho | 2014-03-12 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 13 | -29/+33 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 46 | -657/+675 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Globals.h | ||||
| | | * | | | | | | | | | Fixed printf format compatabilty | Tycho | 2014-03-12 | 2 | -5/+9 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 45 | -649/+663 |
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
* | | | | | | | | | | | | Fixed missing comment terminator. | madmaxoft | 2014-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-12 | 2 | -2/+2 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | M_PI MSVC Fix | andrew | 2014-03-12 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-12 | 35 | -632/+546 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Vector3: Length() should always return a float | andrew | 2014-03-12 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Matrix4: Removed enum | andrew | 2014-03-11 | 2 | -22/+24 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Unified Matrix4 code | andrew | 2014-03-11 | 7 | -233/+230 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | LineCoeff Doc | andrew | 2014-03-11 | 1 | -4/+20 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Unified Vector classes | andrew | 2014-03-11 | 32 | -401/+300 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed Lua string return values. | madmaxoft | 2014-03-12 | 1 | -4/+0 |
| |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #773. | ||||
* | | | | | | | | | | | Moved Lua API registering into a separate function. | madmaxoft | 2014-03-12 | 4 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to use Lua as lite-config files as well, should we want to. | ||||
* | | | | | | | | | | | Merge remote-tracking branch 'origin/SnowBall' | madmaxoft | 2014-03-12 | 2 | -2/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | TakeDamage now has the cThrownSnowballEntity instead of the creator's object. | STRWarrior | 2014-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Snowballs now actualy hurt other entities. | STRWarrior | 2014-03-11 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3 damage for blazes and 1 for the ender dragon. Otherwise 0 | ||||
* | | | | | | | | | | | | APIDump: Removed old documentation, documented some new functions. | madmaxoft | 2014-03-11 | 2 | -6/+17 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #786 from mc-server/cBlockArea_Offset | Mattes D | 2014-03-12 | 4 | -1/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | Added WE Offset to cBlockArea | ||||
| * | | | | | | | | | | | APIDump: Updated WEOffset-related docs. | madmaxoft | 2014-03-12 | 1 | -7/+7 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Renamed cBlockArea Offset to WEOffset. | madmaxoft | 2014-03-12 | 3 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in getters / setters. | ||||
| * | | | | | | | | | | | Merge branch 'master' into cBlockArea_Offset | madmaxoft | 2014-03-12 | 83 | -505/+2609 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed APIDump | STRWarrior | 2014-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Documented the functions. | STRWarrior | 2014-03-11 | 1 | -0/+6 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Renamed m_Offset to m_WEOffset | STRWarrior | 2014-03-11 | 3 | -8/+9 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Using ```const Vector3i &``` | STRWarrior | 2014-03-11 | 2 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | This allows a blockarea to have an Offset. | STRWarrior | 2014-03-10 | 3 | -0/+47 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed comments an assert | Tycho | 2014-03-12 | 2 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added macros support to tools | Tycho | 2014-03-11 | 2 | -2/+10 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | made format-nonliteral an error | Tycho | 2014-03-11 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed more Format issues | Tycho | 2014-03-11 | 6 | -17/+17 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 13 | -27/+29 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Move Format issues | Tycho | 2014-03-11 | 3 | -4/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed format errors in protocol | Tycho | 2014-03-11 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added macros to follow format string checking through wrappers | Tycho | 2014-03-11 | 3 | -4/+8 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Rollback submodule change | Tycho | 2014-03-11 | 1 | -0/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed Chunkdef warnings | Tycho | 2014-03-11 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Move comment | Tycho | 2014-03-11 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed Warnings in PieceGenerator | Tycho | 2014-03-11 | 2 | -9/+9 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-11 | 11 | -36/+1364 |
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkDef.h | ||||
* | | | | | | | | | | Merge pull request #791 from mc-server/PieceGenerator | Mattes D | 2014-03-10 | 11 | -30/+1358 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Piece generator | ||||
| * | | | | | | | | | | Removed debugging output. | madmaxoft | 2014-03-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kept it commented-out for later revisions, if needed. | ||||
| * | | | | | | | | | | POCPieces: Added height. | madmaxoft | 2014-03-10 | 1 | -17/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the pieces connect in different heights, too, creating a true 3D maze. | ||||
| * | | | | | | | | | | A working POCPiece generator. | madmaxoft | 2014-03-09 | 5 | -6/+359 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Hardened cCuboid with asserts for its assumptions. | madmaxoft | 2014-03-09 | 2 | -3/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | ChunkDef: Replaced enums with static const ints. | madmaxoft | 2014-03-09 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them easier to use in std::min et al. | ||||
| * | | | | | | | | | | Added cCuboid::Engulf(). | madmaxoft | 2014-03-09 | 2 | -0/+37 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | cPieceGenerator: New connectors are added to the free pool. | madmaxoft | 2014-03-09 | 2 | -9/+30 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into PieceGenerator | madmaxoft | 2014-03-09 | 1 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into PieceGenerator | madmaxoft | 2014-03-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | PieceGenerator can connect two connectors of the same type. | madmaxoft | 2014-03-09 | 2 | -60/+338 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added extensive debugging output and a test. | ||||
| * | | | | | | | | | | | | Added BlockFaceToString() translation function. | madmaxoft | 2014-03-09 | 1 | -0/+20 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added Vector3i::Move(). | madmaxoft | 2014-03-09 | 2 | -17/+82 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added the first skeleton code for PieceGenerator. | madmaxoft | 2014-03-09 | 2 | -0/+545 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a WIP and won't work / isn't used at all. | ||||
| | | | | * | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 3 | -3/+18 |
| | | | | |\ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #767 from worktycho/envmatrix | Mattes D | 2014-03-10 | 3 | -3/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support to control build type with env vars | ||||
| * | | | | | | | | | | | | Prepended Travis to env vars | Tycho | 2014-03-10 | 2 | -9/+11 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Move env code part 2 | worktycho | 2014-03-07 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only just noticed I committed this on the wrong branch. | ||||
| * | | | | | | | | | | | | Fixed wrong path in debug mode | worktycho | 2014-03-07 | 1 | -5/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Move env code part 1 | worktycho | 2014-03-07 | 1 | -10/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added travis support for multiple build types | Tycho | 2014-03-07 | 1 | -1/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added support to overide CMake build type with env vars | Tycho | 2014-03-07 | 1 | -0/+8 |
| | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkDef.h | ||||
* | | | | | | | | | | | | | Revert "Fixed some warnings" | madmaxoft | 2014-03-10 | 1 | -10/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cb0b82d1df560ad32c92eede91f466c75a87c87. | ||||
| | | | | | * | | | | | | | Fixed xofts issues | Tycho | 2014-03-10 | 5 | -21/+15 |
| | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | Fixed test asserts | Tycho | 2014-03-10 | 4 | -37/+37 |
| | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | Fixed assert | Tycho | 2014-03-10 | 1 | -14/+17 |
| | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | Fixed Issues in ProtoProxy | Tycho | 2014-03-10 | 2 | -9/+9 |
| | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 1 | -7/+19 |
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #779 from mc-server/tntburnexplode | Alexander Harkness | 2014-03-10 | 1 | -7/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | TNT explodes when consumed by fire | ||||
| * | | | | | | | | | | | | Fixed compile | Tiger Wang | 2014-03-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed uneeded meta obtain | Tiger Wang | 2014-03-09 | 1 | -3/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | TNT explodes when consumed by fire | Tiger Wang | 2014-03-09 | 1 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed FS#406 | ||||
* | | | | | | | | | | | | | Merge pull request #788 from worktycho/warnings | Alexander Harkness | 2014-03-10 | 1 | -7/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some warnings | ||||
| | | | | | | | * | | | | | | Enable error on cast-align and unused macros | Tycho | 2014-03-10 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Fixed Alignment issue in ByteBuffer | Tycho | 2014-03-10 | 3 | -7/+4 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Removed Some unnessicary macros | Tycho | 2014-03-10 | 3 | -21/+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 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Removed unused macro | Tycho | 2014-03-10 | 1 | -13/+0 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Fixed cast to type with different alignment in BlockingTCPLink | Tycho | 2014-03-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Fixed cast between types of different alignment in cSocket | Tycho | 2014-03-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Fixed MTRand warnings | Tycho | 2014-03-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 31 | -206/+792 |
| | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fixed MSVC2008 compilation. | madmaxoft | 2014-03-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 13 | -31/+92 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | Add TNT load/save | ||||
| * | | | | | | | | | | | | | Change tnt documentation to ticks | Howaner | 2014-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 26 | -67/+682 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 9 | -21/+20 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add new tnt documentation | Howaner | 2014-03-08 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add TNT Save/Load and add Netbeans projects to .gitignore | Howaner | 2014-03-08 | 7 | -18/+79 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 21 | -174/+699 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ballistic firework missiles | ||||
| * | | | | | | | | | | | | | | | != FACE_NONE | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 134 | -1380/+3944 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | | | | | | | | | | | | | | Hexified colours | Tiger Wang | 2014-03-09 | 1 | -16/+16 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed data length issues | Tiger Wang | 2014-03-09 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Demonstrated issues with GetDataLength() | Tiger Wang | 2014-03-09 | 2 | -5/+11 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Added extra dye rules to crafting.txt | Tiger Wang | 2014-03-09 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Improved formatting of username tabcomplete | Tiger Wang | 2014-03-09 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Moved firework handler to separate function | Tiger Wang | 2014-03-09 | 2 | -48/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also simplified and improved readability of code | ||||
| * | | | | | | | | | | | | | | | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 4 | -65/+23 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fix Linux compile | Tiger Wang | 2014-03-09 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Removed unneeded includes in Player.cpp | Tiger Wang | 2014-02-27 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed compile | Tiger Wang | 2014-02-27 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed sheep ASSERTing sometimes | Tiger Wang | 2014-02-27 | 1 | -8/+18 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 15 | -87/+637 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | | | | | | | | | | | | | | Mentiod that we use some c++11 exstensions | worktycho | 2014-03-09 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eg override, abstract, va_copy, long long. | ||||
| | | | | | | | | | | | * | | | | Be more parinoid about int sizes | Tycho | 2014-03-09 | 3 | -5/+18 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | * | | | | Fixed Mesannine twister to use UInt32 | Tycho | 2014-03-09 | 5 | -4/+6 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | * | | | | Merge branch 'master' into Werror | Tycho | 2014-03-09 | 22 | -184/+302 |
| | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Fixed #778 - stack overflow.com | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Silenced useless MSVC warnings in cMetaRotater. | madmaxoft | 2014-03-09 | 1 | -0/+21 |
| |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Hotfix for MSVC compilation. | madmaxoft | 2014-03-09 | 1 | -0/+1 |
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 5 | -32/+62 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions | ||||
| * | | | | | | | | | | | | | Adjusted style of switch/case | Jan-Fabian Humann | 2014-03-09 | 3 | -45/+15 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Changed if-else to switch-case | Jan-Fabian Humann | 2014-03-08 | 3 | -39/+33 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 5 | -32/+98 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #775 from worktycho/warnings | Mattes D | 2014-03-09 | 25 | -75/+120 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | Fixed a few warnings | ||||
* | | | | | | | | | | | | | Updated Core | Tiger Wang | 2014-03-09 | 1 | -0/+0 |
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Slight plugin messaging changes | Tiger Wang | 2014-03-09 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clients are not allowed to register duplicate channels - Clients are not allowed to use channels that were not registered | ||||
* | | | | | | | | | | | | Added switch case indent notice | Mattes D | 2014-03-08 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #729 from worktycho/MetaRotate | Mattes D | 2014-03-08 | 13 | -151/+202 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Alternitive solution to #503 | ||||
| * | | | | | | | | | | | Moved returns | worktycho | 2014-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Reformatted | Tycho | 2014-03-02 | 10 | -20/+20 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Reformated MetaRotater | Tycho | 2014-03-02 | 1 | -19/+30 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Reverted BlockVine | worktycho | 2014-03-02 | 1 | -3/+27 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed errors | Tycho | 2014-03-01 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Revesed typedef | Tycho | 2014-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Implemented Rotations | Tycho | 2014-03-01 | 11 | -170/+28 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into MetaRotate | Tycho | 2014-03-01 | 32 | -172/+595 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Final implementation of MetaRotater | Tycho | 2014-03-01 | 1 | -45/+51 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added some Metadate rotaters using templated Mixin | Tycho | 2014-02-27 | 10 | -16/+168 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Fix IsThread destructor | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Only enable -Werror in gcc because gcc doesn't let you suppress enum missmatch warnings | Tycho | 2014-03-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Treat enum missmatches as warnings for now as there is such a large number of them. | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Globals.h is now warnings free again. | Tycho | 2014-03-09 | 3 | -11/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also turned off Wpadded as it is indicates potental performance issues rather than potential bugs | ||||
| | | | | | | | | * | | | | 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 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Lots more warnings | Tycho | 2014-03-09 | 1 | -0/+9 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | Merge branch 'warnings' into Werror | Tycho | 2014-03-09 | 1 | -7/+10 |
| | | | | | | | | |\ \ \ \ | | | | | | | | |_|/ / / / | | | | | | | |/| | | | | | |||||
| | | | | | | * | | | | | | Fixed some warnings | Tycho | 2014-03-09 | 1 | -7/+10 |
| | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | | | | | | | * | | | | Enabled loads of clang warnings | Tycho | 2014-03-09 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Merge branch 'warnings' into Werror | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | FIxed int in test | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Merge branch 'warnings' into Werror | Tycho | 2014-03-09 | 10 | -37/+45 |
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Added static | Tycho | 2014-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Added tons more asserts to bytebuffer | Tycho | 2014-03-08 | 1 | -7/+17 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Enabled self test of bytebuffer | Tycho | 2014-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 10 | -28/+26 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Turned off Wunused-parameter | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Merge branch 'warnings' into Werror | Tycho | 2014-03-08 | 1 | -3/+3 |
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Actually Fixed ByteBuffer | Tycho | 2014-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Merge branch 'warnings' into Werror | Tycho | 2014-03-08 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| | | * | | | | | | | | | Disable -Werror on this branch | worktycho | 2014-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | | | | | * | | | | Merge branch 'warnings' into Werror | Tycho | 2014-03-08 | 10 | -25/+108 |
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into warnings | Tycho | 2014-03-08 | 10 | -25/+108 |
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #770 from xdot/master | Alexander Harkness | 2014-03-08 | 3 | -11/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | cBlockInfo-related changes from #723 | ||||
| * | | | | | | | | | | | cBlockInfo-related changes from #723 | andrew | 2014-03-08 | 3 | -11/+21 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #764 from xdot/master | Mattes D | 2014-03-07 | 3 | -4/+74 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed water/lava interaction | ||||
| * | | | | | | | | | | | Added some comments | andrew | 2014-03-07 | 2 | -1/+6 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed water/lava interaction | andrew | 2014-03-07 | 3 | -4/+69 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed cBlockArea schematic string saving signature. | madmaxoft | 2014-03-07 | 4 | -10/+13 |
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| | | | | | | * | | | | Turned on Werror | Tycho | 2014-03-07 | 1 | -1/+1 |
| | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | Warnings | Tycho | 2014-03-07 | 2 | -1/+3 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Warnings | Tycho | 2014-03-07 | 11 | -29/+42 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Fixed warnings | Tycho | 2014-03-07 | 2 | -3/+21 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Fixed warnings | Tycho | 2014-03-07 | 4 | -2/+6 |
| |_|_|/ / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #765 from worktycho/fastmath | Mattes D | 2014-03-07 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enabled -ffast-math | ||||
| * | | | | | | | | | Fixed clang compile | worktycho | 2014-03-07 | 1 | -1/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Only use fast-math in exes | worktycho | 2014-03-07 | 1 | -6/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Enabled -ffast-math | worktycho | 2014-03-07 | 1 | -1/+6 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 22 | -101/+435 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | Add Flower Pots | ||||
| * | | | | | | | | Link cItem in the documentation | Howaner | 2014-03-07 | 2 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Add missing documentation files | Howaner | 2014-03-07 | 2 | -0/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 10 | -14/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | Add Flower Pots | Howaner | 2014-03-07 | 17 | -87/+401 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed a typo. | madmaxoft | 2014-03-07 | 1 | -4/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #760 from Howaner/GlobalFixes | Mattes D | 2014-03-07 | 13 | -6/+116 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Add data backsending, when the Client interacts a Block and the Interact... | ||||
| * | | | | | | | | Fix comment | Howaner | 2014-03-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Broadcast the Equipped Item, if the Slot is changed. | Howaner | 2014-03-06 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Add SendBlockTo to cWorldInterface | Howaner | 2014-03-05 | 9 | -10/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | Set tnt step sound to step.grass | Howaner | 2014-03-05 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add data backsending, when the Client interacts a Block and the Interact is cancelled. | Howaner | 2014-03-05 | 10 | -6/+102 |
| | | | | | | | | | |||||
* | | | | | | | | | Rewound PolarSSL to master branch. | madmaxoft | 2014-03-07 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current Devel branch fails to build on RasPi. | ||||
* | | | | | | | | | Debuggers: Added a test of the cBlockArea string-serialization. | madmaxoft | 2014-03-07 | 1 | -0/+38 |
| | | | | | | | | | |||||
* | | | | | | | | | APIDump: Documented cBlockArea string-serialization functions. | madmaxoft | 2014-03-07 | 1 | -0/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Added cBlockArea serialization to string. | madmaxoft | 2014-03-07 | 3 | -38/+202 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #665. | ||||
* | | | | | | | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-06 | 6 | -17/+238 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Implemented vanilla-like fluid simulator | andrew | 2014-03-05 | 6 | -17/+238 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #747 from mc-server/InfoDump_Github | Mattes D | 2014-03-06 | 1 | -19/+12 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Info dump github | ||||
| * | | | | | | | | | The APIDump generates a list of all the permissions again. | STRWarrior | 2014-03-05 | 1 | -7/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed typo | STRWarrior | 2014-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discription => Description | ||||
| * | | | | | | | | | Simplified and more clearer infodump for Github. | STRWarrior | 2014-03-02 | 1 | -14/+7 |
| | | | | | | | | | | |||||
* | | | | | | | | | | APIDump: Documented the cCompositeChat class. | madmaxoft | 2014-03-05 | 1 | -0/+52 |
| | | | | | | | | | | |||||
* | | | | | | | | | | APIDump: Ignoring classes by exact match. | madmaxoft | 2014-03-05 | 1 | -10/+10 |
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | "cCompositeChat" was ignored because it matched "os". | ||||
* | | | | | | | | | Fixed some gcc warnings in Defines.h. | madmaxoft | 2014-03-04 | 1 | -3/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Debuggers: Added simple test for cCompositeChat. | madmaxoft | 2014-03-04 | 1 | -0/+15 |
| | | | | | | | | | |||||
* | | | | | | | | | Manually exported cCompositeChat modifiers. | madmaxoft | 2014-03-04 | 2 | -7/+268 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds chaining support to them. Fixes #755. | ||||
* | | | | | | | | | cLuaState: Made public the GetStackValue() functions. | madmaxoft | 2014-03-04 | 2 | -54/+61 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed an assert in map-loading. | madmaxoft | 2014-03-04 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maps were loaded too soon, the world wasn't initialized yet. | ||||
* | | | | | | | | | Fixed previous weather changes. | madmaxoft | 2014-03-03 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather. | ||||
* | | | | | | | | | Merge pull request #746 from Howaner/Slabs | Mattes D | 2014-03-03 | 4 | -19/+96 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | ||||
| * | | | | | | | Add cancelling to WeatherChanging event. | Howaner | 2014-03-02 | 2 | -13/+43 |
| | | | | | | | | |||||
| * | | | | | | | More documentation (thanks to madmaxoft) and use GetBlockTypeMeta | Howaner | 2014-03-02 | 2 | -6/+10 |
| | | | | | | | | |||||
| * | | | | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 4 | -6/+49 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #748 from xdot/master | Mattes D | 2014-03-02 | 11 | -73/+67 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | cBlockInfo now manages the respective cBlockHandler | ||||
| * | | | | | | | Removed if condition | andrew | 2014-03-02 | 1 | -4/+1 |
| | | | | | | | | |||||
| * | | | | | | | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 11 | -73/+70 |
|/ / / / / / / | |||||
* | | | | | | | Fixed MSVC warnings in DeprecatedBindings. | madmaxoft | 2014-03-02 | 1 | -8/+76 |
| | | | | | | | |||||
* | | | | | | | Added blockface mirroring and rotating. | madmaxoft | 2014-03-02 | 1 | -0/+50 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 41 | -503/+1045 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactored global block property arrays | ||||
| * | | | | | | | GetById => Get | andrew | 2014-03-02 | 4 | -32/+32 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: ID -> Type | andrew | 2014-03-02 | 1 | -10/+10 |
| | | | | | | | | |||||
| * | | | | | | | Removed g_BlockXXX arrays | andrew | 2014-03-02 | 4 | -440/+4 |
| | | | | | | | | |||||
| * | | | | | | | Manually exported g_Block tables | andrew | 2014-03-02 | 4 | -0/+445 |
| | | | | | | | | |||||
| * | | | | | | | Exported cBlockInfo | andrew | 2014-03-02 | 3 | -3/+41 |
| | | | | | | | | |||||
| * | | | | | | | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 33 | -73/+91 |
| | | | | | | | | |||||
| * | | | | | | | Refactored global block property arrays | andrew | 2014-03-01 | 2 | -0/+477 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #745 from tonibm19/master | Mattes D | 2014-03-02 | 2 | -10/+34 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Creeper fixes | ||||
| * | | | | | | | Creeper fixes | tonibm19 | 2014-03-02 | 2 | -10/+34 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed explosion time (1.5s, according to minecraftwiki) - Creeper explodes if right clicked with flint and steel | ||||
* | | | | | | | Merge pull request #733 from Howaner/Slabs | Mattes D | 2014-03-02 | 3 | -13/+35 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Fix Double Slabs, fix Slab Meta and add more things to burnable | ||||
| * | | | | | | Use switch in GetStepSound | Howaner | 2014-02-28 | 2 | -8/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-02-28 | 15 | -42/+171 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix Double Slabs, fix Slab Meta and add more things to burnable | Howaner | 2014-02-28 | 3 | -13/+37 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Added more documentation for FastNBT parser. | madmaxoft | 2014-03-02 | 1 | -3/+45 |
| | | | | | | | |||||
* | | | | | | | ChunkDesc warns about StructureGen's deprecation. | madmaxoft | 2014-03-01 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Unified StructureGens and FinisherGens. | madmaxoft | 2014-03-01 | 10 | -163/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now they are all Finishers. Fixes #398. | ||||
* | | | | | | | Ignoring all plugin subfolders. | madmaxoft | 2014-03-01 | 1 | -0/+1 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | Plugins developed directly with MCS have been added explicitly; other plugins are ignored. | ||||
* | | | | | | Merge pull request #735 from xdot/master | Mattes D | 2014-03-01 | 7 | -107/+292 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Exported and documented cScoreboard | ||||
| * | | | | | | APIDump: Fixed cScoreboard enums | andrew | 2014-03-01 | 1 | -17/+17 |
| | | | | | | | |||||
| * | | | | | | Exported cScoreboard::ForEachTeam | andrew | 2014-03-01 | 4 | -1/+35 |
| | | | | | | | |||||
| * | | | | | | Shortened enums | andrew | 2014-03-01 | 4 | -58/+58 |
| | | | | | | | |||||
| * | | | | | | Exported cScoreboard::ForEachObjective | andrew | 2014-03-01 | 4 | -4/+44 |
| | | | | | | | |||||
| * | | | | | | Exported and documented cScoreboard | andrew | 2014-03-01 | 5 | -49/+160 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #737 from mc-server/InfoDump_SourceLocation | Mattes D | 2014-03-01 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Small update for InfoDump | ||||
| * | | | | | | Using comma instead of string concatenation. | STRWarrior | 2014-03-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | If there is a SourceLocation available the InfoDump will note it in the forum version. | STRWarrior | 2014-03-01 | 1 | -1/+4 |
| | | | | | | | |||||
* | | | | | | | DoxyFile: Updated after all the folder renaming. | madmaxoft | 2014-03-01 | 1 | -3/+1 |
|/ / / / / / | |||||
* / / / / / | APIDump: Documented cRoot:CreateAndInitializeWorld. | STRWarrior | 2014-03-01 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Forgotten changes to cChunkInterface. | madmaxoft | 2014-03-01 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Removed cBlockHandler forward declaration from cChunkInterface. | madmaxoft | 2014-03-01 | 1 | -9/+22 |
| | | | | | | | | | | | | | | | | | | | | Wasn't needed. Also reformatted the code. | ||||
* | | | | | Improved comments in float size check. | madmaxoft | 2014-03-01 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Fixed multiple gcc warnings about unused params. | madmaxoft | 2014-02-28 | 7 | -5/+78 |
| | | | | | |||||
* | | | | | Documented the changes in cJukeboxEntity. | madmaxoft | 2014-02-28 | 2 | -4/+7 |
| | | | | | |||||
* | | | | | Moved common cGroupManager code to a separate function. | madmaxoft | 2014-02-28 | 3 | -12/+30 |
| |/ / / |/| | | | | | | | | | | | This fixes my concerns in PR #709. | ||||
* | | | | Merge pull request #709 from Howaner/GlobalFixes | Mattes D | 2014-02-28 | 8 | -24/+112 |
|\ \ \ \ | | | | | | | | | | | Add 'Group not found', when the Server load the users.ini and add auto g... | ||||
| * | | | | Better Jukebox API | Howaner | 2014-02-21 | 3 | -16/+52 |
| | | | | | |||||
| * | | | | Remove users.ini generation in Player.cpp and use the CheckUsers() Function | Howaner | 2014-02-21 | 1 | -6/+1 |
| | | | | | |||||
| * | | | | Remove old Output Finish | Howaner | 2014-02-21 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Unicode :-( | Howaner | 2014-02-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini | Howaner | 2014-02-21 | 5 | -2/+61 |
| | | | | | |||||
* | | | | | Added a MobDebug enabler script. | madmaxoft | 2014-02-28 | 1 | -0/+29 |
| | | | | | | | | | | | | | | | | | | | | This file is to be copied to a plugin's folder in order to debug that plugin with MobDebug. | ||||
* | | | | | Better fix for the 32-bit float reading. | madmaxoft | 2014-02-28 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Fixed compatibility with ZeroBraneStudio and LuaRocks. | madmaxoft | 2014-02-28 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Lua now compiles into lua51.dll and there's a lua5.1.dll that acts as a export-forwarding proxy to lua51.dll. | ||||
* | | | | | Merge pull request #730 from tonibm19/master | Alexander Harkness | 2014-02-27 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | added mooshroom to cow conversion | ||||
| * | | | | | added mooshroom to cow conversion | tonibm19 | 2014-02-27 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Added a "nooutbuf" cmdline param. | madmaxoft | 2014-02-27 | 2 | -13/+18 |
| |_|/ / / |/| | | | | | | | | | | | | | | This forces that the stdout stream uses no buffer, even when not a TTY. Used for running MCServer under ZeroBraneStudio. | ||||
* | | | | | Fixed crash and some warnings in map handling. | madmaxoft | 2014-02-27 | 2 | -3/+5 |
| |_|/ / |/| | | | | | | | | | | | Fixes #728. | ||||
* | | | | Fixed a gcc warning in FastNBT.h. | madmaxoft | 2014-02-26 | 1 | -2/+11 |
| | | | | |||||
* | | | | Attempted fix for several GCC warnings. | madmaxoft | 2014-02-26 | 3 | -3/+15 |
|/ / / | |||||
* | | | APIDump: Added Geometry file to project. | madmaxoft | 2014-02-26 | 1 | -0/+3 |
| | | | |||||
* | | | APIDump: Documented new cCuboid functions. | madmaxoft | 2014-02-26 | 1 | -1/+6 |
| | | | |||||
* | | | APIDump: Separated out Geometry-related classes to their own file. | madmaxoft | 2014-02-26 | 2 | -301/+320 |
| | | | |||||
* | | | Added more utility functions to cCuboid. | madmaxoft | 2014-02-26 | 2 | -4/+105 |
| | | | | | | | | | | | | GetVolume(), Expand(), ClampX(), ClampY(), ClampZ() | ||||
* | | | InfoReg: Subcommand aliases are handled properly. | madmaxoft | 2014-02-25 | 1 | -1/+15 |
| | | | |||||
* | | | Added useful parameter overloads to cBlockArea Lua API. | madmaxoft | 2014-02-24 | 3 | -6/+164 |
| | | | |||||
* | | | Fixed tolua export for Byte. | madmaxoft | 2014-02-24 | 1 | -0/+7 |
| | | | | | | | | | | | | No longer treated as an unknown class. | ||||
* | | | Fixed compilation in MSVC (forward class definitions). | madmaxoft | 2014-02-24 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #724 from worktycho/warningfixes | Mattes D | 2014-02-24 | 6 | -3/+11 |
|\ \ \ | | | | | | | | | BlockEntities is warnings free | ||||
| * | | | BlockEntities is warnings free | Tycho | 2014-02-24 | 6 | -3/+11 |
|/ / / | |||||
* | | | Merge pull request #710 from TheJumper/master | Mattes D | 2014-02-24 | 28 | -39/+517 |
|\ \ \ | | | | | | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops | ||||
| * | | | Fixed Formatting, added compiler warning suppressing methods, fixed comments | TheJumper | 2014-02-24 | 5 | -3/+6 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' | TheJumper | 2014-02-23 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of http://github.com/TheJumper/MCServer | TheJumper | 2014-02-23 | 0 | -0/+0 |
| | |\ \ \ | |||||
| | | * | | | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 4 | -10/+17 |
| | | | | | | |||||
| | | * | | | Fixed Compiling Issues | TheJumper | 2014-02-23 | 3 | -10/+31 |
| | | | | | | |||||
| | | * | | | Fixed Formatting, Added DropChance attributes to Monsters | TheJumper | 2014-02-23 | 10 | -35/+248 |
| | | | | | | |||||
| | | * | | | Finally corrected the Enchantment constants. | TheJumper | 2014-02-23 | 18 | -50/+17 |
| | | | | | | |||||
| | | * | | | Changed formatting again | TheJumper | 2014-02-22 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Changed formatting, encapsuled armor drop, introduced better static Enchantment IDs | TheJumper | 2014-02-22 | 10 | -56/+80 |
| | | | | | | |||||
| | | * | | | Fixed Looting segment fault - a_Killer can be NULL | TheJumper | 2014-02-22 | 17 | -19/+83 |
| | | | | | | |||||
| | | * | | | Mooshroom.cpp: Added right click interaction | TheJumper | 2014-02-22 | 2 | -1/+38 |
| | | | | | | |||||
| | | * | | | Monster.h: Added doxy-comments for drop methods | TheJumper | 2014-02-22 | 1 | -0/+3 |
| | | | | | | |||||
| | | * | | | Monster.cpp: Fixed Formatting in AddRandomUncommonDropItem | TheJumper | 2014-02-22 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Changed killer detection by using cEntity methods | TheJumper | 2014-02-22 | 3 | -3/+3 |
| | | | | | | |||||
| | * | | | | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 25 | -81/+417 |
| | |/ / / | |||||
| | * | | | Added static Enchantment Constants, Replaced cryptic Looting ID | TheJumper | 2014-02-22 | 18 | -17/+49 |
| | | | | | |||||
| | * | | | Fixed Mob Drops, Add Rare and Uncommon Drops, Looting inflicts Drops | TheJumper | 2014-02-21 | 23 | -37/+144 |
| | | | | | |||||
| * | | | | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 29 | -40/+515 |
| | | | | | |||||
| * | | | | BlockBed.cpp: Fixed Multiple people in one bed. | TheJumper | 2014-02-23 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed. | ||||
| * | | | | APIDump: Fixed cBlockArea:GetRelBlockType() return types. | madmaxoft | 2014-02-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta(). | madmaxoft | 2014-02-23 | 2 | -29/+110 |
| | | | | | | | | | | | | | | | | | | | | They no longer require the ghost output params. | ||||
| * | | | | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-23 | 23 | -256/+254 |
| | | | | | |||||
| * | | | | Add break to Protocol17x.cpp and use new comment delimiter | Howaner | 2014-02-23 | 2 | -7/+8 |
| | | | | | |||||
| * | | | | Add Heads completely | Howaner | 2014-02-23 | 14 | -7/+154 |
| | | | | | |||||
| * | | | | Add Skulls/Heads | Howaner | 2014-02-23 | 13 | -5/+354 |
| | | | | | |||||
* | | | | | Merge pull request #722 from mc-server/CompileFix_C++03 | Mattes D | 2014-02-24 | 3 | -12/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed MCServer not compiling with C++03 compilers | ||||
| * | | | | | Fixed MCServer not compiling with C++03 compilers | STRWarrior | 2014-02-24 | 3 | -12/+12 |
|/ / / / / | |||||
* | | | | | Small improvements to boats. | STRWarrior | 2014-02-24 | 1 | -3/+7 |
| | | | | | |||||
* | | | | | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 30 | -12/+1936 |
|\ \ \ \ \ | | | | | | | | | | | | | Implementation of in-game maps :D | ||||
| * | | | | | Maps: Improvements | andrew | 2014-02-23 | 8 | -15/+28 |
| | | | | | | |||||
| * | | | | | Manually exported DoWithMap | andrew | 2014-02-23 | 5 | -3/+12 |
| | | | | | | |||||
| * | | | | | Documented and exported cMapManager | andrew | 2014-02-23 | 3 | -3/+20 |
| | | | | | | |||||
| * | | | | | Documented and exported cMap | andrew | 2014-02-22 | 4 | -9/+102 |
| | | | | | | |||||
| * | | | | | Semi-working implementation of cMap::UpdatePixel | andrew | 2014-02-22 | 2 | -11/+95 |
| | | | | | | |||||
| * | | | | | Split cMap::UpdateClient | andrew | 2014-02-21 | 2 | -73/+114 |
| | | | | | | |||||
| * | | | | | Thread safe cMap manager | andrew | 2014-02-20 | 7 | -17/+275 |
| | | | | | | |||||
| * | | | | | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 106 | -684/+4203 |
| |\ \ \ \ \ | |||||
| * | | | | | | cMapDecorator: Implemented random rotations | andrew | 2014-02-19 | 2 | -13/+18 |
| | | | | | | | |||||
| * | | | | | | Documented cMap | andrew | 2014-02-19 | 3 | -7/+31 |
| | | | | | | | |||||
| * | | | | | | Map decorators; Map clients | andrew | 2014-02-18 | 12 | -45/+351 |
| | | | | | | | |||||
| * | | | | | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 13 | -29/+195 |
| | | | | | | | |||||
| * | | | | | | cMap::UpdateRadius | andrew | 2014-02-15 | 4 | -16/+121 |
| | | | | | | | |||||
| * | | | | | | EmptyMap item handler | andrew | 2014-02-14 | 4 | -5/+53 |
| | | | | | | | |||||
| * | | | | | | Send map when selected | andrew | 2014-02-14 | 7 | -27/+114 |
| | | | | | | | |||||
| * | | | | | | IDCount Serialization | andrew | 2014-02-13 | 7 | -3/+191 |
| | | | | | | | |||||
| * | | | | | | Implementation of in-game maps | andrew | 2014-02-13 | 13 | -0/+596 |
| | | | | | | | |||||
* | | | | | | | Removed an unused member variable from cChunk. | madmaxoft | 2014-02-24 | 2 | -8/+0 |
| | | | | | | | |||||
* | | | | | | | Fixed crash in cBlockArea rotation. | madmaxoft | 2014-02-24 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #720. | ||||
* | | | | | | | Fixed a possible crash in cWorld::WakeUpSimulatorsInArea(). | madmaxoft | 2014-02-24 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Y coords weren't checked. | ||||
* | | | | | | | Merge pull request #716 from Howaner/BreakFix | Mattes D | 2014-02-23 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | No Sword Block Destroying in Creative Mode | ||||
| * | | | | | | | Use the ItemCategorie::IsSword() Method. | Howaner | 2014-02-23 | 2 | -20/+1 |
| | | | | | | | | |||||
| * | | | | | | | No Sword Block Destroying in Creative Mode | Howaner | 2014-02-23 | 2 | -0/+29 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #717 from worktycho/warningfixes | Mattes D | 2014-02-23 | 3 | -2/+11 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | fixed globals.h warnings | ||||
| * | | | | | | | Undid changing core | Tycho | 2014-02-23 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | fixed globals.h warnings | Tycho | 2014-02-23 | 4 | -2/+11 |
|/ / / / / / / | |||||
* | | | | | | | Updated CONTRIBUTING file with formatting and essential rules. | Mattes D | 2014-02-23 | 1 | -17/+21 |
| | | | | | | | |||||
* | | | | | | | Documented cBlockArea:GetOrigin(), :GetSize() and :GetVolume(). | madmaxoft | 2014-02-23 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Added cBlockArea::GetVolume, exported to Lua API. | madmaxoft | 2014-02-23 | 1 | -27/+30 |
| | | | | | | | |||||
* | | | | | | | Added cBlockArea:GetSize() and :GetOrigin() to Lua API. | madmaxoft | 2014-02-23 | 1 | -0/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | These don't have a direct C++ equivalent, but are rather useful for the plugins. | ||||
* | | | | | | | APIDump: Documented cClientHandle:HasPluginChannel. | madmaxoft | 2014-02-20 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | cClientHandle manages the client-registered plugin channels. | madmaxoft | 2014-02-20 | 2 | -36/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #706. | ||||
* | | | | | | | Removed problematic utf8. | madmaxoft | 2014-02-20 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #704 from Howaner/GlobalFixes | Mattes D | 2014-02-20 | 6 | -29/+81 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Global fixes | ||||
| * | | | | | | Bad UTF-8 o.O | Howaner | 2014-02-20 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Remove typeinfo import in IncrementalRedstoneSimulator | Howaner | 2014-02-20 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Fix Cauldron | Howaner | 2014-02-20 | 1 | -8/+11 |
| | | | | | | | |||||
| * | | | | | | Add Wolf Heal with Food | Howaner | 2014-02-20 | 1 | -10/+34 |
| | | | | | | | |||||
| * | | | | | | Add Pressure Plate Sound | Howaner | 2014-02-20 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Add Light weighted pressure plates | Howaner | 2014-02-20 | 3 | -10/+24 |
| | | | | | | | |||||
| * | | | | | | Add Hay Bale to Burnable | Howaner | 2014-02-20 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add 'Meta < 3' to Cauldron | Howaner | 2014-02-20 | 1 | -5/+8 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #702 from TheJumper/master | Mattes D | 2014-02-20 | 1 | -7/+18 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | BlockBed.cpp: Fixed Multiple people in one bed. | ||||
| * | | | | | | BlockBed.cpp: Fixed space at if statement | TheJumper | 2014-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Added a space after an if statement and before the first bracket to keep up code conventions. | ||||
| * | | | | | | BlockBed.cpp: Fixed Multiple people in one bed. | TheJumper | 2014-02-20 | 1 | -7/+18 |
| | |_|/ / / | |/| | | | | | | | | | | OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed. | ||||
* | | | | | | Disabled the leak finder. | madmaxoft | 2014-02-20 | 2 | -2/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #700 from Howaner/GlobalFixes | Mattes D | 2014-02-20 | 7 | -8/+84 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add new Trees (without Generator) | ||||
| * | | | | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 5 | -15/+57 |
| | | | | | |||||
| * | | | | Add new Trees (without Generator) | Howaner | 2014-02-19 | 6 | -0/+34 |
| | |/ / | |/| | | |||||
* | | | | APIDump: Fixed cBlockArea:GetRelBlockType() return types. | madmaxoft | 2014-02-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta(). | madmaxoft | 2014-02-20 | 2 | -29/+110 |
| | | | | | | | | | | | | | | | | They no longer require the ghost output params. | ||||
* | | | | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 21 | -6/+501 |
|\ \ \ \ | |/ / / |/| | | | Add Skulls/Heads to MCServer | ||||
| * | | | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 23 | -256/+254 |
| | | | | |||||
| * | | | Add break to Protocol17x.cpp and use new comment delimiter | Howaner | 2014-02-19 | 2 | -7/+8 |
| | | | | |||||
| * | | | Add Heads completely | Howaner | 2014-02-18 | 14 | -7/+154 |
| | | | | |||||
| * | | | Add Skulls/Heads | Howaner | 2014-02-17 | 13 | -5/+354 |
| | | | | |||||
* | | | | Merge pull request #694 from mc-server/itemframes | Mattes D | 2014-02-18 | 7 | -2/+237 |
|\ \ \ \ | | | | | | | | | | | Implemented item frames, a part of #689 | ||||
| * \ \ \ | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 30 | -13/+502 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
* | | | | | Merge pull request #696 from mc-server/paintings | Mattes D | 2014-02-18 | 18 | -3/+249 |
|\ \ \ \ \ | | | | | | | | | | | | | Implemented paintings, fixes #689 | ||||
| * | | | | | Properly exported and documented paintings | Tiger Wang | 2014-02-18 | 4 | -2/+22 |
| | | | | | | |||||
| * | | | | | Comments & new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+10 |
| | | | | | | |||||
| * | | | | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 15 | -3/+226 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Implemented paintings | ||||
* | | | | | | ProtoProxy: ignoring PolarSSL build files. | madmaxoft | 2014-02-18 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | APIDump: Documented missing cWorld functions. | madmaxoft | 2014-02-18 | 1 | -0/+8 |
| | | | | | | |||||
* | | | | | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting. | madmaxoft | 2014-02-18 | 2 | -2/+7 |
| | | | | | | |||||
* | | | | | | Debuggers: Added a test for the cWorld:SetAreaBiome() function. | madmaxoft | 2014-02-18 | 1 | -0/+40 |
| | | | | | | |||||
* | | | | | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 6 | -3/+164 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #675. | ||||
* | | | | | | Added a bit more documentation to cForEachChunkProvider. | madmaxoft | 2014-02-18 | 2 | -5/+33 |
| | | | | | | |||||
* | | | | | | Updated Core | Tiger Wang | 2014-02-18 | 1 | -0/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #695 from narroo/Issue673 | Mattes D | 2014-02-18 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ChunkWorx uses QueueUnloadUnusedChunks | ||||
| * | | | | | Fixed Chunkworx, Issue 673. | narroo | 2014-02-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Issue #673 Fix, Chunkworx now uses QueueUnloadUnusedChunks instead of UnloadUnusedChunks. | narroo | 2014-02-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed possible ASSERT failure | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | De-breaked stuff | Tiger Wang | 2014-02-18 | 1 | -2/+0 |
| | |/ / / / | |||||
| | * | | | | Changed BlockFace type to eBlockFace | Tiger Wang | 2014-02-18 | 3 | -26/+27 |
| | | | | | | |||||
| | * | | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes | Tiger Wang | 2014-02-18 | 1 | -7/+10 |
| | |\ \ \ \ | |||||
| | | * | | | | Added an explanatory comment | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | | | | | | | |||||
| | | * | | | | Used new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | Also added more comments | ||||
| | * | | | | | Added a brace | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==== { } { __ } { | | } ==== REMOVE ALL THE BRACES!! | ||||
| | * / / / | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 7 | -2/+233 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
* | | | | | Merge pull request #684 from narroo/Bug402 | Mattes D | 2014-02-17 | 2 | -1/+39 |
|\| | | | | | | | | | | | | | | Addressed Issue #402. | ||||
| * | | | | Fixed comment typo | narroo | 2014-02-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed Comment Typo. | narroo | 2014-02-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed the tab spacing. | narroo | 2014-02-17 | 1 | -22/+22 |
| | | | | | |||||
| * | | | | Fixed Tab spacing of cases. | narroo | 2014-02-17 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | Reworked RemoveBom to use unsigned chars and reverted the logic changes in WriteFile. Should work fine now. | narroo | 2014-02-16 | 1 | -82/+96 |
| | | | | | |||||
| * | | | | Changed unsigned char[] back to char[]. | narroo | 2014-02-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Changed char[] to unsigned char[] in cIniFile::RemoveBom | narroo | 2014-02-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Addressed Issue #402. cIniFile can now process UTF-8 files that have a | narroo | 2014-02-16 | 2 | -67/+91 |
| | | | | | | | | | | | | | | | | | | | | Byte Order Marker, BOM. | ||||
* | | | | | Added the InfoReg plugin library file. | madmaxoft | 2014-02-17 | 1 | -0/+157 |
| | | | | | | | | | | | | | | | | | | | | This file should be used by all plugins that use Info.lua to register their commands. It defines the functions that register the commands and provide handling for the subcommands. | ||||
* | | | | | Documented the cPluginManager:GetPluginsPath() API function. | madmaxoft | 2014-02-17 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Added cPluginManager:GetPluginsPath() to the Lua API. | madmaxoft | 2014-02-17 | 2 | -1/+5 |
| | | | | | |||||
* | | | | | Add Lua plugin path to package.path and .cpath. | madmaxoft | 2014-02-17 | 3 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | Fixes #693. | ||||
* | | | | | Merge pull request #690 from tonibm19/master | Alexander Harkness | 2014-02-17 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Now mobs can't escape from fences. | ||||
| * | | | | Improved formatting | tonibm19 | 2014-02-17 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Now mobs can't escape from fences. | tonibm19 | 2014-02-16 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #688 from worktycho/Flags | Alexander Harkness | 2014-02-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Added -Wextra | ||||
| * | | | | | Added -Wextra | Tycho | 2014-02-16 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #692 from mc-server/wolfcleanup | Alexander Harkness | 2014-02-17 | 1 | -30/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Wolf cleanup | ||||
| * | | | | | Fixes to previous commit | Tiger Wang | 2014-02-16 | 1 | -9/+10 |
| | | | | | | |||||
| * | | | | | Slight cleanup of wolf code | Tiger Wang | 2014-02-16 | 1 | -23/+7 |
| | | | | | | |||||
* | | | | | | Fixed a memory leak in CompositeChat. | madmaxoft | 2014-02-17 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 4 | -9/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #658. | ||||
* | | | | | | Implemented cCompositeChat::ParseText(), incl. self-test. | madmaxoft | 2014-02-16 | 2 | -1/+211 |
| | | | | | | |||||
* | | | | | | Fixed cBoundingBox self-test code-style. | madmaxoft | 2014-02-16 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also made the class name unique and the global variable static, to avoid linkage problems with other self-tests | ||||
* | | | | | | Merge pull request #683 from mc-server/redstoneimprovements | Mattes D | 2014-02-16 | 5 | -94/+167 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Redstone speed improvements | ||||
| * | | | | | | Fixed a glaring bug with chunk cross-simulating | Tiger Wang | 2014-02-16 | 1 | -9/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A chunk's redstone blocks list is no longer touched if AddBlock was being called with another chunk's coordinates * Fixed chunk boundary checks | ||||
| * | | | | | | Added a 'default:' for SimChunk()'s switch | Tiger Wang | 2014-02-15 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | A fix and an improvement | Tiger Wang | 2014-02-15 | 2 | -23/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed a special case with the wrong ChunkX/Z values being used to calculate a relative position * Simplified data structure adding and removing operations (no more pointers!) - Removed one character of whitespace :D | ||||
| * | | | | | | Fixed TNT fizzing everywhere | Tiger Wang | 2014-02-15 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Sizeable speed improvements to redstone | Tiger Wang | 2014-02-15 | 3 | -83/+127 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Moved all simulator data into individual chunks * Cleaned up parameters for functions and some code * Fixed repeaters powering off faster than they power on The main issue before was that, although the redstone simulator stored blocks to be simulated in individual cChunks, other data, such as powered lists, and etcetera, were global regardless of which chunk was being simulated. Therefore, with worlds with lots of redstone, each tick saw the ticking of chunks, which themselves iterated through the entire dataset needlessly, creating LOTS of lag. Should be better now :) | ||||
* | | | | | | Merge pull request #691 from MuhammadWang/master | worktycho | 2014-02-16 | 2 | -1/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Added files for eclipse and debug, fix a mistake | ||||
| * | | | | | Added files for eclipse and debug, fix a mistake | MuhammadWang | 2014-02-16 | 2 | -1/+5 |
|/ / / / / | | | | | | | | | | | | | | | | src/Bindings/BindingsDependecies.txt is a mistake made in 45bc1ff033271bc0c6a9e5931a00c554e065c375 | ||||
* | | | | | Merge pull request #687 from worktycho/Flags | Mattes D | 2014-02-16 | 8 | -324/+243 |
|\ \ \ \ \ | | | | | | | | | | | | | Use a common module for setting flags and allow tools to be compiled alongside MCServer | ||||
| * | | | | | Fixed comment | Tycho | 2014-02-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Build cmake built tools in travis | Tycho | 2014-02-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fogot | Tycho | 2014-02-16 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | can Now build ProtoProxy alongside MCServer | Tycho | 2014-02-16 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Now uses setflags for flags | Tycho | 2014-02-16 | 1 | -55/+4 |
| | | | | | | |||||
| * | | | | | COnverted ProtoProxy to use library CMakeLists | Tycho | 2014-02-16 | 2 | -18/+5 |
| | | | | | | |||||
| * | | | | | Allow building MCADefrag at the same time as MCServer | Tycho | 2014-02-16 | 4 | -119/+105 |
| | | | | | | |||||
| * | | | | | CHange MCADefrag CMakelist to use zlib CMakeList | Tycho | 2014-02-16 | 1 | -9/+4 |
| | | | | | | |||||
| * | | | | | rewrote MCADefrag CMakelist to use Setflags | Tycho | 2014-02-16 | 1 | -56/+16 |
| | | | | | | |||||
| * | | | | | Added a seperate module for Setting flags | Tycho | 2014-02-16 | 3 | -180/+216 |
| | | | | | | |||||
* | | | | | | Merge pull request #686 from Howaner/GlobalFixes | Mattes D | 2014-02-16 | 5 | -3/+11 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add Locale to ClientHandle | ||||
| * | | | | | Add Locale to ClientHandle | Howaner | 2014-02-16 | 5 | -3/+11 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-02-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed cmake invocation text | Mattes D | 2014-02-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | The docs say: cmake <options> <path> | ||||
* | | | | | | | Fixed minor formatting issues from #682 | Tiger Wang | 2014-02-16 | 3 | -16/+3 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code | ||||
* | | | | | | Merge pull request #685 from MuhammadWang/patch-1 | Alexander Harkness | 2014-02-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed a minor error | ||||
| * | | | | | | Fixed a minor error | Muhammad Wang | 2014-02-16 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #682 from Howaner/GlobalFixes | Alexander Harkness | 2014-02-16 | 5 | -3/+26 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | Disable Hunger Death; Add Exp Bottle Effect; Set max. Tablist Players to 60 | ||||
| * | | | | | Replace random Float Generation and broadcast the Exp Pickup Sound | Howaner | 2014-02-16 | 2 | -9/+4 |
| | | | | | | |||||
| * | | | | | Add Exp Bottle Effects | Howaner | 2014-02-16 | 4 | -1/+23 |
| | | | | | | |||||
| * | | | | | Set max. Players in the Tablist to 60 | Howaner | 2014-02-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Disable Hunger Death | Howaner | 2014-02-16 | 1 | -1/+7 |
|/ / / / / | |||||
* | | | | | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 4 | -23/+19 |
| | | | | | |||||
* | | | | | Debuggers: Added code to test cCompositeChat functionality. | madmaxoft | 2014-02-15 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | Ref.: #678 | ||||
* | | | | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 18 | -21/+671 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
* | | | | | Merge pull request #679 from mc-server/NotchDeath | Alexander Harkness | 2014-02-15 | 1 | -0/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | NotchApple | ||||
| * | | | | If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch | STRWarrior | 2014-02-15 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Updated Plugin article | Tiger Wang | 2014-02-15 | 1 | -14/+15 |
| | | | | | | | | | | | | | | | | | | | | + Adds reference to new SendMessage() functions | ||||
* | | | | | Debuggers: Added a WebAdmin StressTest page. | madmaxoft | 2014-02-15 | 1 | -13/+76 |
| | | | | | | | | | | | | | | | | | | | | This page reloads content from the WebAdmin as fast as possible. | ||||
* | | | | | Add more Sounds to Redstone Simulator | Howaner | 2014-02-15 | 1 | -1/+23 |
| | | | | | |||||
* | | | | | Add Fence Gate to Redstone Simulator | Howaner | 2014-02-15 | 2 | -0/+31 |
| | | | | | |||||
* | | | | | Merge pull request #664 from mc-server/generalfixes | Mattes D | 2014-02-15 | 19 | -46/+130 |
|\ \ \ \ \ | | | | | | | | | | | | | General fixes | ||||
| * | | | | | Fixed typographical error | Tiger Wang | 2014-02-15 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Removed debug messages again | Tiger Wang | 2014-02-15 | 1 | -6/+0 |
| | | | | | | |||||
| * | | | | | Added proper debug messages | Tiger Wang | 2014-02-13 | 1 | -3/+8 |
| | | | | | | |||||
| * | | | | | Fancy stuff with constant references | Tiger Wang | 2014-02-13 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Added more missing GetClassStatic()s | Tiger Wang | 2014-02-12 | 2 | -0/+4 |
| | | | | | | |||||
| * | | | | | Removed some unneeded BroadcastWholeWindow()s | Tiger Wang | 2014-02-12 | 4 | -23/+2 |
| | | | | | | |||||
| * | | | | | Changed inheritance a bit | Tiger Wang | 2014-02-12 | 8 | -33/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | * cBlockEntityWithItems now inherits from cBlockEntityWindowOwner | ||||
| * | | | | | Made player jump reset less ambiguous | Tiger Wang | 2014-02-12 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Simplified Attack() tracing | Tiger Wang | 2014-02-12 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | Improved pressure plates | Tiger Wang | 2014-02-12 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Two (or more) pressure plates can be triggered at the same time * Fixed issues caused by pressure plates not being in the sources list | ||||
| * | | | | | Fixed #190 | Tiger Wang | 2014-02-11 | 1 | -2/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Hoppers now collect pickups above them | ||||
| * | | | | | Fixed #627 | Tiger Wang | 2014-02-11 | 5 | -21/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P) | ||||
| * | | | | | Fixed #612 | Tiger Wang | 2014-02-11 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Chests send contents updates to client | ||||
* | | | | | | Merge pull request #677 from mc-server/BroadcastParticleEffect | Alexander Harkness | 2014-02-15 | 2 | -1/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | Broadcast particle effect | ||||
| * | | | | Documented BroadcastParticleEffect | STRWarrior | 2014-02-15 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Exported cWorld::BroadcastParticleEffect. | STRWarrior | 2014-02-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Updated Core. | madmaxoft | 2014-02-13 | 1 | -0/+0 |
| | | | | | |||||
* | | | | | Merged branch 'narroo/master'. | madmaxoft | 2014-02-13 | 5 | -2/+37 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | This merges pull request #661. | ||||
| * | | | | | Fixed formatting issue in APIDesc.lua | narroo | 2014-02-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed location of QueueUnloadUnusedChunks entry in APIDesc dump. Now is lexographically listed in cWorld, not cRoot. | narroo | 2014-02-12 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fixed formatting. Moved UnloadUnusedChunks from public to private. | narroo | 2014-02-11 | 2 | -4/+10 |
| | | | | | | |||||
| * | | | | | Alpha-Sorted List. | narroo | 2014-02-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Changed console.lua in core plugin. | narroo | 2014-02-11 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Updated APIDesc.lua to replace 'UnloadUnusedChunks' with 'QueueUnloadUnusedChunks'. | narroo | 2014-02-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed formatting of previous commit. | narroo | 2014-02-11 | 2 | -2/+7 |
| | | | | | | |||||
| * | | | | | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 3 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
| * | | | | | Typo Fix in console.lua | narroo | 2014-02-10 | 1 | -0/+0 |
| | | | | | | |||||
* | | | | | | MCADefrag: Implemented recompression. | madmaxoft | 2014-02-13 | 2 | -5/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | This finalizes #639. | ||||
* | | | | | | MCADefrag: Fixed bugs, now produces valid MCA files. | madmaxoft | 2014-02-13 | 2 | -3/+22 |
| | | | | | | |||||
* | | | | | | MCADefrag: Initial implementation. | madmaxoft | 2014-02-13 | 6 | -0/+799 |
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Partially implements #639. This only defragments the chunks, without recompressing them. | ||||
* | | | | | Updated COMPILING instructions for out-of-source build. | Mattes D | 2014-02-13 | 1 | -8/+22 |
| | | | | | | | | | | | | | | | Also made the 32-bit mode a bit more clear as to what architectures it affects. | ||||
* | | | | | Merge pull request #668 from tonibm19/patch-1 | Mattes D | 2014-02-12 | 1 | -22/+22 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Decreased mobs attack range | ||||
| * | | | | Decreased mobs attack range | tonibm19 | 2014-02-12 | 1 | -22/+22 |
|/ / / / | | | | | | | | | Mobs attack from too far and throught walls, this will reduce the bug. | ||||
* | | | | Fixed #573 | STRWarrior | 2014-02-12 | 1 | -4/+4 |
| | | | | |||||
* | | | | Updated Core. | madmaxoft | 2014-02-12 | 1 | -0/+0 |
| | | | | |||||
* | | | | cWorld:ChunkStay() accepts nils as callbacks. | madmaxoft | 2014-02-11 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | Also removed leftover debug logging. | ||||
* | | | | Added cLuaState::CheckParamFunctionOrNil(). | madmaxoft | 2014-02-11 | 2 | -2/+37 |
| |/ / |/| | | | | | | | | Also fixed error reporting for the two function-checking functions. | ||||
* | | | More gcc warnings fixed. | madmaxoft | 2014-02-11 | 2 | -4/+5 |
| | | | |||||
* | | | Made cChunkStay's destructor virtual. | madmaxoft | 2014-02-11 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed *nix attribs. | Mattes D | 2014-02-11 | 2 | -0/+0 |
| | | | |||||
* | | | Fixed gcc warnings in Item.h. | madmaxoft | 2014-02-11 | 1 | -21/+21 |
| | | | |||||
* | | | Merge pull request #662 from mc-server/ChunkStay | Mattes D | 2014-02-11 | 21 | -459/+1106 |
|\ \ \ | | | | | | | | | Allows both C++ and Lua code to request chunks to stay loaded; provides callbacks for when the chunks are made available. | ||||
| * | | | Debuggers: Updated messaging functions | madmaxoft | 2014-02-11 | 1 | -4/+9 |
| | | | | |||||
| * | | | Fixed nested plugin function calls. | madmaxoft | 2014-02-11 | 1 | -6/+9 |
| | | | | |||||
| * | | | Merge branch 'master' into ChunkStay | madmaxoft | 2014-02-11 | 4 | -25/+5 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #660 from worktycho/boatsFix | Mattes D | 2014-02-11 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | Fixed stupid mistake in conditional | ||||
| * | | | | Added additional parenthasies | worktycho | 2014-02-10 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into boatsFix | Tycho | 2014-02-10 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemBoat.h | ||||
| * | | | | | Fixed stupid mistax in conditional | worktycho | 2014-02-10 | 1 | -2/+1 |
| | |_|/ / | |/| | | | | | | | | boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one. | ||||
* | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-02-10 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #659 from tonibm19/master | Alexander Harkness | 2014-02-10 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | Maybe fixed boat placing | ||||
| | * | | | Maybe fixed boat placing | tonibm19 | 2014-02-10 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | Updated MagicCarpet and Core | Tiger Wang | 2014-02-10 | 3 | -23/+4 |
|/ / / | |||||
| * | | APIDump: Documented cWorld:ChunkStay(). | madmaxoft | 2014-02-11 | 1 | -0/+1 |
| | | | |||||
| * | | Added LuaChunkStay to Bindings sources. | madmaxoft | 2014-02-10 | 1 | -36/+47 |
| | | | | | | | | | | | | This should fix *nix compilation. Also alpha-sorted the lists. | ||||
| * | | Debuggers: Updated to reflect the new API. | madmaxoft | 2014-02-10 | 1 | -15/+9 |
| | | | |||||
| * | | Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay(). | madmaxoft | 2014-02-10 | 9 | -87/+213 |
| | | | | | | | | | | | | This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready. | ||||
| * | | cLuaState: Stack traces don't include ghost 0-th element. | madmaxoft | 2014-02-10 | 1 | -1/+1 |
| | | | |||||
| * | | Added cPluginLua::cOperation. | madmaxoft | 2014-02-10 | 1 | -1/+27 |
| | | | | | | | | | | | | This class should be used to lock-and-access the plugin's LuaState. cPluginLua::GetLuaState() is unsafe and by this commit obsolete. | ||||
| * | | Debuggers: Added a cLuaChunkStay test code. | madmaxoft | 2014-02-09 | 1 | -0/+72 |
| | | | |||||
| * | | First working version of cLuaChunkStay. | madmaxoft | 2014-02-09 | 4 | -17/+92 |
| | | | | | | | | | | | | It works, but has random failures, probably due to threading issues. | ||||
| * | | Debuggers: Disabled testing plugin calls. | madmaxoft | 2014-02-09 | 1 | -1/+1 |
| | | | |||||
| * | | Initial Lua cChunkStay export. | madmaxoft | 2014-02-09 | 4 | -1/+123 |
| | | | |||||
| * | | cLuaState::cRef can be unbound and re-bound. | madmaxoft | 2014-02-09 | 2 | -9/+60 |
| | | | | | | | | | | | | This will allow us to store Lua references as member variables in classes and initialize those later than in the constructor. | ||||
| * | | Added AllToLua.pkg to MSVC project files. | madmaxoft | 2014-02-09 | 1 | -0/+2 |
| | | | | | | | | | | | | MSVC ignores the file when compiling and it makes it easier to open it up for editing. | ||||
| * | | Added air, farmland and tilleddirt to items.ini. | madmaxoft | 2014-02-09 | 1 | -0/+3 |
| | | | | | | | | | | | | Air hasn't been present at all, the others are usual synonyms. | ||||
| * | | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 36 | -157/+374 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'master' into playerimprovements | madmaxoft | 2014-02-09 | 1 | -0/+0 |
|\ \ \ | |||||
| * | | | Updated Core | Tiger Wang | 2014-02-09 | 1 | -0/+0 |
| | | | | |||||
* | | | | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 7 | -17/+6 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 38 | -1904/+2327 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | | | Merge pull request #656 from mc-server/ReloadGroups | Mattes D | 2014-02-09 | 1 | -0/+11 |
| |\ \ \ | | | | | | | | | | | The console reload command also reloads the groups. | ||||
| | * | | | "reload" is back. | STRWarrior | 2014-02-09 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | Split "reload" in "reloadplugins" and "reloadgroups". | STRWarrior | 2014-02-09 | 1 | -2/+5 |
| | | | | | |||||
| | * | | | The console reload command also reloads the groups. | STRWarrior | 2014-02-09 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 96 | -217/+354 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
* | | | | | | Fixed a boat ASSERT | Tiger Wang | 2014-02-09 | 1 | -2/+8 |
| | | | | | | |||||
* | | | | | | Moved Gamemode setting into General root tag | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Added sender name to PM if prefixes disabled | Tiger Wang | 2014-02-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics | ||||
* | | | | | | Removed some unexported documentation. | Tiger Wang | 2014-02-07 | 1 | -11/+5 |
| | | | | | | |||||
* | | | | | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 10 | -114/+179 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | | | | | | Server internally uses new functions | Tiger Wang | 2014-02-06 | 4 | -17/+13 |
| | | | | | | |||||
* | | | | | | Added more chat functions | Tiger Wang | 2014-02-06 | 4 | -27/+46 |
| | | | | | | |||||
* | | | | | | Reduced max explosions per tick | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Updated Core & PolarSSL | Tiger Wang | 2014-02-05 | 2 | -0/+0 |
| | | | | | | |||||
* | | | | | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 3 | -32/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed bug where explosions would sometimes never be sent | ||||
* | | | | | | Fixed annoying creative on fire bug | Tiger Wang | 2014-02-05 | 2 | -0/+20 |
| | | | | | | |||||
* | | | | | | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 6 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
* | | | | | | Added more SendMessageXXX() functions | Tiger Wang | 2014-02-04 | 3 | -47/+62 |
| | | | | | | |||||
* | | | | | | Pickup constructor no longer exported | Tiger Wang | 2014-02-03 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It didn't do anything without Initialize() exported, anyway, pickups are spawned with cWorld. | ||||
* | | | | | | Added SendMessageXXX() to cPlayer | Tiger Wang | 2014-02-03 | 2 | -1/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by @bearbin, one no longer needs to download a file that links to Core. The server does it! Hopefully this encourages standards compliance. | ||||
* | | | | | | Partial fix for #130 | Tiger Wang | 2014-02-03 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Fixed #491 | Tiger Wang | 2014-02-03 | 1 | -2/+14 |
| | | | | | | |||||
* | | | | | | Fixed a crash bug | Tiger Wang | 2014-02-03 | 2 | -11/+5 |
| | | | | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-03 | 11 | -80/+219 |
|\ \ \ \ \ \ | |||||
* | | | | | | | Fixed #626 | Tiger Wang | 2014-02-03 | 3 | -13/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed consumption of carrots and potatoes | ||||
* | | | | | | | Fixed issues with farmland | Tiger Wang | 2014-02-03 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed farmland reversion checks not taking into account carrots and potatoes * Fixed #623 | ||||
* | | | | | | | Server now handles join messages also | Tiger Wang | 2014-02-03 | 5 | -27/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revised as well hook documentation | ||||
| | | | | * | | Moved a forgotten comment back to its place. | madmaxoft | 2014-02-08 | 1 | -2/+2 |
| | | | | | | | |||||
| | | | | * | | Fixed lighting thread queueing. | madmaxoft | 2014-02-08 | 1 | -2/+4 |
| | | | | | | | |||||
| | | | | * | | Fixed ChunkStay initialization. | madmaxoft | 2014-02-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | | * | | Fixed gcc compilation. | madmaxoft | 2014-02-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | | * | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 11 | -406/+560 |
| | | | |/ / | | | |/| | | |||||
| | | * | | | Merge pull request #653 from mc-server/RedstoneSimulator | Mattes D | 2014-02-08 | 8 | -1772/+1881 |
| | | |\| | | | | | | | | | | | | | | Improvements for the redstone simulator. | ||||
| | | | * | | Fixed comment. | STRWarrior | 2014-02-08 | 1 | -1/+1 |
| | | | | | | |||||
| | | | * | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). | STRWarrior | 2014-02-07 | 10 | -1826/+1822 |
| | | | | | | |||||
| | | | * | | Fixed some end of lines | STRWarrior | 2014-02-07 | 2 | -2/+2 |
| | | | | | | |||||
| | | | * | | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 6 | -9/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
| | | * | | | Fixed cWorld:TryGetHeight() API. | madmaxoft | 2014-02-08 | 1 | -1/+5 |
| | | |/ / | |||||
| | | * | | WebAdmin is stopped properly on server shutdown / restart. | madmaxoft | 2014-02-07 | 3 | -36/+55 |
| | | | | | | | | | | | | | | | | | | | | Fixes #272. | ||||
| | | * | | Fixed wiki link in auto-generated settings.ini. | madmaxoft | 2014-02-07 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | InfoDump: Added github output. | madmaxoft | 2014-02-05 | 1 | -5/+228 |
| | | | | | |||||
| | | * | | Merge pull request #648 from worktycho/runMCServer | Mattes D | 2014-02-05 | 1 | -9/+27 |
| | | |\ \ | | | | | | | | | | | | | Added BoundingBox Test | ||||
| | | | * | | Change Output to stderr | worktycho | 2014-02-05 | 1 | -4/+3 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' into runMCServer | Tycho | 2014-02-05 | 16 | -45/+96 |
| | | | |\ \ | |||||
| | | | * | | | Modified automatic test for boundingBox | Tycho | 2014-02-05 | 1 | -7/+26 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #649 from mc-server/GroupsPermissions | Mattes D | 2014-02-05 | 4 | -36/+1 |
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | Removed deprecated HasCommand function | ||||
| | | | * | | | Removed deprecated HasCommand function | STRWarrior | 2014-02-05 | 4 | -36/+1 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #645 from mc-server/GroupsPermissions | Mattes D | 2014-02-05 | 6 | -18/+69 |
| | | |\| | | | | | | | | | | | | | | | | | Improvements to the GroupManager | ||||
| | | | * | | | Forgot extra lines. | STRWarrior | 2014-02-05 | 1 | -0/+4 |
| | | | | | | | |||||
| | | | * | | | Improvements: | STRWarrior | 2014-02-05 | 6 | -22/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a function in cRoot that allows you to reload all the groups permissions. Note: Players don't automatically load their new permissions. You can use cPlayer::LoadPermissionsFromDisk for that. | ||||
| | | * | | | | Merge pull request #647 from worktycho/runMCServer | Mattes D | 2014-02-05 | 2 | -1/+5 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | Run mc server in travis | ||||
| | | | * | | | Simplified shutdown | Tycho | 2014-02-05 | 2 | -5/+1 |
| | | | | | | | |||||
| | | | * | | | Revert "Added Self Test Plugin" | Tycho | 2014-02-05 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 62c18868b2f01b5a7c2b4a4b5dc4c8ac6bc6d441. | ||||
| | | | * | | | Added support to start up MCServer and then immediatly sut it down in travis | Tycho | 2014-02-05 | 3 | -1/+9 |
| | | | | | | | |||||
| | | | * | | | Added Self Test Plugin | Tycho | 2014-02-05 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment It just shuts the server down again | ||||
| | | * | | | | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 10 | -27/+27 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | Fixed most of the reordering warnings | ||||
| | | | * | | | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 12 | -33/+33 |
| | | | | | | | |||||
| | | * | | | | Improved the signedness conversion. | madmaxoft | 2014-02-05 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Added cPluginManager:LogStackTrace() to the Lua API. | madmaxoft | 2014-02-05 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #637. | ||||
| | | * | | | | InfoDump: Git-Ignoring all generated files. | madmaxoft | 2014-02-05 | 1 | -0/+2 |
| | | | | | | | |||||
| | | * | | | | Explicitly make chars signed at the compiler-level. | madmaxoft | 2014-02-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should fix #640. | ||||
| | | * | | | | Crypto: Removed unused member, fixed gcc warning. | madmaxoft | 2014-02-04 | 2 | -6/+4 |
| | | | | | | | |||||
| | | * | | | | Added dtExplosion to damage<->string functions. | madmaxoft | 2014-02-04 | 1 | -1/+2 |
| | | | | | | | |||||
| | | * | | | | Protocol 1.7: Fixed a signed / unsigned comparison warning. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | |/ / / / | |||||
| | * | | | | Fixed a gcc warning in ManualBindings. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Constructor member order... | ||||
| | * | | | | Removed a useless check in cLuaState. | madmaxoft | 2014-02-04 | 1 | -3/+1 |
| | | | | | | |||||
| | * | | | | Fixed a warning in cItem in gcc. | madmaxoft | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Constructor member order... | ||||
| | * | | | | Protocol 1.7 uses char for blockface. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | That should fix #644 on RasPi. | ||||
| | * | | | | Merge pull request #644 from worktycho/warningfixes | Mattes D | 2014-02-04 | 77 | -178/+200 |
| | |\| | | | | | | | | | | | | | | | Improved Type safety of eBlockFace | ||||
| | | * | | | Fix gcc not having operator ++ on enums | Tycho | 2014-02-04 | 1 | -6/+7 |
| | | | | | | |||||
| | | * | | | Ensure -Wall is enabled | Tycho | 2014-02-04 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 76 | -174/+194 |
| | | | | | | | | | | | | | | | | | | | | | | | | May Fix #640 | ||||
| | * | | | | Fixed chest placement. | madmaxoft | 2014-02-04 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #624. | ||||
| | * | | | | Fixed indent from previous commits. | madmaxoft | 2014-02-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 6 | -4/+19 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| | | * | | | Fixed indentation | tonibm19 | 2014-02-04 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Blank lines and indentation. | tonibm19 | 2014-02-04 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also removed GetClosestPlayer documentation | ||||
| | | * | | | Not exporting FindClosestPlayer | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Fixed compilation | tonibm19 | 2014-02-03 | 1 | -1/+0 |
| | | | | | | |||||
| | | * | | | Added documentation | tonibm19 | 2014-02-03 | 1 | -1/+4 |
| | | | | | | |||||
| | | * | | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 6 | -3/+13 |
| | |/ / / | |/| | | | |||||
| | * | | | Fixed calling plugins with userdata params. | madmaxoft | 2014-02-04 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Removed a leftover debug message. | madmaxoft | 2014-02-04 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Fixed error handling in cPluginManager:CallPlugin() API. | madmaxoft | 2014-02-04 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | Fixed: When the called function malfunctioned, the entire plugin's call was aborted. | ||||
| | * | | | Improved error resistance in cPluginManager:CallPlugin(). | madmaxoft | 2014-02-04 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Fixed: If the call failed, all the next plugin calls would fail as well. | ||||
| | * | | | InfoDump: Fixed export for undeclared command param combinations. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Greatly improved TNT propulsion chances | Tiger Wang | 2014-02-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #636 from worktycho/warningfixes | Mattes D | 2014-02-03 | 10 | -19/+32 |
| | |\ \ \ | | | | | | | | | | | | | Increased Type safety of Biomes | ||||
| | | * | | | Fogot to save Biogen | Tycho | 2014-02-03 | 1 | -4/+4 |
| | | | | | | |||||
| | | * | | | Fixed Compile errors | Tycho | 2014-02-03 | 4 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | c++11 introduces scoped enums, so the code didn't fail in clang | ||||
| | | * | | | Removed unused lookups | Tycho | 2014-02-03 | 1 | -2/+0 |
| | | | | | | |||||
| | | * | | | Increased Type safety of Biomes | Tycho | 2014-02-03 | 9 | -17/+32 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings | ||||
| | * | | | Merge pull request #633 from mc-server/More_Sideways_Blocks | Mattes D | 2014-02-03 | 4 | -5/+80 |
| |/| | | | | |/ / | | | | | More sideways blocks. | ||||
| | * | | Named the different quartz block. | STRWarrior | 2014-02-03 | 2 | -1/+6 |
| | | | | |||||
| | * | | Fixed some issues. | STRWarrior | 2014-02-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Meta wasn't set if the block wasn't a pillar. Fixed typo. | ||||
| | * | | Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks. | STRWarrior | 2014-02-03 | 2 | -4/+4 |
| | | | | |||||
| | * | | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars. | STRWarrior | 2014-02-03 | 3 | -5/+74 |
| | | | | |||||
| * | | | Merge pull request #623 from mc-server/tnt | Mattes D | 2014-02-03 | 2 | -36/+122 |
| |\ \ \ | | |/ / | |/| | | TNT improvements | ||||
| | * | | Inversed condition | Tiger Wang | 2014-02-03 | 1 | -25/+28 |
| | | | | |||||
| | * | | Uncommented pickup spawner code | Tiger Wang | 2014-02-02 | 1 | -3/+7 |
| | | | | |||||
| | * | | TNT improvements | Tiger Wang | 2014-02-02 | 2 | -37/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230 | ||||
| * | | | Fixed socket leaking. | madmaxoft | 2014-02-03 | 1 | -0/+5 |
| | | | | |||||
| * | | | SocketThreads: Fixed sending to closed socket. | madmaxoft | 2014-02-03 | 1 | -1/+6 |
| | | | | |||||
| * | | | Groups.ini can contain spaces around commas in values. | madmaxoft | 2014-02-03 | 1 | -21/+25 |
| | | | | | | | | | | | | | | | | | | | | This includes Permissions, Inherits and Commands. Also fixed an unlikely but possible crash with group colors. | ||||
| * | | | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 7 | -22/+61 |
|/| | | | | | | | | | | | Redstone crash fix and current console line replace function | ||||
| * | | | Added IsBlockWaterOrIce() | Tiger Wang | 2014-02-02 | 2 | -10/+12 |
| | | | | |||||
| * | | | Revert "Added LOGREPLACELINE for line replacement" | Tiger Wang | 2014-02-02 | 5 | -94/+16 |
| | | | | | | | | | | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e. | ||||
| * | | | Revert "Improved code" | Tiger Wang | 2014-02-02 | 4 | -19/+13 |
| | | | | | | | | | | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c. | ||||
| * | | | Revert "Added a comment" | Tiger Wang | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 7ae5631d89426df6f05b6c8ba656ba02b9d15f93. | ||||
| * | | | Revert "Properly initialised variables" | Tiger Wang | 2014-02-02 | 4 | -13/+10 |
| | | | | | | | | | | | | | | | | This reverts commit 02e752789399ad1b65a0443534ea6a8721efd78c. | ||||
| * | | | Revert "Fixed issues with insufficient console space" | Tiger Wang | 2014-02-02 | 3 | -114/+29 |
| | | | | | | | | | | | | | | | | This reverts commit 6b18add09b5e9d6d6c2a61e90bdd7011f56f4c82. | ||||
| * | | | Revert "A newline issue is resolved" | Tiger Wang | 2014-02-02 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | This reverts commit 397208145ebe5c95ebf32f2985f6800634932230. | ||||
| * | | | Revert "Fixed Linux compile" | Tiger Wang | 2014-02-02 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 5becfe850a2b4827a21e8ede989545334efbbead. | ||||
| * | | | Revert "Another Linux fix" | Tiger Wang | 2014-02-02 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | This reverts commit 6f660b379ecbc091b9bd92093e0dad01a4f6bf38. | ||||
| * | | | Revert "Again improved LogReplaceLine" | Tiger Wang | 2014-02-02 | 2 | -80/+77 |
| | | | | | | | | | | | | | | | | This reverts commit dd325d742db9db54a25460fcacd093e7cc6f44f0. | ||||
| * | | | Possibly fixed #618 | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Creative players take Plugin damage | Tiger Wang | 2014-02-02 | 2 | -3/+4 |
| | | | | |||||
| * | | | Again improved LogReplaceLine | Tiger Wang | 2014-02-01 | 2 | -77/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed issues on Linux with cursor positioning * Made preprocessor blocks more readable * Improved reliability of line clearing on Windows - Removed an *unneeded* variable | ||||
| * | | | Added checks for ice into IsBlockWater() | Tiger Wang | 2014-02-01 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | * This fixes players spawning in vast oceans of ice, as opposed to the previous water | ||||
| * | | | Split cCoord template into one and two data types | Tiger Wang | 2014-02-01 | 2 | -12/+34 |
| | | | | |||||
| * | | | Another Linux fix | Tiger Wang | 2014-02-01 | 1 | -0/+6 |
| | | | | |||||
| * | | | Fixed Linux compile | Tiger Wang | 2014-02-01 | 1 | -1/+2 |
| | | | | |||||
| * | | | A newline issue is resolved | Tiger Wang | 2014-02-01 | 2 | -3/+1 |
| | | | | |||||
| * | | | Fixed issues with insufficient console space | Tiger Wang | 2014-02-01 | 3 | -29/+114 |
| | | | | |||||
| * | | | Properly initialised variables | Tiger Wang | 2014-01-31 | 4 | -10/+13 |
| | | | | |||||
| * | | | Added a comment | Tiger Wang | 2014-01-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Improved code | Tiger Wang | 2014-01-31 | 4 | -13/+19 |
| | | | | | | | | | | | | | | | | | | | | * Fixed some issues * Fixed standard violation | ||||
| * | | | Added LOGREPLACELINE for line replacement | Tiger Wang | 2014-01-29 | 5 | -16/+94 |
| | | | | |||||
| * | | | Fixed redstone simulator crash found in #570 | Tiger Wang | 2014-01-29 | 3 | -18/+25 |
| | | | | |||||
* | | | | Fixed multiple invalid permission nodes | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | New players can build as default now | ||||
* | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-02-02 | 81 | -552/+741 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #622 from worktycho/registerfix | Mattes D | 2014-02-02 | 1 | -26/+26 |
| |\ \ \ \ | | | | | | | | | | | | | Removed register keyword from Messinne Twister | ||||
| | * \ \ \ | Merge branch 'master' into registerfix | Tycho | 2014-02-02 | 46 | -63/+235 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Fixed dark oak and acacia placement. | madmaxoft | 2014-02-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #621. | ||||
| * | | | | | Merge pull request #615 from worktycho/GeneratingBenchmark2 | Mattes D | 2014-02-02 | 80 | -526/+714 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Generating benchmark2 | ||||
| | * | | | | Added missing files | Tycho | 2014-02-02 | 3 | -0/+39 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-02 | 13 | -3/+96 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h | ||||
| | * | | | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 20 | -37/+65 |
| | | | | | | |||||
| | * | | | | Changed Signiture of OnDigging | Tycho | 2014-02-01 | 4 | -7/+7 |
| | | | | | | |||||
| | * | | | | Changed Signiture of OnDestroyedByPlayer | Tycho | 2014-02-01 | 12 | -16/+27 |
| | | | | | | |||||
| | | * | | | Removed register keyword from Messinne Twister | Tycho | 2014-02-01 | 1 | -26/+26 |
| | |/ / / | | | | | | | | | | | | | | | | Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy | ||||
| | * | | | Changed pointers to references | Tycho | 2014-02-01 | 60 | -249/+247 |
| | | | | | |||||
| | * | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 46 | -217/+925 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 55 | -196/+209 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
| | * | | | | Changed it so std was actually set to c++11 in clang not gcc on OS X | Tycho | 2014-01-26 | 1 | -2/+11 |
| | | | | | | |||||
| | * | | | | Removed cWorld Include | Tycho | 2014-01-26 | 3 | -3/+0 |
| | | | | | | |||||
| | * | | | | Refactored GetPlacementBlockTypeMeta | Tycho | 2014-01-26 | 7 | -11/+12 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 279 | -49498/+2596 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| | * | | | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 21 | -263/+310 |
| | | | | | | | |||||
| | * | | | | | Added support for overide in c++11 supporting varients of gcc/clang | Tycho | 2014-01-26 | 1 | -2/+4 |
| | | | | | | | |||||
| | * | | | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 19 | -38/+80 |
| | | | | | | | |||||
| | * | | | | | dded dependecy on Blocks to Generator | Tycho | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Fixed #624 | Tiger Wang | 2014-02-02 | 2 | -0/+7 |
|/ / / / / / | |||||
* | | | | | | Fixed #620 | Tiger Wang | 2014-02-02 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #617 from UltraCoderRU/master | Mattes D | 2014-02-02 | 5 | -4/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Some fixes in wolves implementation | ||||
| * | | | | | | Added saving of angry flag. | Kirill Kirilenko | 2014-02-02 | 2 | -0/+7 |
| | | | | | | | |||||
| * | | | | | | Fixed sitting tag. | Kirill Kirilenko | 2014-02-02 | 2 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Monster's nominal speed was increased. | Kirill Kirilenko | 2014-02-01 | 2 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Fixed teleport to air, if owner is flying. | Kirill Kirilenko | 2014-02-01 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Added saving of collar's color. | Kirill Kirilenko | 2014-02-01 | 2 | -4/+11 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #585 from daniel0916/hooks | Mattes D | 2014-02-01 | 7 | -0/+70 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added "player destroying" and "player destroyed" hooks | ||||
| * | | | | | | Added PlayerDestroyedHook Documentation | daniel0916 | 2014-02-01 | 1 | -0/+23 |
| | | | | | | | |||||
| * | | | | | | Removed "player destroying" hook | daniel0916 | 2014-02-01 | 6 | -48/+1 |
| | | | | | | | |||||
| * | | | | | | Added "player destroying" and "player destroyed" hooks | daniel0916 | 2014-01-25 | 6 | -0/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hooks: HOOK_PLAYER_DESTROYING HOOK_PLAYER_DESTROYED Idea from: https://github.com/mc-server/MCServer/issues/473 | ||||
* | | | | | | | Merge pull request #613 from UltraCoderRU/master | Mattes D | 2014-02-01 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Added reading saved state of the wolf (sitting or standing). | ||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' | Kirill Kirilenko | 2014-01-31 | 1 | -13/+18 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Contributors now match real life, and are alpha-sorted. | Alexander Harkness | 2014-01-31 | 1 | -13/+18 |
| | | | | | | | |||||
| * | | | | | | Added reading saved state of the wolf (sitting or standing). | Kirill Kirilenko | 2014-01-31 | 1 | -0/+6 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #607 from mc-server/Wolf_Owner_Saving | Mattes D | 2014-01-31 | 2 | -3/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Wolf: Their owner now gets saved. | ||||
| * | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | Fixed cLineBlockTracer:Trace() signature. | madmaxoft | 2014-01-31 | 1 | -13/+27 |
| | | | | | | | |||||
* | | | | | | | Added cPluginManager:BindCommand() form to the API. | madmaxoft | 2014-01-31 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's the canonical way to call static functions. | ||||
* | | | | | | | Added cChunkDest::UpdateHeightmap() | madmaxoft | 2014-01-31 | 2 | -17/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator. | ||||
* | | | | | | | Fixed some more. | Alexander Harkness | 2014-01-31 | 1 | -4/+3 |
| | | | | | | | |||||
* | | | | | | | Fixed at least a little of the plugin guide. | Alexander Harkness | 2014-01-30 | 1 | -15/+7 |
| | | | | | | | |||||
* | | | | | | | Update Core | Alexander Harkness | 2014-01-30 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #605 from tonibm19/patch-1 | Mattes D | 2014-01-30 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Attempt at implementing #563 | ||||
| * | | | | | | | Attempt at implementing #563 | tonibm19 | 2014-01-30 | 1 | -2/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | Not tested (I don't have RasPi) | ||||
* | | | | / / | Lua: Fixed an error in table-functions callbacks. | madmaxoft | 2014-01-29 | 1 | -1/+5 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #599 from tonibm19/master | Mattes D | 2014-01-29 | 12 | -9/+31 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Now mobs follow you when holding their breed item. | ||||
| * | | | | | | Did what xoft said | tonibm19 | 2014-01-29 | 4 | -5/+3 |
| | | | | | | | |||||
| * | | | | | | Rewritten code. | tonibm19 | 2014-01-29 | 12 | -152/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested. | ||||
| * | | | | | | Fixed sheep | tonibm19 | 2014-01-29 | 1 | -18/+17 |
| | | | | | | | |||||
| * | | | | | | Fixed a copypasta error... | tonibm19 | 2014-01-29 | 4 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Now mobs follow you when holding their breed item | tonibm19 | 2014-01-29 | 10 | -5/+153 |
| | | | | | | | |||||
* | | | | | | | Added instructions for ZIP source downloads. | Mattes D | 2014-01-29 | 1 | -1/+3 |
|/ / / / / / | | | | | | | | | | | | | The ZIP file doesn't contain git submodules, people complained about not being able to compile from it. | ||||
* | | | | | | Limited sign lines to 15 chars. | madmaxoft | 2014-01-29 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #598. | ||||
* | | | | | | Plugin files are loaded in alphabetical order. | madmaxoft | 2014-01-29 | 1 | -17/+35 |
|/ / / / / | | | | | | | | | | | | | | | | Except for the Info.lua file which gets loaded always last. Implements #597. | ||||
* | | | | | Documented cFloater. | STRWarrior | 2014-01-29 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Removed debug message when a firework entity hit a solid block. | STRWarrior | 2014-01-29 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Bottle o' Enchanting spawns an experience orb. | STRWarrior | 2014-01-29 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Added 1.7.4 to the list of supported protocols. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Protocol 1.7: Encryption is enabled only with auth. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | ProtoProxy: Added encryption support. | madmaxoft | 2014-01-28 | 1 | -2/+19 |
| | | | | | |||||
* | | | | | Protocol 1.7: Forced encryption on all connections. | madmaxoft | 2014-01-28 | 4 | -15/+120 |
| | | | | | | | | | | | | | | | | | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication. | ||||
* | | | | | Crypto: Added public key encryption / decryption. | madmaxoft | 2014-01-28 | 2 | -0/+106 |
| | | | | | |||||
* | | | | | Fixed an error in Crypto. | madmaxoft | 2014-01-28 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #594 from mc-server/Villager_Update | Mattes D | 2014-01-28 | 5 | -2/+185 |
|\ \ \ \ \ | | | | | | | | | | | | | Villager update | ||||
| * | | | | | Renamed Farmer functions and added doxycomments | STRWarrior | 2014-01-28 | 2 | -17/+20 |
| | | | | | | |||||
| * | | | | | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. | STRWarrior | 2014-01-28 | 1 | -10/+0 |
| | | | | | | |||||
| * | | | | | Villager doesn't check the environment for crops if it doesn't need to. | STRWarrior | 2014-01-27 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 3 | -0/+14 |
| | | | | | | |||||
| * | | | | | Villager: Few more comments. | STRWarrior | 2014-01-27 | 2 | -4/+9 |
| | | | | | | |||||
| * | | | | | Cleanup | STRWarrior | 2014-01-27 | 2 | -31/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | Most code in Tick is now split up in different functions. | ||||
| * | | | | | Villagers: Harvesting is more rare. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Villager: Farmers can't place crops on blocks other then farmland. | STRWarrior | 2014-01-27 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | Fixed compiler error. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Villager: Farmer: Crops finding is more random. | STRWarrior | 2014-01-27 | 1 | -18/+19 |
| | | | | | | |||||
| * | | | | | Added GetCropsPos and DidFindCrops functions. | STRWarrior | 2014-01-27 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Villagers: Farmers now replant the crops. | STRWarrior | 2014-01-27 | 2 | -1/+17 |
| | | | | | | |||||
| * | | | | | Villagers: Fixed only gettings the crops block when farming. | STRWarrior | 2014-01-27 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Villagers don't look for new crops when they already found one. | STRWarrior | 2014-01-27 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | Slight cleanup. | ||||
| * | | | | | E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them. | STRWarrior | 2014-01-27 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Villagers: Farmers can also harvest carrots and potatoes. | STRWarrior | 2014-01-27 | 2 | -9/+38 |
| | | | | | | |||||
| * | | | | | Makes farmers farm crops. | STRWarrior | 2014-01-27 | 2 | -1/+76 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fixed timing on *nix. | madmaxoft | 2014-01-28 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Fixed a slight bug in RSA encryption code. | madmaxoft | 2014-01-28 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Merge pull request #595 from mc-server/NonBlockingSockets | Mattes D | 2014-01-28 | 4 | -63/+171 |
|\ \ \ \ \ | | | | | | | | | | | | | Non blocking sockets | ||||
| * | | | | | Squashed common code. | madmaxoft | 2014-01-27 | 1 | -14/+7 |
| | | | | | | |||||
| * | | | | | Fixed Linux compilation. | madmaxoft | 2014-01-27 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Rewritten networking to use non-blocking sockets. | madmaxoft | 2014-01-27 | 4 | -62/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes #592. | ||||
* | | | | | | Updated polarssl | Tiger Wang | 2014-01-27 | 1 | -0/+0 |
| | | | | | | |||||
* | | | | | | SIGABRT exits with failure. | Tiger Wang | 2014-01-27 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Fixed client packet parsing. | madmaxoft | 2014-01-26 | 2 | -15/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541. Also modified comm logging, now each direction can be turned on separately. | ||||
* | | | | | cByteBuffer has more self-tests. | madmaxoft | 2014-01-26 | 1 | -6/+29 |
| | | | | | |||||
* | | | | | Item-loading now checks for weird bytes. | madmaxoft | 2014-01-26 | 1 | -3/+9 |
| | | | | | |||||
* | | | | | Fixed Byte-order reading. | madmaxoft | 2014-01-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | The functions would fail on bytes that were above 127. | ||||
* | | | | | Added SIGABRT to catchers list | Tiger Wang | 2014-01-26 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #589 from mc-server/minecartimprovements | Mattes D | 2014-01-26 | 5 | -110/+438 |
|\ \ \ \ | | | | | | | | | | | Minecart improvements | ||||
| * | | | | Reduced unnecessary echoes (thanks xoft) | Tiger Wang | 2014-01-26 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | Rail speed tweak | Tiger Wang | 2014-01-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Improved AllToLua UI experience | Tiger Wang | 2014-01-25 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Added more minecart powered rail directions | Tiger Wang | 2014-01-24 | 3 | -80/+63 |
| | | | | | |||||
| * | | | | Begin implementing ascending rails | Tiger Wang | 2014-01-19 | 2 | -2/+45 |
| | | | | | |||||
| * | | | | Added one more direction into collision checks | Tiger Wang | 2014-01-19 | 1 | -26/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Added direction XM_XP * Improved performance, thanks STR and xoft | ||||
| * | | | | Minecart improvements and fixes | Tiger Wang | 2014-01-19 | 1 | -33/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails * Fixed detector rails in certain situations * Fixed powered rails and others passing bad meta to SnapToRail() | ||||
| * | | | | Fixed weird meta with curved rails | Tiger Wang | 2014-01-19 | 1 | -5/+15 |
| | | | | | |||||
| * | | | | Added more rail functionality | Tiger Wang | 2014-01-19 | 3 | -18/+22 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into minecartimprovements | Tiger Wang | 2014-01-19 | 85 | -332/+1238 |
| |\ \ \ \ | |||||
| * | | | | | Minecart collision and general improvements | Tiger Wang | 2014-01-18 | 2 | -70/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented collision on one type of rail * Improved curved rails somewhat * Fixed a crash bug | ||||
* | | | | | | Merge pull request #590 from mc-server/Wolf_Fix | Mattes D | 2014-01-26 | 1 | -7/+31 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Wolf: Small fix since the new AI and a new small feature. | ||||
| * | | | | | | Fixed bug where wolfs would teleport while they were sitting. | STRWarrior | 2014-01-26 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Small fix since the new AI and a new small feature. | STRWarrior | 2014-01-26 | 1 | -6/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting. | ||||
* | | | | | | | Fixed segmentation fault on villager damage | Tiger Wang | 2014-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It occurred when attack was environmental. | ||||
* | | | | | | | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 11 | -189/+317 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | More Interfaces to decouple Generator from the rest of the code | ||||
| * | | | | | Stupid Mistake fixed | Tycho | 2014-01-25 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fixed exports | Tycho | 2014-01-25 | 3 | -7/+1 |
| | | | | | | |||||
| * | | | | | Fixed spelling error | Tycho | 2014-01-22 | 4 | -3/+3 |
| | | | | | | |||||
| * | | | | | Added manual bindings for moved functions | Tycho | 2014-01-22 | 3 | -2/+71 |
| | | | | | | |||||
| * | | | | | formatting changes | Tycho | 2014-01-22 | 2 | -6/+26 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-22 | 30 | -276/+2255 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | | | | | Actually implemented interfaces | Tycho | 2014-01-20 | 4 | -21/+33 |
| | | | | | | | |||||
| * | | | | | | Moved Schematic file methods to seperate class | Tycho | 2014-01-20 | 4 | -175/+177 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmark | Tycho | 2014-01-20 | 4 | -17/+23 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | | | Seperated BlockArea From World | Tycho | 2014-01-20 | 4 | -14/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things | ||||
| * | | | | | | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-20 | 89 | -19110/+1520 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | this merge is necessary, | ||||
| * | | | | | | Added Inifile and OSSupport Linking | Tycho | 2014-01-19 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | First attempt at Compiling Generator seperatly | Tycho | 2014-01-19 | 3 | -0/+23 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #588 from mc-server/Sheep_Eating | Mattes D | 2014-01-25 | 2 | -1/+41 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implemented sheeps eating grass. | ||||
| * | | | | | | | Implemented sheeps eating grass. | STRWarrior | 2014-01-25 | 2 | -1/+41 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 29 | -564/+717 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Mob improvements & rudimentary artificial intelligence | ||||
| * | | | | | | | | Did what xoft recommended | Tiger Wang | 2014-01-25 | 2 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Two minor changes | Tiger Wang | 2014-01-25 | 2 | -6/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 5 | -11/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
| * | | | | | | | | Attack() is no longer always called | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Implemented pickup combining | Tiger Wang | 2014-01-25 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS393 * Part of #131 | ||||
| * | | | | | | | | Mob bugfixes | Tiger Wang | 2014-01-25 | 6 | -26/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| * | | | | | | | | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 6 | -127/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
| * | | | | | | | | Fixed a generator bug | Tiger Wang | 2014-01-25 | 2 | -1/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Zombies and skeletons use AI | Tiger Wang | 2014-01-25 | 2 | -9/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 3 | -28/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Changed a condition to IsGameMode | Tiger Wang | 2014-01-24 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Made wolves compatible with new AI code | Tiger Wang | 2014-01-24 | 2 | -11/+26 |
| | | | | | | | | | |||||
| * | | | | | | | | Monsters no longer check for direct line of sight | Tiger Wang | 2014-01-24 | 1 | -10/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Large reworking of mob code [SEE DESC] | Tiger Wang | 2014-01-24 | 7 | -242/+334 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | ||||
| * | | | | | | | | Fixed mobs too close to player not ticking | Tiger Wang | 2014-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A condition would never be fulfilled. A number squared was compared to -1, but there is nothing that, multiplied by itself, gives -1. | ||||
| * | | | | | | | | Implemented creeper abilities | Tiger Wang | 2014-01-24 | 3 | -3/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Creepers now explode with a sound effect * Creepers drop a music disc on the unlikely event of being killed by a skeleton's arrow Inspired by @maniak89's PR #132. | ||||
| * | | | | | | | | Removed unused ReferenceManager | Tiger Wang | 2014-01-24 | 4 | -122/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #583 from mc-server/ChangeToPolarSSL | Mattes D | 2014-01-25 | 217 | -48397/+733 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change to polar ssl | ||||
| * | | | | | | | | | ProtoProxy: Modified to use PolarSSL. | madmaxoft | 2014-01-25 | 6 | -60/+45 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added RSA encryption to crypto wrappers. | madmaxoft | 2014-01-25 | 2 | -0/+39 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merged branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-25 | 21 | -183/+333 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Removed unnecessary define | Tiger Wang | 2014-01-24 | 1 | -7/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-23 | 11 | -198/+254 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed a warning in ScoreboardSerializer. | madmaxoft | 2014-01-23 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 13 | -157/+630 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed a bug in LeakFinder. | madmaxoft | 2014-01-23 | 1 | -3/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Removed CryptoPP files. | madmaxoft | 2014-01-22 | 194 | -48168/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Replacing CryptoPP with PolarSSL. | madmaxoft | 2014-01-22 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet. | ||||
| * | | | | | | | | | | | Added PolarSSL as a submodule. | madmaxoft | 2014-01-22 | 2 | -0/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #581 from worktycho/strerror | Mattes D | 2014-01-25 | 7 | -65/+76 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Switched cEvent to use strerror_r for error messages | ||||
| * | | | | | | | | | | | Switched cEvent to GetOSErrorString | Tycho | 2014-01-25 | 3 | -18/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Extracted cSocket::GetErrorString into GetOSErrorString | Tycho | 2014-01-25 | 6 | -59/+62 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Switched cEvent to use strerror_r for error messages | Tycho | 2014-01-23 | 1 | -6/+18 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Comm logging is available in both Debug and Release modes. | madmaxoft | 2014-01-25 | 3 | -16/+16 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Added cFile::Flush(). | madmaxoft | 2014-01-25 | 2 | -20/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when using cFile as a log file and we know the server may crash after a specific write, so we flush the file before continuing. | ||||
* | | | | | | | | | | | | Protocol17: Comm logging shows the data left over from previous parse. | madmaxoft | 2014-01-25 | 1 | -2/+15 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Ignoring the Comm Logs. | madmaxoft | 2014-01-25 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #586 from worktycho/BindingsMove | Alexander Harkness | 2014-01-25 | 2 | -83/+71 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | Implented xofts suggestions in #577 | ||||
| * | | | | | | | | | | | Simplified .gitignore | Tycho | 2014-01-25 | 1 | -55/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added dependecy output to Bindings/BindingsDependencies.txt | Tycho | 2014-01-25 | 2 | -0/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Reformatted Bindings Dependecies | Tycho | 2014-01-25 | 1 | -28/+58 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed *nix compilation for previous commit. | madmaxoft | 2014-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Added per-connection comm logging in debug mode. | madmaxoft | 2014-01-24 | 3 | -1/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter. | ||||
* | | | | | | | | | | | | Fixed a possible deadlock on client disconnect. | madmaxoft | 2014-01-24 | 1 | -9/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed a failure in cSquid. | madmaxoft | 2014-01-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably due to rounding errors the squid was querying out-of-chunk coords. | ||||
* | | | | | | | | | | | | Updated Core | Tiger Wang | 2014-01-24 | 1 | -0/+0 |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | ProtoProxy: Fixed connection on *nix. | madmaxoft | 2014-01-24 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed Win nightbuilds not producing PDBs. | madmaxoft | 2014-01-24 | 2 | -7/+8 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | 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 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix issues reported in: http://forum.mc-server.org/showthread.php?tid=1328 http://forum.mc-server.org/showthread.php?tid=1308 | ||||
* | | | | | | | | | | | APIDump: Fixed indent after merge. | madmaxoft | 2014-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 5 | -52/+93 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed indentation once and for all. | Mike Hunsinger | 2014-01-24 | 2 | -46/+46 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed indentation and doxygen comments... For real this time. | Mike Hunsinger | 2014-01-24 | 3 | -17/+17 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed spacing and doxycomments. | Mike Hunsinger | 2014-01-24 | 4 | -20/+18 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Removed extra line | Mike Hunsinger | 2014-01-23 | 1 | -2/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 5 | -60/+105 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed flint&steel failure on the Y world edges. | madmaxoft | 2014-01-24 | 1 | -0/+4 |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #580 from xdot/master | Mattes D | 2014-01-23 | 2 | -41/+33 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed scoreboard serialization | ||||
| * | | | | | | | | | | | Fixed 1.5.x scoreboard packet IDs | andrew | 2014-01-23 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed scoreboard.dat structure | andrew | 2014-01-23 | 1 | -5/+6 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed scoreboard serialization | andrew | 2014-01-23 | 1 | -35/+26 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #582 from worktycho/BindingsMove | Alexander Harkness | 2014-01-23 | 2 | -25/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | / / / / / / / / | |_|_|/ / / / / / / / |/| | | | | | | | | | | added dependecies for bindings regen | ||||
| * | | | | | | | | | | Make clean now effects Bindings | Tycho | 2014-01-23 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed Bindings folder subcmake on *nix | Tycho | 2014-01-23 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Bugfixes | Tycho | 2014-01-23 | 2 | -12/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | added dependecies for bindings regen | Tycho | 2014-01-23 | 2 | -14/+46 |
|/ / / / / / / / / / | |||||
* / / / / / / / / / | Fixed crash while calling disabled plugins. | madmaxoft | 2014-01-23 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Improved code safety for the Compact world storage. | Mattes D | 2014-01-23 | 1 | -104/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was a huge chunk of smelly code. | ||||
* | | | | | | | | | Minor style improvements for the merged PR. | Mattes D | 2014-01-23 | 1 | -4/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge remote-tracking branch 'xdot/master' | Mattes D | 2014-01-23 | 6 | -40/+104 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * xdot/master: Command block fixes 2 | ||||
| * | | | | | | | | Command block fixes 2 | andrew | 2014-01-23 | 6 | -40/+104 |
| | | | | | | | | | |||||
* | | | | | | | | | Authenticator: Reduced logging levels. | madmaxoft | 2014-01-22 | 1 | -4/+4 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #574 from tonibm19/patch-1 | STRWarrior | 2014-01-22 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fixed compilation on VC2008 | ||||
| * | | | | | | | Fixed compilation on VC2008 | tonibm19 | 2014-01-22 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #566 from xdot/master | Mattes D | 2014-01-22 | 20 | -9/+1571 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Scoreboard | ||||
| * | | | | | | | cWorld now saves/loads the scoreboard | andrew | 2014-01-22 | 4 | -15/+44 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 74 | -19104/+836 |
| |\| | | | | | | |||||
| * | | | | | | | Scoreboard SendTo() | andrew | 2014-01-21 | 4 | -6/+74 |
| | | | | | | | | |||||
| * | | | | | | | Scoreboard protocol support | andrew | 2014-01-21 | 17 | -23/+321 |
| | | | | | | | | |||||
| * | | | | | | | Scoreboard serialization | andrew | 2014-01-20 | 3 | -14/+92 |
| | | | | | | | | |||||
| * | | | | | | | Scoreboard deserialization | andrew | 2014-01-20 | 7 | -48/+599 |
| | | | | | | | | |||||
| * | | | | | | | Scoreboard improvements | andrew | 2014-01-19 | 3 | -116/+79 |
| | | | | | | | | |||||
| * | | | | | | | Basic scoreboard implementation | andrew | 2014-01-19 | 5 | -1/+576 |
| | | | | | | | | |||||
* | | | | | | | | InfoDump: Can dump a single plugin without LFS. | madmaxoft | 2014-01-22 | 1 | -47/+65 |
| | | | | | | | | |||||
* | | | | | | | | InfoDump: Dump all referenced permissions. | madmaxoft | 2014-01-22 | 1 | -4/+112 |
| | | | | | | | | |||||
* | | | | | | | | Implemented cPluginManager:CallPlugin() API. | madmaxoft | 2014-01-21 | 9 | -216/+507 |
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all. | ||||
* | | | | | | | Fix a crash but somewhere... | Alexander Harkness | 2014-01-20 | 1 | -2/+1 |
| |_|/ / / / |/| | | | | | |||||
| | | | | * | Fixed merge conflict | daniel0916 | 2014-04-07 | 1 | -3/+0 |
| | | | | | | |||||
| | | | | * | Added Enchantment-Slot-Level generating | daniel0916 | 2014-04-07 | 3 | -9/+32 |
| | | | | | | |||||
| | | | | * | added EnchantItemPacket to older Protocols | daniel0916 | 2014-02-01 | 1 | -1/+4 |
| | | | | | | |||||
| | | | | * | Some updates for enchanting (2) | daniel0916 | 2014-01-31 | 9 | -15/+173 |
| | | | | | | |||||
| | | | | * | removed hook from enchanting commit | daniel0916 | 2014-01-24 | 2 | -5/+1 |
| | | | | | | |||||
| | | | | * | Some updates for enchanting | daniel0916 | 2014-01-24 | 5 | -17/+29 |
| | | | | | | |||||
| | | | | * | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 8 | -0/+198 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more... | ||||
* | | | | | APIDump: Added notes about objects across cWorld's task execution. | madmaxoft | 2014-01-19 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | APIDump: Updated cWorld:ScheduleTask()'s description. | madmaxoft | 2014-01-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Changed the cWorld::ScheduleTask() signature. | madmaxoft | 2014-01-19 | 4 | -151/+221 |
| | | | | | | | | | | | | | | | | | | | | Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly. | ||||
* | | | | | cLuaState can now check function params. | madmaxoft | 2014-01-19 | 2 | -0/+37 |
| | | | | | |||||
* | | | | | Merge pull request #569 from worktycho/EnchantmentsFix | Mattes D | 2014-01-19 | 8 | -88/+120 |
|\ \ \ \ \ | | |/ / / | |/| | | | Enchantments fix | ||||
| * | | | | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 7 | -17/+23 |
| | | | | | |||||
| * | | | | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 8 | -90/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | Merge pull request #565 from mc-server/commandblockfixes | Mattes D | 2014-01-19 | 12 | -6/+165 |
|\ \ \ \ \ | | | | | | | | | | | | | Command block fixes | ||||
| * | | | | | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 9 | -15/+23 |
| | | | | | | |||||
| * | | | | | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 9 | -42/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
| * | | | | | Implemented MC|Brand response | Tiger Wang | 2014-01-19 | 1 | -3/+9 |
| | | | | | | |||||
| * | | | | | ProtoProxy: UpdateBlockEntity NBT is written | Tiger Wang | 2014-01-19 | 1 | -1/+14 |
| | | | | | | |||||
| * | | | | | Improved command blocks | Tiger Wang | 2014-01-19 | 11 | -5/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity | ||||
* | | | | | | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 8 | -178/+189 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes #560 and #390. | ||||
* | | | | | | Added graph of SocketThreads state transitions. | madmaxoft | 2014-01-19 | 3 | -4/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | This graph has been used for #560. | ||||
* | | | | | | Merge pull request #551 from worktycho/schedular | Mattes D | 2014-01-19 | 1 | -6/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Implemented xoft's suggestion for a saturating counter in the scheduler | ||||
| * | | | | | | Fixed iterators bug | Tycho | 2014-01-18 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | switched to using m_WorldAge rather than m_TickID | Tycho | 2014-01-18 | 2 | -9/+3 |
| | | | | | | | |||||
| * | | | | | | Increased tick count to long | Tycho | 2014-01-17 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Implemented xsofts suggestion for a saturating counter in the scheduler | Tycho | 2014-01-17 | 2 | -5/+8 |
| | | | | | | | |||||
* | | | | | | | Updated Core. | madmaxoft | 2014-01-19 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Removed obsolete MSVC project files. | madmaxoft | 2014-01-19 | 37 | -18619/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows builds now use CMake as well. | ||||
* | | | | | | | SocketThreads: Removed unused code. | madmaxoft | 2014-01-19 | 2 | -53/+3 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Updated core | Tiger Wang | 2014-01-19 | 1 | -0/+0 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #559 from mc-server/SpawnMobParticles | Mattes D | 2014-01-19 | 1 | -3/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Removed the particles when a mob spawns. | ||||
| * | | | | | Removed the particles when a mob spawns. | STRWarrior | 2014-01-18 | 1 | -3/+0 |
| | | | | | | |||||
* | | | | | | Exported cFloater to the Lua API. | STRWarrior | 2014-01-19 | 2 | -3/+8 |
| | | | | | | |||||
* | | | | | | Fixed compiler error. | STRWarrior | 2014-01-18 | 2 | -3/+11 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #557 from xdot/master | Mattes D | 2014-01-18 | 20 | -62/+593 |
|\ \ \ \ \ | | | | | | | | | | | | | Command blocks | ||||
| * | | | | | Command block fixes | andrew | 2014-01-18 | 3 | -43/+17 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-18 | 4 | -5/+152 |
| |\| | | | | |||||
| * | | | | | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 4 | -1/+70 |
| | | | | | | |||||
| * | | | | | Command blocks: Execute() | andrew | 2014-01-18 | 5 | -18/+42 |
| | | | | | | |||||
| * | | | | | Command block (de)serialization | andrew | 2014-01-18 | 6 | -21/+122 |
| | | | | | | |||||
| * | | | | | Basic command block implementation | andrew | 2014-01-18 | 12 | -33/+396 |
| | |_|/ / | |/| | | | |||||
* | | | | | HTTP connections aren't kept alive unless explicitly enabled. | madmaxoft | 2014-01-18 | 4 | -37/+58 |
| |/ / / |/| | | | | | | | | | | | | | | | Only the client can decide that the connection can be kept alive, we must close the socket if the client doesn't indicate keepalive support. This will provide a fix for #390 when #560 is fixed; until then the issue remains, just it's no longer HTTPServer's fault. | ||||
* | | | | Alpha-sorted the finishers. | madmaxoft | 2014-01-18 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merged branch 'NetherFinish'. | madmaxoft | 2014-01-18 | 3 | -3/+150 |
|\ \ \ \ | |||||
| * | | | | Fixed errors. | STRWarrior | 2014-01-18 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's | STRWarrior | 2014-01-18 | 3 | -10/+10 |
| | | | | | |||||
| * | | | | Some tweaks. | STRWarrior | 2014-01-18 | 1 | -5/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks. | ||||
| * | | | | Fixed bug where only brown mushrooms would spawn. | STRWarrior | 2014-01-18 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | It now actualy works. | STRWarrior | 2014-01-18 | 1 | -20/+42 |
| | | | | | |||||
| * | | | | First attempt at creating a clumb version NetherFinisher. | STRWarrior | 2014-01-17 | 2 | -22/+63 |
| | | | | | |||||
| * | | | | Added cFinishGenNetherSprinkleFoliage. | STRWarrior | 2014-01-10 | 3 | -2/+73 |
| | | | | | |||||
* | | | | | Fix bad nested headings. | Alexander Harkness | 2014-01-18 | 1 | -2/+2 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #552 from worktycho/c++11 | Mattes D | 2014-01-17 | 2 | -4/+1 |
|\ \ \ \ | | | | | | | | | | | Changed std to c++11 in clang to fix va_copy issues | ||||
| * | | | | Changed std to c++11 in clang to fix va_copy issues | Tycho | 2014-01-17 | 2 | -4/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #554 from worktycho/compression | Alexander Harkness | 2014-01-17 | 10 | -22/+33 |
|\ \ \ \ | |/ / / |/| | | | Added user setting compression factor | ||||
| * | | | Added user setting compression factor | Tycho | 2014-01-17 | 10 | -22/+33 |
|/ / / | |||||
* | | | APIDump: Updated cPluginManager:GetAllPlugins(). | madmaxoft | 2014-01-17 | 1 | -1/+1 |
| | | | |||||
* | | | ProtoProxy: Compiles under Linux. | madmaxoft | 2014-01-17 | 4 | -28/+43 |
| | | | |||||
* | | | ProtoProxy: Fixed inversed typedef. | madmaxoft | 2014-01-17 | 1 | -1/+1 |
| | | | | | | | | | | | | I must be going crazy... | ||||
* | | | ProtoProxy: Fixed compilation in Windows and in Linux. | madmaxoft | 2014-01-17 | 3 | -16/+21 |
| | | | |||||
* | | | ProtoProxy: Fixed #include filename case. | madmaxoft | 2014-01-17 | 1 | -4/+4 |
| | | | |||||
* | | | Updated core to the latest version and edited the submodules file to allow greater compatibility on restricted networks. | Alexander Harkness | 2014-01-17 | 2 | -3/+3 |
| | | | |||||
* | | | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 7 | -11/+62 |
|\ \ \ | | | | | | | | | Added cWorld::SpawnMinecart. | ||||
| * | | | Changed GetContent function. | STRWarrior | 2014-01-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed server crash. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 7 | -17/+18 |
| | | | | |||||
| * | | | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 7 | -10/+33 |
| | | | | |||||
| * | | | Added cWorld::SpawnMinecart. | STRWarrior | 2014-01-12 | 2 | -0/+27 |
| | | | | |||||
* | | | | Fixed SIGABRT_COMPAT on other architectures. | madmaxoft | 2014-01-17 | 1 | -0/+2 |
| | | | | |||||
* | | | | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 23 | -43/+43 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/customnames' | madmaxoft | 2014-01-17 | 38 | -115/+201 |
|\ \ \ \ | |||||
| * | | | | Changed newline character because of issues | Tiger Wang | 2014-01-16 | 2 | -4/+13 |
| | | | | | |||||
| * | | | | Removed CustomCopy() | Tiger Wang | 2014-01-16 | 2 | -24/+1 |
| | | | | | |||||
| * | | | | Really did what xoft wanted | Tiger Wang | 2014-01-16 | 1 | -5/+8 |
| | | | | | |||||
| * | | | | Fixed #535 | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 34 | -74/+67 |
| | | | | | |||||
| * | | | | Possibly did what xoft wanted | Tiger Wang | 2014-01-16 | 3 | -10/+25 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into customnames | Tiger Wang | 2014-01-16 | 13 | -83/+112 |
| |\ \ \ \ | |||||
| * | | | | | OBSOLETE'd obsolete functions | Tiger Wang | 2014-01-15 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Implemented custom names and lore | Tiger Wang | 2014-01-15 | 4 | -35/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT | ||||
| * | | | | | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 3 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | | | | | | Protocol 1.7: More output on unknown packets / protocol states. | madmaxoft | 2014-01-17 | 1 | -4/+21 |
| | | | | | | |||||
* | | | | | | Ignoring MSVC2010+ build folders. | Mattes D | 2014-01-17 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | CMake: Fixed Lua output folder for MSVC2010+. | Mattes D | 2014-01-17 | 1 | -2/+13 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fixed block break packet number | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed #535 | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed SIGPIPE on cSocket::Send(). | madmaxoft | 2014-01-16 | 3 | -12/+13 |
| | | | | | |||||
* | | | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode. | madmaxoft | 2014-01-16 | 1 | -1/+14 |
| | | | | | |||||
* | | | | | Disabled excessive entity-related logging in Debug mode. | madmaxoft | 2014-01-16 | 2 | -3/+26 |
| | | | | | |||||
* | | | | | Fixed whitespace in previous commit. | madmaxoft | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Finished exporting cWorld:ScheduleTask() to Lua API. | madmaxoft | 2014-01-16 | 2 | -2/+16 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #548 from worktycho/documention | Alexander Harkness | 2014-01-16 | 2 | -0/+10 |
|\ \ \ \ | | | | | | | | | | | Added Documention for a few features I've added | ||||
| * | | | | Documented the SchedualeTask function | Tycho | 2014-01-16 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | documented CROSSCOMPILING flag | Tycho | 2014-01-16 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | CMake: Fixed output paths for all MSVC versions. | madmaxoft | 2014-01-16 | 2 | -11/+19 |
| | | | | | |||||
* | | | | | Added packet diagnostics to 1.7 protocol. | madmaxoft | 2014-01-16 | 2 | -30/+40 |
| | | | | | | | | | | | | | | | | | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths. | ||||
* | | | | | Yet another attempt at VarArgs. | madmaxoft | 2014-01-16 | 1 | -10/+15 |
| | | | | | |||||
* | | | | | Another VarArgs fix. | madmaxoft | 2014-01-16 | 7 | -43/+39 |
| |/ / / |/| | | | | | | | | | | | This time using va_copy() on platforms that have it and simple assignment on platforms that don't. | ||||
* | | | | Merge pull request #545 from mc-server/VarArgs | Mattes D | 2014-01-15 | 8 | -36/+54 |
|\ \ \ \ | | | | | | | | | | | Var args | ||||
| * | | | | Fixed ProtoProxy compilation. | madmaxoft | 2014-01-15 | 1 | -4/+8 |
| | | | | | |||||
| * | | | | Using a 2nd argument instead of va_copy(). | madmaxoft | 2014-01-15 | 7 | -32/+46 |
| | | | | | | | | | | | | | | | | | | | | This seems to be the only reasonable C++03-only solution. | ||||
* | | | | | ProtoProxy: use CMake to generate the MSVC project files. | madmaxoft | 2014-01-15 | 4 | -308/+156 |
| | | | | | |||||
* | | | | | APIDump: Explicitly listed static cPlayer functions. | madmaxoft | 2014-01-15 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Fixed varargs modification. | madmaxoft | 2014-01-15 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | Ref.: #541. | ||||
* | | | | Merge pull request #543 from mc-server/Furnace_Minecarts | Mattes D | 2014-01-15 | 2 | -3/+42 |
|\ \ \ \ | | | | | | | | | | | Furnace minecarts | ||||
| * | | | | Furnace minecarts now stop being active after a while. | STRWarrior | 2014-01-15 | 2 | -2/+19 |
| | | | | | |||||
| * | | | | First implementation for furnace minecarts. | STRWarrior | 2014-01-15 | 2 | -1/+23 |
| | | | | | |||||
* | | | | | Updated Core! ±±±___±±± | Tiger Wang | 2014-01-15 | 1 | -0/+0 |
| | | | | | |||||
* | | | | | Update COMPILING.md | Mattes D | 2014-01-15 | 1 | -9/+64 |
| | | | | | | | | | | | | | | | Added instructions for Windows compiling, including CMake. | ||||
* | | | | | CMake: MSVC release builds use LTCG. | madmaxoft | 2014-01-15 | 1 | -2/+8 |
|/ / / / | |||||
* | | | | CMake: Removed SCL warnings from Lua and ZLib. | madmaxoft | 2014-01-15 | 2 | -0/+9 |
| | | | | |||||
* | | | | CMake: MSVC builds use static CRT. | madmaxoft | 2014-01-15 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | We don't want to be dependent on the VC runtime. | ||||
* | | | | Merge pull request #542 from worktycho/schedular | Mattes D | 2014-01-15 | 3 | -4/+121 |
|\ \ \ \ | | | | | | | | | | | added cWorld::ScheduleTask Function | ||||
| * | | | | added cWorld::ScheduleTask Function | Tycho | 2014-01-14 | 3 | -4/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150 | ||||
* | | | | | Merge pull request #538 from mc-server/minecarts | Mattes D | 2014-01-15 | 13 | -208/+503 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Minecarts | ||||
| * | | | | Yes newline at end of file :D | Tiger Wang | 2014-01-14 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Final improvements to Minecarts | Tiger Wang | 2014-01-13 | 3 | -93/+292 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails being a little broken + Implemented detector rails + Implemented block collisions on rails * Fixed snapping to rail - Removed minecart physics conditions in Entity.cpp as minecarts use their own simulator when on rails Fixes #148 and #217; partially implemented #215. This is Cave Johnson, and we're done here. | ||||
| * | | | | Detaching improvements | Tiger Wang | 2014-01-13 | 4 | -4/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
| * | | | | Fixed wire, rail, and pressure plate unpowering | Tiger Wang | 2014-01-13 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Fixed settings plugin generation after IniFile | Tiger Wang | 2014-01-12 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Fixed VS2013 compile and updated Core | Tiger Wang | 2014-01-12 | 4 | -32/+34 |
| | | | | | |||||
| * | | | | Multiple enhancements and fixes to minecarts | Tiger Wang | 2014-01-12 | 4 | -132/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails | ||||
* | | | | | Updated GETTING-STARTED.md to remove completed issues | worktycho | 2014-01-14 | 1 | -3/+3 |
| |/ / / |/| | | | |||||
* | | | | CMake: Release profile build inherits from Release, not Debug. | madmaxoft | 2014-01-14 | 1 | -5/+13 |
| | | | | |||||
* | | | | Moved profiling scripts into the MCServer folder. | madmaxoft | 2014-01-14 | 4 | -146/+101 |
| | | | | | | | | | | | | | | | | Also they default to the 2010 version of the tools, which is Win7-compatible, and should be 64-bit-compatible, too. | ||||
* | | | | CMake: Added postfix for profiled exe | madmaxoft | 2014-01-14 | 1 | -0/+4 |
| | | | | |||||
* | | | | APIDump: Wrapped example code so that it displays well on small screens. | madmaxoft | 2014-01-13 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | The listing was pushing the resulting webpage too wide on my 19" screen, causing various distortions. | ||||
* | | | | Renamed unused source files from zlib. | madmaxoft | 2014-01-13 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | These files are included in zlib, but they should not be compiled into the actual library. Since they contain example code on how to use the lib, I decided to keep them, renamed to .txt. | ||||
* | | | | The VS2008 nightbuild uses CMake. | madmaxoft | 2014-01-13 | 1 | -1/+11 |
| | | | | |||||
* | | | | Removed shutdown() from socket closing. | madmaxoft | 2014-01-13 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite. Fixes #537. | ||||
* | | | | Added handshake processing to protocol 1.7. | madmaxoft | 2014-01-13 | 2 | -2/+29 |
| | | | | | | | | | | | | | | | | This fixes #495 | ||||
* | | | | ProtoProxy: Fixed login kick packet direction. | madmaxoft | 2014-01-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Generating the bindings outputs a message at the end. | madmaxoft | 2014-01-13 | 1 | -0/+8 |
| | | | | |||||
* | | | | APIDump: Added OnPluginMessage.lua file to Decoda project. | madmaxoft | 2014-01-13 | 1 | -0/+3 |
| | | | | |||||
* | | | | APIDump: Added missing bits of documentation. | madmaxoft | 2014-01-13 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | The recent changes didn't document some of the new API functions. | ||||
* | | | | APIDump: Documented the plugin messaging hook and function. | madmaxoft | 2014-01-13 | 2 | -0/+26 |
| | | | | |||||
* | | | | Merge pull request #536 from worktycho/nativearch | Mattes D | 2014-01-13 | 1 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Added -march=native to linux targets | ||||
| * | | | | Added -march=native to linux targets | Tycho | 2014-01-13 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | cCreeper is no longer available in API. | madmaxoft | 2014-01-13 | 3 | -14/+1 |
| | | | | | | | | | | | | | | | | Has been replaced by cMonster. | ||||
* | | | | CMake: Removed leftover debugging output. | madmaxoft | 2014-01-13 | 1 | -1/+0 |
| | | | | |||||
* | | | | CMake: Added resources to windows projects. | madmaxoft | 2014-01-13 | 1 | -1/+14 |
| | | | | |||||
* | | | | Added a generic .user file for MSVC. | madmaxoft | 2014-01-13 | 1 | -0/+167 |
| | | | | | | | | | | | | | | | | This brings in the default debugging settings for the MSVC project, when generated by CMake. | ||||
* | | | | CMake: Lua DLL is built in the correct folder. | madmaxoft | 2014-01-13 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | Also removed SCL warnings from MSVC builds. | ||||
* | | | | Moved the win resources into a separate subfolder. | madmaxoft | 2014-01-12 | 10 | -29/+7 |
| | | | | | | | | | | | | | | | | This will allow us to use them in CMake builds. | ||||
* | | | | CMake generates Bindings when not existant (win) | madmaxoft | 2014-01-12 | 1 | -0/+10 |
|/ / / | |||||
* | | | Merge pull request #529 from mc-server/derpstonerefactor | Alexander Harkness | 2014-01-12 | 10 | -331/+265 |
|\ \ \ | |/ / |/| | | Major refactoring of redstone | ||||
| * | | Fixed rails powering | Tiger Wang | 2014-01-11 | 1 | -0/+2 |
| | | | |||||
| * | | Did some stuff with the vectors | Tiger Wang | 2014-01-11 | 1 | -32/+17 |
| | | | |||||
| * | | Fixed a door bug and reduced code | Tiger Wang | 2014-01-11 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | Doors wouldn't get powered by repeaters, and some blocks, like glass, were viable middle blocks when they shouldn't have been. | ||||
| * | | Renamed g_TorchPlaceable... | Tiger Wang | 2014-01-11 | 6 | -71/+71 |
| | | | | | | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin | ||||
| * | | Fixed doors, fixes #453 | Tiger Wang | 2014-01-10 | 1 | -38/+8 |
| | | | |||||
| * | | Major refactoring of redstone | Tiger Wang | 2014-01-10 | 4 | -186/+181 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a refactoring of the redstone code, mainly the functions handling the removal of invalid blocks from power supplier data structures. Its aim is to improve performance and potentially reduce the memory footprint of the data structures. It works to reduce the amount of GetBlock()s triggered every tick. Before, a GetBlock() was requested for every single item in the data lists, as well as for every single redstone block in a chunk. Following these changes, the AddBlock() event is utilised more effectively to only update the lists when needed (a block is changed), as well as to insert the block type (and update it when needed) alongside the coordinates into the main redstone simulator chunkdata list. In short, a single GetBlock() is now cached, with this cache being updated when the simulator is awoken due to a block change. At least, I *hope* that this is what it does :P | ||||
* | | | Merge pull request #533 from mc-server/CmakeMultiConfig | Mattes D | 2014-01-12 | 2 | -46/+109 |
|\ \ \ | | | | | | | | | Cmake multi config | ||||
| * | | | Ignore Win32 .idb files. | madmaxoft | 2014-01-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch master into CmakeMultiConfig. | madmaxoft | 2014-01-12 | 156 | -2755/+2980 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Disabled a useless MSVC warning in Bindings.cpp. | madmaxoft | 2014-01-12 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #532 from mc-server/LuaStateErrorHandler | Mattes D | 2014-01-12 | 6 | -256/+130 |
|\ \ \ \ | | | | | | | | | | | Lua state error handler | ||||
| * | | | | Lua errors display stack trace. | madmaxoft | 2014-01-11 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | Fixes #418. | ||||
| * | | | | Removed internal methods from public cLuaState interface. | madmaxoft | 2014-01-11 | 3 | -119/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PushFunction(), CallFunction() and GetReturn() are not to be called independently, but rather only by using the Call() templated overrides. Push() needs to be left in the public part, it is used for pushing results in the ManualBindings. Preparation for #418. | ||||
| * | | | | Removed an unused file. | madmaxoft | 2014-01-11 | 3 | -134/+0 |
| | | | | | |||||
* | | | | | Merge pull request #526 from mc-server/IniFileFix | Mattes D | 2014-01-12 | 3 | -48/+81 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed cIniFile's SetValue(). | ||||
| * | | | | | Fixed reading the files. | madmaxoft | 2014-01-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Duplicate values were ignored. | ||||
| * | | | | | Documented the cIniFile:AddValue* functions. | madmaxoft | 2014-01-11 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Now the documentation really matches the implementation. | ||||
| * | | | | | IniFile: Split SetValue() into AddValue() and SetValue(). | madmaxoft | 2014-01-11 | 2 | -39/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | Each function does what one would assume - AddValue adds a new value, SetValue overwrites existing value (creates a new one if not exists, if instructed to do so). | ||||
| * | | | | | Merge branch 'master' into IniFileFix | madmaxoft | 2014-01-11 | 4 | -2/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed cIniFile's SetValue(). | madmaxoft | 2014-01-10 | 1 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | How did we not see this earlier? Each call to SetValue would actually ADD a value! | ||||
* | | | | | | | Merge pull request #527 from derouinw/biomessplit | Mattes D | 2014-01-11 | 10 | -223/+252 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Biomessplit | ||||
| * | | | | | | Globals.h needs to be first include | Bill Derouin | 2014-01-10 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Include Biome enum in ChunkDef | Bill Derouin | 2014-01-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can't forward declare an enum | ||||
| * | | | | | | Added newlines at ends of files | Bill Derouin | 2014-01-10 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Added files to VC2013 project file | Bill Derouin | 2014-01-10 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Fixed missing externals | Bill Derouin | 2014-01-10 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out you actually have to include the .cpp in the project file | ||||
| * | | | | | | Move biome definition to separate files | Bill Derouin | 2014-01-09 | 9 | -223/+246 |
| | | | | | | | |||||
* | | | | | | | Removed unused variables. | madmaxoft | 2014-01-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Lua API calls had no side-effects, either. | ||||
* | | | | | | | Fixed the warning in CryptoPP. | madmaxoft | 2014-01-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was getting on my nerves too much, decided to actually fix their code. | ||||
* | | | | | | | Merge pull request #530 from mc-server/GeneratorDecouple | Mattes D | 2014-01-11 | 10 | -50/+188 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Decoupled cChunkGenerator from cWorld and cRoot. | ||||
| * | | | | | | | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 10 | -50/+188 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | | | | | | | Merge pull request #531 from xdot/master | Mattes D | 2014-01-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed glowstone drop count | ||||
| * | | | | | | | Fixed glowstone drop count | andrew | 2014-01-11 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #522 from mc-server/LuaDlFix | Mattes D | 2014-01-10 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Lua dl fix | ||||
| * | | | | | | Using dlopen() on all platforms except WIN32. | madmaxoft | 2014-01-10 | 1 | -5/+1 |
| | | | | | | | |||||
| * | | | | | | Fixed a typo in the TestLuaRocks test plugin. | madmaxoft | 2014-01-09 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Specified the dynamic loader Lua should use. | madmaxoft | 2014-01-09 | 1 | -0/+9 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Fixed generator adding values to ini file. | madmaxoft | 2014-01-10 | 2 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #520 from mc-server/SoulSand | Mattes D | 2014-01-10 | 2 | -1/+17 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | | | NetherGen: Now generates SoulSand. | ||||
| * | | | | Fixed recurring pattern. | STRWarrior | 2014-01-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed chunk borders. | STRWarrior | 2014-01-09 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Speed-up. I got about 40 extra ch/s | STRWarrior | 2014-01-08 | 1 | -9/+14 |
| | | | | | |||||
| * | | | | WormNestCaves now remove soul sand. | STRWarrior | 2014-01-08 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | NetherGen: Now generates SoulSand. | STRWarrior | 2014-01-08 | 1 | -1/+11 |
| | | | | | |||||
* | | | | | BiomeVisualiser: Added zooming using the 1 - 8 keys. | Matyas Dolak | 2014-01-10 | 6 | -20/+76 |
| |_|/ / |/| | | | |||||
* | | | | Debuggers: Test code for WECUI plugin messaging. | madmaxoft | 2014-01-09 | 1 | -0/+17 |
| | | | | |||||
* | | | | Exported cClientHandle::SendPluginMessage() to Lua. | madmaxoft | 2014-01-09 | 1 | -0/+30 |
| | | | | |||||
* | | | | Fixed wrong packet number for PluginMessage packet. | madmaxoft | 2014-01-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 9 | -0/+50 |
| | | | | | | | | | | | | | | | | It is not yet exported in the API, though. | ||||
* | | | | Composition generator creating moved to a separate function. | madmaxoft | 2014-01-09 | 2 | -61/+83 |
| | | | | | | | | | | | | | | | | Also it forces the defaults into the INI file. | ||||
* | | | | Height generator creating moved info HeiGen.cpp. | madmaxoft | 2014-01-09 | 3 | -54/+82 |
| | | | | | | | | | | | | | | | | The generator also explicitly sets the default back into the INI file. | ||||
* | | | | Windows nightbuild updated to generate .example.ini files. | madmaxoft | 2014-01-09 | 3 | -7/+51 |
| | | | | | | | | | | | | | | | | Fixes #314. | ||||
* | | | | Merge pull request #517 from derouinw/master | Mattes D | 2014-01-09 | 1 | -0/+13 |
|\ \ \ \ | |_|/ / |/| | | | Add missing plugin error | ||||
| * | | | A couple touchups | Bill Derouin | 2014-01-08 | 1 | -2/+3 |
| | | | | |||||
| * | | | Add missing plugin error | Bill Derouin | 2014-01-07 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a plugin was included but the folder had no lua files, the error given was ambiguous. Now, it explicitly describes lack of lua files. See issue #512 P.S. This probably isn't the best way, but this is where the fix can be made. | ||||
* | | | | Added a known working favicon. | madmaxoft | 2014-01-08 | 1 | -0/+0 |
| | | | | |||||
* | | | | ProtoProxy: Fixed favicon relaying. | madmaxoft | 2014-01-08 | 1 | -2/+2 |
| |/ / |/| | | | | | | | | The buffer was too small for the favicon; now it's dynamic. | ||||
* | | | Fixed AppendVPrintf() handling for large strings. | madmaxoft | 2014-01-08 | 1 | -6/+4 |
| | | | | | | | | | | | | This caused a failure in server favicons. | ||||
* | | | Merge pull request #519 from mc-server/sigterm | Mattes D | 2014-01-08 | 2 | -0/+5 |
|\ \ \ | |/ / |/| | | Graceful shutdown on SIGTERM | ||||
| * | | Updated Core | Tiger Wang | 2014-01-07 | 1 | -0/+0 |
| | | | |||||
| * | | Graceful shutdown on SIGTERM | Tiger Wang | 2014-01-07 | 1 | -0/+5 |
| | | | |||||
* | | | Removed bitdeli badge - we have GitHub analytics now. | Alexander Harkness | 2014-01-07 | 1 | -3/+0 |
|/ / | |||||
* | | Updated submodules | Tiger Wang | 2014-01-07 | 2 | -0/+0 |
| | | |||||
* | | Merge pull request #516 from mc-server/favicon | Alexander Harkness | 2014-01-07 | 4 | -18/+8 |
|\ \ | | | | | | | Fixed favicons | ||||
| * | | Fixed favicons | Tiger Wang | 2014-01-07 | 4 | -18/+8 |
| | | | |||||
* | | | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 9 | -25/+80 |
|/ / | | | | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | | Merge pull request #514 from derouinw/master | Mattes D | 2014-01-07 | 3 | -0/+20 |
|\ \ | | | | | | | Implement favicon for 1.7.2 | ||||
| * | | Avoid making copies of favicon string | Bill Derouin | 2014-01-07 | 2 | -2/+2 |
| | | | |||||
| * | | A few more touch ups | Bill Derouin | 2014-01-07 | 2 | -12/+2 |
| | | | |||||
| * | | A few touch ups | Bill Derouin | 2014-01-07 | 2 | -2/+5 |
| | | | |||||
| * | | Removed unused line | Bill Derouin | 2014-01-07 | 1 | -1/+0 |
| | | | |||||
| * | | Implement favicon for 1.7.2 | Bill Derouin | 2014-01-07 | 4 | -0/+28 |
| | | | | | | | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet | ||||
* | | | Disabled an unneeded MSVC warning. | madmaxoft | 2014-01-07 | 1 | -4/+7 |
| | | | | | | | | | | | | Also sorted the enabled warnings by their numerical code for easier searching.. | ||||
* | | | Removed a debugging log output in cPluginManager:AddHook(). | madmaxoft | 2014-01-07 | 1 | -1/+0 |
| | | | |||||
* | | | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 9 | -11/+11 |
| | | | |||||
* | | | LuaState can push strings with embedded NULs. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
| | | | | | | | | | | | | This also marginally improves performance, since a strlen() isn't called (inside lua_pushstring()), the string length is stored in the AString object directly. | ||||
* | | | Merge pull request #513 from worktycho/FreeBSDDynamicLink | Mattes D | 2014-01-07 | 4 | -343/+13 |
|\ \ \ | | | | | | | | | Fixed FreeBSD dynamic linker library | ||||
| * | | | Fixed FreeBSD compilition | Tycho | 2014-01-07 | 3 | -2/+13 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-01-07 | 33 | -97/+662 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-01-04 | 7 | -140/+216 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tolua++/Makefile | ||||
| * | | | | | removed tolua++ makefile which is overwritten by cmake | Tycho | 2014-01-03 | 1 | -338/+0 |
| | | | | | | |||||
* | | | | | | Update CONTRIBUTING.md | Mattes D | 2014-01-07 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | Added control statement braces and end-of-file blank lines. | ||||
* | | | | | | Regenerated VS2013 files | Tiger Wang | 2014-01-07 | 6 | -38/+47 |
| | | | | | | |||||
* | | | | | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 8 | -18/+21 |
| |_|/ / / |/| | | | | |||||
* | | | | | Added Base64Encode(). | madmaxoft | 2014-01-07 | 2 | -0/+51 |
| | | | | | |||||
* | | | | | Disabled the type conversion MSVC warning. | madmaxoft | 2014-01-06 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | It was hitting way too many false positives. | ||||
* | | | | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-06 | 11 | -16/+12 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #511 from mc-server/CmakeOutput | Mattes D | 2014-01-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Output dir set to $/MCServer. | ||||
| * | | | | Output dir set to $/MCServer. | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Ref.: #510. | ||||
* | | | | | Merge pull request #509 from Diusrex/master | Mattes D | 2014-01-06 | 8 | -6/+89 |
|\ \ \ \ \ | | | | | | | | | | | | | Added #pragma for warnings in MSVC warnings | ||||
| * | | | | | Undid the changes to cryptlib.cpp. | Diusrex | 2014-01-06 | 2 | -11/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, altered the VC2008 cryptopp project settings. Someone else will probably need to do the same thing for the 2013 version, since I don't have access to VC2013. | ||||
| * | | | | | Added fake functions into cCriticalSection because of the change to ASSERT | Diusrex | 2014-01-05 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Changed the release version of ASSERT. | Diusrex | 2014-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This was so a variable only used in ASSERT statements will not give a warning about not being used. | ||||
| * | | | | | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h | Diusrex | 2014-01-05 | 6 | -3/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings. So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function. | ||||
| * | | | | | Making all of the useful level 4 warnings be active. | Diusrex | 2014-01-05 | 1 | -1/+13 |
| | | | | | | |||||
* | | | | | | Exported cWorld::BroadcastBlockAction(). | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | As requested in #508; no guarantees about it. | ||||
* | | | | | | InfoDump: Removes indent and parses ParameterCombinations. | madmaxoft | 2014-01-06 | 1 | -8/+27 |
| |/ / / / |/| | | | | | | | | | | | | | | The DetailedHelp was a bad name for what it really contained, so it has been renamed to ParameterCombinations. | ||||
* | | | | | Fixed wrong enqueueing. | madmaxoft | 2014-01-06 | 1 | -2/+9 |
|/ / / / | | | | | | | | | | | | | Fixes #505. | ||||
* | | | | Fixed cPluginManager:AddHook() binding. | madmaxoft | 2014-01-05 | 5 | -11/+37 |
| | | | | | | | | | | | | | | | | Fixes #401. Old formats are still accepted, for compatibility reasons. | ||||
* | | | | Fixed a race condition in the cQueue class. | madmaxoft | 2014-01-05 | 2 | -59/+90 |
| | | | | | | | | | | | | | | | | Fixes #505. | ||||
* | | | | InfoDump: Removed an unneeded function. | madmaxoft | 2014-01-05 | 1 | -28/+0 |
| | | | | |||||
* | | | | Fix #506 | Alexander Harkness | 2014-01-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | InfoDump: All reasonable strings are forumized. | madmaxoft | 2014-01-04 | 1 | -5/+5 |
| | | | | |||||
* | | | | Added forum output for commands' DetailedHelp array. | madmaxoft | 2014-01-04 | 1 | -2/+31 |
| | | | | | | | | | | | | | | | | Also added some coloring to simulate syntax highlighting. | ||||
* | | | | InfoDump: Implemented list and formatting Forumizing. | madmaxoft | 2014-01-04 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | The exported strings are now parsed for basic formatting and list-related tags. | ||||
* | | | | added supported protocol | Alexander Harkness | 2014-01-04 | 1 | -0/+2 |
| | | | | |||||
* | | | | InfoDump: added AdditionalInfo to forum dumps. | madmaxoft | 2014-01-04 | 1 | -4/+47 |
| | | | | |||||
* | | | | Added an InfoDump script for dumping all plugins' Info.lua into forum description. | madmaxoft | 2014-01-04 | 2 | -0/+299 |
| |/ / |/| | | | | | | | | GitHub description will follow later on. | ||||
* | | | Merge pull request #494 from worktycho/threadsafequeue | Mattes D | 2014-01-04 | 7 | -140/+215 |
|\ \ \ | | | | | | | | | refactored the chunk queue into a seperate class | ||||
| * | | | Fixed Documentation | Tycho | 2014-01-03 | 1 | -4/+2 |
| | | | | |||||
| * | | | derp | Tycho | 2014-01-03 | 2 | -1/+4 |
| | | | | |||||
| * | | | actual fix | Tycho | 2014-01-03 | 1 | -2/+9 |
| | | | | |||||
| * | | | fixed failure to return a value from Remove | Tycho | 2014-01-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | implement xsofts recommendations | Tycho Bickerstaff | 2014-01-03 | 1 | -9/+15 |
| | | | | |||||
| * | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2014-01-02 | 10 | -315/+231 |
| |\| | | |||||
| * | | | added documentation | Tycho Bickerstaff | 2014-01-02 | 1 | -7/+45 |
| | | | | |||||
| * | | | 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 | 6 | -121/+24 |
| | | | | |||||
| * | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-31 | 14 | -980/+190 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/OSSupport/Queue.h | ||||
| * | | | | fogot to add promise classes | Tycho Bickerstaff | 2013-12-31 | 2 | -0/+92 |
| | | | | | |||||
| * | | | | clean up code for patching | Tycho Bickerstaff | 2013-12-31 | 3 | -3/+5 |
| | | | | | |||||
| * | | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-31 | 22 | -95/+70 |
| |\ \ \ \ | |||||
| * | | | | | refactored chunk Queue to seperate class | Tycho Bickerstaff | 2013-12-31 | 7 | -124/+162 |
| | | | | | | |||||
| * | | | | | added link dependency between WorldStorage and OSSupport | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | added mergetool files to gitignore | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 25 | -83/+92 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 95 | -485/+2920 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | basic threadsafe queue interface | Tycho Bickerstaff | 2013-12-21 | 2 | -0/+34 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #502 from bitdeli-chef/master | Alexander Harkness | 2014-01-04 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Add a Bitdeli Badge to README | ||||
| * | | | | | | | Add a Bitdeli badge to README | Bitdeli Chef | 2014-01-04 | 1 | -0/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge remote-tracking branch 'origin/master' | Tau | 2014-01-02 | 1 | -2/+6 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #499 from worktycho/master | Mattes D | 2014-01-02 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fixed compiler warnings not being enabled in clang | ||||
| | * | | | | | | | fixed compiler warnings not being enabled in clang | Tycho Bickerstaff | 2014-01-02 | 1 | -2/+6 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
* | / | | | | | | [Handy] updated for new API, fixed bugs, added warnings. Now v2. | Tau | 2014-01-02 | 2 | -284/+145 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #479 from mc-server/cmake-win | Mattes D | 2014-01-02 | 2 | -18/+30 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Cmake-win | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into cmake-win | madmaxoft | 2013-12-28 | 10 | -169/+304 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added support for out-of-source builds. | madmaxoft | 2013-12-28 | 2 | -18/+30 |
| | | | | | | | | | |||||
* | | | | | | | | | More memory alignment fixes. | madmaxoft | 2014-01-02 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #420. | ||||
* | | | | | | | | | Fixed unaligned memory access in FastNBT. | madmaxoft | 2014-01-02 | 3 | -5/+44 |
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | This should fix #420. | ||||
* | | | | | | | | Merge pull request #484 from worktycho/cmake-fixes | Alexander Harkness | 2014-01-01 | 4 | -953/+41 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fixes for mac os x | ||||
| * \ \ \ \ \ \ \ | merged changes from upstream | Tycho Bickerstaff | 2013-12-31 | 12 | -29/+181 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'FishingHook' | madmaxoft | 2014-01-01 | 10 | -1/+151 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Little more documentation for OnPlayerFishing. | STRWarrior | 2014-01-01 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Using documentation Xoft recommended. | STRWarrior | 2014-01-01 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | OnPlayerFishing doesn't have a const cItems anymore | STRWarrior | 2014-01-01 | 5 | -5/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed typo's in the documentation. | STRWarrior | 2014-01-01 | 2 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | implemented the recommendations Xoft gave. | STRWarrior | 2013-12-31 | 7 | -12/+25 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Documented OnPlayerFished and OnPlayerFishing. | STRWarrior | 2013-12-31 | 2 | -0/+41 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Implented OnPlayerFishing and OnPlayerFished. | STRWarrior | 2013-12-30 | 6 | -1/+97 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #497 from xdot/master | Alexander Harkness | 2014-01-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed GetPhysicalRAMUsage on Linux | ||||
| * | | | | | | | | | | Fixed GetPhysicalRAMUsage on Linux | andrew | 2014-01-01 | 1 | -2/+2 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #480 from mc-server/CmakeNonMixed | Mattes D | 2013-12-31 | 1 | -26/+29 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | CMake: Fixed mismatching library vs app builds. | ||||
| | | * | | | | | | | Merge branch 'master' into cmake-fixes | Tycho Bickerstaff | 2013-12-31 | 15 | -16/+57 |
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | removed unneccisary cast | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed warnings in LineBlockTracer.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed warnings in LightingThread.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | take Z axis into account when calculating neighboors in LightingThread::ChunkReady | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 4 | -6/+34 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixxed warnings in Server.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed warnings in Inventory.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed warnings in bytebuffer.cpp | Tycho Bickerstaff | 2013-12-31 | 2 | -4/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed ClientHandle warnings | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed warnings in webadmin.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fixed warnings in BlockArea.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #488 from Diusrex/master | Mattes D | 2013-12-31 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Fixed cPlayer::IsGameModeAdventure. | ||||
| * | | | | | | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. | Morgan Redshaw | 2013-12-31 | 2 | -2/+3 |
|/ / / / / / / / / | |||||
| | * | | | | | | | fixed bad merge | Tycho Bickerstaff | 2013-12-22 | 1 | -4/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | merged in more warning fixes | Tycho Bickerstaff | 2013-12-22 | 2 | -3/+2 |
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 7 | -79/+13 |
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Also removed an unused inline header file (yuck). | ||||
| | * | | | | | | merged in changes | Tycho Bickerstaff | 2013-12-22 | 3 | -2/+12 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 17 | -93/+100 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 95 | -485/+2920 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Chunk is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 4 | -6/+5 |
| | | | | | | | | |||||
* | | | | | | | | fixed hidden bug with furnaces ignoring time burnt | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes this did not cause a problem as this function was only called with the same value as the one it was using for time burnt | ||||
* | | | | | | | | Root is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 8 | -30/+32 |
| | | | | | | | | |||||
* | | | | | | | | Piston is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 5 | -6/+6 |
| | | | | | | | | |||||
* | | | | | | | | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 6 | -9/+10 |
| |_|_|_|_|/ / |/| | | | | | | |||||
| | | * | | | | merged in warnings changes | Tycho Bickerstaff | 2013-12-22 | 27 | -97/+94 |
| | | | | | | | |||||
| | | * | | | | removed lua makefile | Tycho Bickerstaff | 2013-12-22 | 1 | -944/+0 |
| | | | | | | | |||||
| | | * | | | | fixed accedental commit | Tycho Bickerstaff | 2013-12-22 | 1 | -2/+1 |
| | | | | | | | |||||
| | | * | | | | fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not | Tycho Bickerstaff | 2013-12-22 | 4 | -62/+33 |
| | | | | | | | |||||
| | | * | | | | fixes for mac os x | Tycho Bickerstaff | 2013-12-22 | 1 | -4/+8 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Update GETTING-STARTED.md | Alexander Harkness | 2013-12-30 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Create GETTING-STARTED.md | Alexander Harkness | 2013-12-30 | 1 | -0/+119 |
| | | | | | | |||||
| * | | | | | APIDump: Fixed a factual error in OnPluginsLoaded description. | madmaxoft | 2013-12-29 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | APIDump: Static files overwrite their destination. | madmaxoft | 2013-12-29 | 1 | -5/+13 |
| | | | | | | |||||
| * | | | | | APIDump: The PRE html tag has tab width set to 2 spaces. | madmaxoft | 2013-12-29 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | APIDump: Documented OnPluginsLoaded. | madmaxoft | 2013-12-29 | 1 | -0/+79 |
| | | | | | | |||||
| * | | | | | Added HOOK_PLUGINS_LOADED. | madmaxoft | 2013-12-29 | 7 | -3/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes #482. | ||||
| * | | | | | Merge pull request #481 from MikeHunsinger/master | Mattes D | 2013-12-29 | 2 | -3/+49 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added function to create large birch tree images in birch forests | ||||
| | * | | | | | Added function to create Tall Birch tree in BirchTreeForest biomes | Mike Hunsinger | 2013-12-29 | 2 | -3/+49 |
| | | |_|/ / | | |/| | | | |||||
| * / | | | | Fixed a (valid) warning in RCONServer. | madmaxoft | 2013-12-28 | 1 | -0/+3 |
| |/ / / / | |||||
| | | | * | Fixed Linux configuration. | madmaxoft | 2013-12-29 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Ignore profile build folders created by MSVC build. | madmaxoft | 2013-12-28 | 1 | -0/+22 |
| | | | | | |||||
| | | | * | CMake: profiling builds get correct commandlines in MSVC. | madmaxoft | 2013-12-28 | 1 | -64/+80 |
| | | | | | |||||
| | | | * | Added custom configurations for MSVC projects. | madmaxoft | 2013-12-28 | 1 | -19/+43 |
| | | |/ | | |/| | | | | | | | | | The DebugProfile and ReleaseProfile configurations add profiling capabilities to the respective build. | ||||
| | * | | CMake: Fixed mismatching library vs app builds. | madmaxoft | 2013-12-28 | 1 | -26/+29 |
| |/ / | |||||
| * | | Fixed the Windows script for uploading Lua API to an FTP server. | madmaxoft | 2013-12-28 | 2 | -1/+2 |
| | | | | | | | | | | | | The new script handles subfolders, too. | ||||
| * | | APIDump: Added the SettingUpDecoda article. | madmaxoft | 2013-12-27 | 5 | -0/+50 |
| | | | | | | | | | | | | This implements #383. | ||||
| * | | APIDump: Articles eplicitly declare being UTF-8. | madmaxoft | 2013-12-27 | 2 | -0/+2 |
| | | | | | | | | | | | | This fixes display in firefox. | ||||
| * | | APIDump: Added quick links to index to each class and hook file. | madmaxoft | 2013-12-27 | 1 | -2/+14 |
| | | | | | | | | | | | | Third part of #403. | ||||
| * | | APIDump: Added a quick-nav menu to hook descriptions. | madmaxoft | 2013-12-27 | 1 | -7/+22 |
| | | | | | | | | | | | | Second part of #403. | ||||
| * | | APIDump: Added a quick-nav menu to class descriptions. | madmaxoft | 2013-12-27 | 1 | -6/+22 |
| | | | | | | | | | | | | First part of #403. | ||||
| * | | APIDump: Split the huge DumpAPIHtml function into smaller ones. | madmaxoft | 2013-12-27 | 1 | -47/+61 |
| | | | |||||
| * | | APIDump: Extra pages renamed to articles and moved to front. | madmaxoft | 2013-12-27 | 1 | -24/+39 |
| | | | |||||
| * | | APIDump: Fixed the WritingPlugin article. | madmaxoft | 2013-12-27 | 1 | -98/+107 |
| | | | | | | | | | | | | The code is no longer weirdly indented in the browser, and links are relative to the API docs root. | ||||
| * | | APIDump: Added the WritingPlugin article to the exported pages. | madmaxoft | 2013-12-27 | 1 | -0/+1 |
| | | | |||||
| * | | APIDump: Fixed bad for-loop. | madmaxoft | 2013-12-27 | 1 | -3/+3 |
| | | | | | | | | | | | | How did I not see this before? | ||||
| * | | Merge pull request #477 from mc-server/cmake-win | Mattes D | 2013-12-27 | 9 | -78/+156 |
| |\| | | | | | | | Cmake-win | ||||
| | * | Lua is built statically on *nix. | madmaxoft | 2013-12-27 | 1 | -1/+6 |
| | | | |||||
| | * | Fixed unix Lua dependencies. | madmaxoft | 2013-12-27 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' into cmake-win | madmaxoft | 2013-12-27 | 5 | -53/+366 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #476 from mc-server/apidump-writingplugin | Alexander Harkness | 2013-12-26 | 3 | -49/+310 |
| |\ \ | | | | | | | | | Writing a plugin APIDump article (#382) | ||||
| | * | | Writing a plugin APIDump article (#382) | Tiger Wang | 2013-12-26 | 3 | -49/+310 |
| |/ / | |||||
| * | | Merge pull request #474 from mc-server/deathmessages | Mattes D | 2013-12-26 | 1 | -0/+16 |
| |\ \ | | | | | | | | | Server now produces more detailed death messages | ||||
| | * | | Server now handles death messages | Tiger Wang | 2013-12-26 | 1 | -0/+16 |
| |/ / | |||||
| * | | Merge pull request #472 from mc-server/Extreme_Hills_M | Mattes D | 2013-12-26 | 1 | -4/+40 |
| |\ \ | | | | | | | | | Extreme hills | ||||
| | * | | Simplefied Extreme Hills M pattern select. | STRWarrior | 2013-12-26 | 1 | -11/+3 |
| | | | | |||||
| | * | | Extreme Hills M biomes now generate gravel, stone and grass patterns. | STRWarrior | 2013-12-25 | 1 | -2/+10 |
| | | | | |||||
| | * | | Changed tbGravel. Vanilla has 3 layers of gravel and then stone. | STRWarrior | 2013-12-25 | 1 | -3/+3 |
| | | | | |||||
| | * | | Normal extreme hills (plus) now generate a stone/grass pattern. | STRWarrior | 2013-12-25 | 1 | -2/+20 |
| | | | | |||||
| | * | | Re-added empty line. | STRWarrior | 2013-12-25 | 1 | -0/+1 |
| | | | | |||||
| | * | | This generates gravel in Extreme Hills M biomes. | STRWarrior | 2013-12-25 | 2 | -3/+20 |
| | | | | |||||
| | | * | Made cmake compilation possible on Windows. | madmaxoft | 2013-12-27 | 8 | -35/+72 |
| | | | | |||||
| | | * | Added proper precompiled headers for MSVC. | madmaxoft | 2013-12-26 | 1 | -48/+47 |
| | | | | |||||
| | | * | Added cmake output folders (VC2008) to gitignore. | madmaxoft | 2013-12-26 | 1 | -0/+37 |
| | |/ | |/| | |||||
| * | | cBlockArea: Fixed writing full-height areas. | madmaxoft | 2013-12-26 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #461 from mc-server/repeaters | Mattes D | 2013-12-26 | 7 | -47/+314 |
| |\ \ | | |/ | |/| | Repeaters, pressure plates, and others | ||||
| | * | Moved increment operator to back of variables | Tiger Wang | 2013-12-26 | 1 | -9/+9 |
| | | | |||||
| | * | Fixed rails not updating with diagonals | Tiger Wang | 2013-12-25 | 1 | -0/+34 |
| | | | |||||
| | * | Braced up some code | Tiger Wang | 2013-12-25 | 1 | -0/+2 |
| | | | |||||
| | * | Used IsGamemodeCreative() function | Tiger Wang | 2013-12-25 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed comments in main.cpp and Player.cpp | Tiger Wang | 2013-12-24 | 2 | -2/+2 |
| | | | |||||
| | * | Implemented stone and wooden pressure plates | Tiger Wang | 2013-12-24 | 2 | -3/+105 |
| | | | |||||
| | * | Improved knockback animation | Tiger Wang | 2013-12-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | * Critical hits now actually increase damage * Looking down at an entity and hitting them still produces upwards motion (as per Vanilla experience) * Reduced force to be more realistic | ||||
| | * | Improved player fall particle positions | Tiger Wang | 2013-12-23 | 1 | -5/+2 |
| | | | |||||
| | * | Provides an enhancement to daylight sensors | Tiger Wang | 2013-12-23 | 1 | -2/+27 |
| | | | |||||
| | * | Clarified some code in Player.cpp | Tiger Wang | 2013-12-23 | 1 | -2/+5 |
| | | | |||||
| | * | Fixed a comment in Entity.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | | | |||||
| | * | Added some comments in main.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | | | |||||
| | * | Daylight sensor sensing enhancement | Tiger Wang | 2013-12-23 | 1 | -9/+11 |
| | | | |||||
| | * | A fix for daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+3 |
| | | | |||||
| | * | Implemented knockback and critical hit | Tiger Wang | 2013-12-22 | 1 | -4/+21 |
| | | | |||||
| | * | Added many event catchers | Tiger Wang | 2013-12-22 | 2 | -20/+78 |
| | | | | | | | | | | | | | | | | | | * Window close * CTRL-C * etc. | ||||
| | * | Implemented fall particles | Tiger Wang | 2013-12-22 | 1 | -3/+18 |
| | | | |||||
| | * | Daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+1 |
| | | | |||||
| | * | Fixed them again, confound it | Tiger Wang | 2013-12-22 | 1 | -9/+21 |
| | | | |||||
| * | | Merge pull request #471 from mc-server/Fishing_Catapult | Mattes D | 2013-12-25 | 3 | -38/+206 |
| |\ \ | | | | | | | | | You are now able to sweep mobs to your position using fishing rods. | ||||
| | * | | Fixed Parentheses. | STRWarrior | 2013-12-25 | 1 | -2/+2 |
| | | | | |||||
| | * | | You are now able to sweep mobs to your position using fishing rods. | STRWarrior | 2013-12-25 | 3 | -38/+206 |
| | | | | |||||
| * | | | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 3 | -9/+65 |
| |\ \ \ | |||||
| | * | | | (Hopefully) fixed if conditions | tonibm19 | 2013-12-25 | 1 | -4/+1 |
| | | | | | |||||
| | * | | | Implemented xoft suggestion (partly) | tonibm19 | 2013-12-25 | 1 | -25/+29 |
| | | | | | | | | | | | | | | | I only get it working in first condition. It seems it's not compatible with else if... | ||||
| | * | | | BLOCKTYPE... | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fixed compilation | tonibm19 | 2013-12-24 | 1 | -29/+9 |
| | | | | | |||||
| | * | | | Implemented xoft suggestion | tonibm19 | 2013-12-24 | 1 | -7/+11 |
| | | | | | |||||
| | * | | | Using BLOCKTYPE instead of int | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Added myself to contributors | tonibm19 | 2013-12-24 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Fixed comments | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | | |||||
| | * | | | Changed a little how detection works and added comments. | tonibm19 | 2013-12-24 | 1 | -28/+31 |
| | | | | | |||||
| | * | | | Storing Y -1 and -2 blocks in a variable | tonibm19 | 2013-12-24 | 1 | -5/+7 |
| | | | | | |||||
| | * | | | Using parenthesis | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | | |||||
| | * | | | Fixed a possible crash | tonibm19 | 2013-12-24 | 1 | -39/+42 |
| | | | | | |||||
| | * | | | Improved iron golem detection algorithm | tonibm19 | 2013-12-23 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | | | | | - You need to make it like in vanilla - Only used blocks are removed | ||||
| | * | | | Some fixes (SEE DESC) | tonibm19 | 2013-12-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn | ||||
| | * | | | You can now spawn iron golems. | tonibm19 | 2013-12-23 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | You can spawn them like in vanilla. | ||||
| * | | | | Fixed block area height check. | madmaxoft | 2013-12-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | The block area couldn't be read up to chunk height. | ||||
| * | | | | Merge pull request #470 from mc-server/mobileentitysaving | Alexander Harkness | 2013-12-25 | 4 | -13/+790 |
| |\ \ \ \ | | |_|/ / | |/| | | | Preliminary mobile entity saving | ||||
| | * | | | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 4 | -13/+790 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
| * | | | Merge pull request #469 from mc-server/Android_Update | Tiger Wang | 2013-12-24 | 5 | -23/+34 |
| |\ \ \ | | | | | | | | | | | Android update | ||||
| | * | | | Removed unneeded include. | STRWarrior | 2013-12-24 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Fixed getting configure button going to port 0. | STRWarrior | 2013-12-24 | 3 | -7/+12 |
| | | | | | |||||
| | * | | | Added the list_item.xml | STRWarrior | 2013-12-24 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | Just a quick update for the files you need to compile for Android. | STRWarrior | 2013-12-23 | 2 | -20/+20 |
| | |/ / | |||||
| * | | | Merge pull request #468 from mc-server/colourchange | Alexander Harkness | 2013-12-24 | 5 | -27/+15 |
| |\ \ \ | | | | | | | | | | | Update chat colours | ||||
| | * | | | removed the function def also | Alexander Harkness | 2013-12-24 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Finally removed the function. | Alexander Harkness | 2013-12-24 | 1 | -6/+0 |
| | | | | | |||||
| | * | | | Removed documentation for cChatColour:MakeColor() | Alexander Harkness | 2013-12-24 | 1 | -7/+3 |
| | | | | | |||||
| | * | | | fixed compile? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | finally removed them all? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | updated another file... | Alexander Harkness | 2013-12-24 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Updated MakeColour's defenition in the header. | Alexander Harkness | 2013-12-24 | 1 | -9/+9 |
| | | | | | |||||
| | * | | | Update as per xoft's instructions. | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update chat colours | Alexander Harkness | 2013-12-24 | 1 | -3/+2 |
| |/ / / | | | | | | | | | @madmaxoft, is this right? fixes #467 | ||||
| * | | | Merge pull request #466 from Sxw1212/master | Alexander Harkness | 2013-12-24 | 2 | -2/+6 |
| |\ \ \ | | | | | | | | | | | Fix error on MagicCarpet Disable | ||||
| | * | | | Add myself to CONTRIBUTORS to comply with the Apache License | Sam Mauldin | 2013-12-24 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Store plugin in a local variable to fix error on disable | Sam Mauldin | 2013-12-24 | 1 | -2/+5 |
| |/ / / | |||||
| * / / | Replaced esCreeper with esMonster. | madmaxoft | 2013-12-23 | 3 | -4/+7 |
| |/ / | | | | | | | | | | Any monster will be able to explode, and also this fixes #425. | ||||
| * | | Fixed bug where snowgolems could replace non-solid blocks to snow blocks. | STRWarrior | 2013-12-22 | 1 | -1/+3 |
| | | | |||||
| * | | Snow golems die in hot biomes and leave a snow trail. | STRWarrior | 2013-12-22 | 2 | -0/+18 |
| | | | |||||
| * | | You can spawn snow golems with snow blocks and pumpkins. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | |||||
| * | | EnderDragons and SnowGolems are able to spawn. | STRWarrior | 2013-12-22 | 1 | -0/+2 |
| | | | |||||
| * | | Fixed cacus breaking when next to any non-air block. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | Made the lure enchantment work. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed signedness warning in cItemGrid. | madmaxoft | 2013-12-22 | 2 | -4/+4 |
| | | | |||||
| * | | Merge pull request #462 from mc-server/1.7_Fishing | Mattes D | 2013-12-22 | 20 | -15/+167 |
| |\ \ | | | | | | | | | 1.7 fishing | ||||
| | * | | Fixed compiler warning. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fishing underground is slower and fishing while raining is faster. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | | |||||
| | * | | Fixed compiler warnings. | STRWarrior | 2013-12-22 | 1 | -2/+2 |
| | | | | |||||
| | * | | Countdown time is between 100 and 900 ticks. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fishing now uses a countdown instead of a random number each tick. | STRWarrior | 2013-12-22 | 2 | -12/+29 |
| | | | | |||||
| | * | | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 17 | -2/+122 |
| |/ / | |||||
| * | | Using regular assignments. | STRWarrior | 2013-12-21 | 1 | -6/+6 |
| | | | |||||
| * | | Once again better Y direction for the items given when fishing. | STRWarrior | 2013-12-21 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #460 from mc-server/Fishing_Items | Alexander Harkness | 2013-12-21 | 1 | -2/+108 |
| |\ \ | | | | | | | | | You are now able to get different items from fishing. | ||||
| | * | | You are now able to get different items from fishing. | STRWarrior | 2013-12-21 | 1 | -2/+108 |
| |/ / | |||||
| * | | Fixed a typo in .gitignore. | madmaxoft | 2013-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | The VC IntelliSense DB was getting through again. | ||||
| * | | Bindings regen script updated. | madmaxoft | 2013-12-21 | 1 | -11/+6 |
| | | | | | | | | | | | | The Bindings.cpp / .h files are no longer stored in the git repo. | ||||
| * | | Further updates for the win nightbuild script. | madmaxoft | 2013-12-21 | 1 | -25/+25 |
| | | | | | | | | | | | | | | | | | | The FTP variables needed are checked at the beginning. The tag file is stored in a per-month subfolder. The bindings are correctly regenerated. | ||||
| * | | Floater now dissapears when the player doesn't have an fishing rod equipped. | STRWarrior | 2013-12-21 | 2 | -0/+32 |
| | | | |||||
| * | | Fixed a file name. | Alexander Harkness | 2013-12-21 | 1 | -0/+0 |
| | | | |||||
| * | | Update COMPILING | worktycho | 2013-12-21 | 1 | -2/+2 |
| | | | | | | | | | fixed acouple of issues | ||||
| * | | Added info about 32 bit mode. | Alexander Harkness | 2013-12-21 | 1 | -0/+9 |
| | | | |||||
| * | | Merge pull request #457 from worktycho/master | Alexander Harkness | 2013-12-21 | 2 | -1/+16 |
| |\ \ | |/ / |/| | | Added an option to force 32 bit compiliton | ||||
* | | | added FORCE_32 option | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+15 |
| | | | |||||
* | | | hide lua shared library | Tycho Bickerstaff | 2013-12-21 | 1 | -0/+1 |
| | | | |||||
| * | | Update README.md | Alexander Harkness | 2013-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #456 from mc-server/uselessfiles | Alexander Harkness | 2013-12-21 | 8 | -50/+12 |
| |\ \ | | | | | | | | | Uselessfiles | ||||
| | * | | Moved some files. | Alexander Harkness | 2013-12-21 | 5 | -0/+0 |
| | | | | |||||
| | * | | Marked stats.cmd as executable so it can be run on linux | Alexander Harkness | 2013-12-21 | 1 | -0/+0 |
| | | | | |||||
| | * | | Update cloc-exclude.txt | Alexander Harkness | 2013-12-21 | 1 | -25/+11 |
| | | | | |||||
| | * | | Updated the stats.cmd file. | Alexander Harkness | 2013-12-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | Delete clean.bat | Alexander Harkness | 2013-12-21 | 1 | -24/+0 |
| | | | | |||||
| * | | | Update COMPILING | Alexander Harkness | 2013-12-21 | 1 | -5/+15 |
|/ / / | |||||
* | | | Merge pull request #446 from worktycho/cmake | Alexander Harkness | 2013-12-21 | 37 | -32566/+10155 |
|\ \ \ | | | | | | | | | Rebuild build system with cmake | ||||
| * | | | fixed lua dynamic library | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | finished up final build flags for linux | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+19 |
| | | | | |||||
| * | | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-21 | 3 | -5/+27 |
| |\ \ \ | |||||
| | * | | | added precompiled headers | tycho | 2013-12-20 | 1 | -13/+24 |
| | | | | | |||||
| | * | | | fixed include of math on windows | tycho | 2013-12-20 | 3 | -1/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 29 | -181/+238 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'master', remote-tracking branch 'upstream/master' | Tycho Bickerstaff | 2013-12-21 | 0 | -0/+0 |
| |/ / / |/| | | | |||||
* | | | | You could now only get fish from non-source blocks. Fixed it. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around. | STRWarrior | 2013-12-21 | 1 | -0/+5 |
| | | | | |||||
* | | | | Fixed bug where you could get fish from non-source blocks. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Updated the win nightbuild script with recent information. | madmaxoft | 2013-12-21 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | As requested in #455. | ||||
* | | | | Merge pull request #454 from mc-server/repeaters | Mattes D | 2013-12-21 | 3 | -12/+41 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | Fixed repeaters delay, maybe | ||||
| * | | Fixed repeaters delay, maybe | Tiger Wang | 2013-12-20 | 3 | -12/+41 |
|/ / | | | | | | | | | Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work. | ||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-12-20 | 10 | -98/+94 |
|\ \ | |||||
| * | | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 9 | -97/+92 |
| | | | |||||
| * | | Or not. Fixes #384 | Alexander Harkness | 2013-12-20 | 1 | -1/+2 |
| | | | |||||
* | | | Increased the range an Floater can shoot to. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
|/ / | |||||
* | | Fish now actualy jumps to the player instead of a few block bellow them. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | Fixed bug where the floater could pop in the water while you could already get a fish. | STRWarrior | 2013-12-20 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #452 from mc-server/apidumpe | Alexander Harkness | 2013-12-20 | 2 | -1/+7 |
|\ \ | | | | | | | Fix issue #384 | ||||
| * | | done... finally | Alexander Harkness | 2013-12-20 | 1 | -2/+2 |
| | | | |||||
| * | | fix the issues xoft pointed out | Alexander Harkness | 2013-12-20 | 1 | -5/+4 |
| | | | |||||
| * | | @madmaxoft now? | Alexander Harkness | 2013-12-20 | 1 | -3/+3 |
| | | | |||||
| * | | Possibly fixes #384 | Alexander Harkness | 2013-12-20 | 1 | -0/+6 |
| | | | | | | | | | @madmaxoft, is this the right syntax for lua for loops? | ||||
| * | | Create a static folder for adding static files. | Alexander Harkness | 2013-12-20 | 1 | -0/+1 |
| | | | | | | | | | .gitignore is basically just an empty file that might serve a purpose someday. | ||||
* | | | More reordering fixes. | madmaxoft | 2013-12-20 | 3 | -7/+16 |
|/ / | |||||
* | | Fixed a typo in cBlockArea merging code. | madmaxoft | 2013-12-20 | 1 | -2/+1 |
| | | |||||
* | | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 10 | -49/+57 |
| | | |||||
* | | Fixed minor warnings. | madmaxoft | 2013-12-20 | 2 | -5/+7 |
| | | |||||
| * | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 39 | -97/+114 |
| |\ | |/ |/| | |||||
* | | Fixed warnings in HTTP parser. | madmaxoft | 2013-12-20 | 4 | -5/+15 |
| | | |||||
* | | Attempt at fixing cChunkDef::Height signedness. | madmaxoft | 2013-12-20 | 4 | -21/+24 |
| | | |||||
* | | Properly fixed warnings in cFastRandom. | madmaxoft | 2013-12-20 | 1 | -4/+4 |
| | | |||||
* | | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 28 | -62/+66 |
| | | |||||
* | | Fixed melon and pumpkin growing. | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | Fixed missing parenthesis. | madmaxoft | 2013-12-20 | 1 | -4/+4 |
| | | |||||
| * | made LUA shared unless STATIC_LUA is set | Tycho Bickerstaff | 2013-12-20 | 1 | -0/+4 |
| | | |||||
| * | fixed lua dependency on libm | Tycho Bickerstaff | 2013-12-20 | 1 | -0/+1 |
| | | |||||
| * | added profile builds as an option | Tycho Bickerstaff | 2013-12-20 | 1 | -13/+51 |
| | | |||||
| * | possable fix of typo | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+1 |
| | | |||||
| * | Revert "fixed bad reference to math library" | Tycho Bickerstaff | 2013-12-20 | 1 | -2/+1 |
| | | | | | | | | This reverts commit 0836e5e6602f3101660e7653d7796be7f8f5bd80. | ||||
| * | Revert "fixed bad reference to math library" | Tycho Bickerstaff | 2013-12-20 | 1 | -2/+2 |
| | | | | | | | | This reverts commit c2167d7ed73c96c7e8cb935074ba860e11c821f9. | ||||
| * | fixed bad reference to math library | Tycho Bickerstaff | 2013-12-20 | 1 | -2/+2 |
| | | |||||
| * | fixed bad reference to math library | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-19 | 4 | -9/+30 |
| |\ | |||||
| | * | fixed include paths on windows and added build dir to gitignore | tycho | 2013-12-20 | 2 | -0/+3 |
| | | | |||||
| | * | fixed compile errors with headers and math library | tycho | 2013-12-20 | 2 | -7/+20 |
| | | | |||||
| | * | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | tycho | 2013-12-20 | 0 | -0/+0 |
| | |\ | |||||
| | * \ | Merge branch 'master' into cmake | tycho | 2013-12-20 | 18 | -31/+310 |
| | |\ \ | |||||
| | * | | | fixed D9025 | tycho | 2013-12-20 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | fixed multiprocessing on windows and removed redundend compile of headers | tycho | 2013-12-20 | 2 | -1/+5 |
| | | | | | |||||
| * | | | | modified travis CI file for cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 4 | -21/+29 |
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
* | | | | Fixed clang warnings in Noise.cpp. | madmaxoft | 2013-12-20 | 1 | -20/+20 |
| | | | | | | | | | | | | | | | | Fix-a-random-warning-per-day :) | ||||
* | | | | Merge pull request #451 from mc-server/dirtupdatefix | Alexander Harkness | 2013-12-20 | 3 | -1/+9 |
|\ \ \ \ | |_|_|/ |/| | | | Fixed assertion during dirt block OnUpdate() | ||||
| * | | | Fixed assertion during dirt block OnUpdate() | Tiger Wang | 2013-12-20 | 3 | -1/+9 |
|/ / / | |||||
| * | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 18 | -31/+310 |
| |\ \ | |/ / |/| / | |/ | |||||
* | | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 6 | -26/+94 |
|\ \ | | | | | | | Multiple fixes | ||||
| * | | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 3 | -13/+24 |
| | | | |||||
| * | | Fixed 1.7 arm swing animation | Tiger Wang | 2013-12-19 | 1 | -1/+23 |
| | | | |||||
| * | | Fixed dust from being placed on nonsolids | Tiger Wang | 2013-12-19 | 2 | -1/+6 |
| | | | |||||
| * | | Fixed repeaters not updating power | Tiger Wang | 2013-12-19 | 1 | -11/+41 |
| | | | |||||
* | | | Merge pull request #449 from mc-server/Fishing_Rod | Mattes D | 2013-12-19 | 8 | -0/+194 |
|\ \ \ | | | | | | | | | Fishing rod | ||||
| * | | | Fixed #include in Floater.cpp. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | The floater now actualy dives under water. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | You can get fish from fishing :D. Only one type of fish though. | STRWarrior | 2013-12-19 | 1 | -12/+27 |
| | | | | |||||
| * | | | Added the Floater files to MCServer.vcproj | STRWarrior | 2013-12-19 | 1 | -0/+12 |
| | | | | |||||
| * | | | Implented cItemFishingRodHandler. | STRWarrior | 2013-12-19 | 2 | -0/+65 |
| | | | | |||||
| * | | | Implented IsFishing, SetIsFishing and GetFloaterID(). | STRWarrior | 2013-12-19 | 2 | -0/+12 |
| | | | | |||||
| * | | | Added cFloater class. | STRWarrior | 2013-12-19 | 3 | -0/+90 |
| | | | | |||||
* | | | | Merge pull request #448 from mc-server/testbranch | Alexander Harkness | 2013-12-19 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | travis ci pr test | ||||
| * | | | | just a little change for travis ci test | Alexander Harkness | 2013-12-19 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | take advantage of 1.5 cores given by travis with parallelization! | Alexander Harkness | 2013-12-19 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | explicitly defined email notifications | Alexander Harkness | 2013-12-19 | 1 | -1/+7 |
| | | | | |||||
* | | | | update readme with travis info | Alexander Harkness | 2013-12-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | Update submodule URLs so people without SSH can get them. | Alexander Harkness | 2013-12-19 | 1 | -3/+3 |
| | | | | |||||
* | | | | Create .travis.yml | Alexander Harkness | 2013-12-19 | 1 | -0/+6 |
| | | | | |||||
* | | | | Test commit. | Alexander Harkness | 2013-12-19 | 1 | -0/+1 |
|/ / / | |||||
| | * | fixed visual studio compile flags | tycho | 2013-12-19 | 1 | -4/+14 |
| | | | |||||
| | * | fixed a number of windows issues | tycho | 2013-12-19 | 2 | -13/+35 |
| | | | |||||
| | * | added md5 as a dependency for bindings | Tycho Bickerstaff | 2013-12-19 | 3 | -1/+14 |
| | | | |||||
| | * | added expat as lua bindings dependincy | Tycho Bickerstaff | 2013-12-19 | 7 | -22/+72 |
| | | | |||||
| | * | compiling sqlite | Tycho Bickerstaff | 2013-12-19 | 2 | -0/+15 |
| | | | |||||
| | * | added all cpp files to bindings | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+4 |
| | | | |||||
| | * | moved HTTPServer to globs | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | | |||||
| | * | added pthread linking code to OSSupport | Tycho Bickerstaff | 2013-12-19 | 1 | -0/+4 |
| | | | |||||
| | * | moved protocol to glob | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | | |||||
| | * | added blocks and blockentities | Tycho Bickerstaff | 2013-12-19 | 3 | -2/+18 |
| | | | |||||
| | * | linked in lua | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 4 | -14/+45 |
| | |\ | |_|/ |/| | | |||||
* | | | Update Contributing.md | Alexander Harkness | 2013-12-19 | 1 | -0/+4 |
| | | | | | | | | | Fixes #351 | ||||
* | | | Merge pull request #443 from mc-server/messages | Alexander Harkness | 2013-12-19 | 3 | -14/+41 |
|\ \ \ | |/ / |/| | | In-game message revision and fixes | ||||
| * | | Disconnection message no longer shown if ping | Tiger Wang | 2013-12-18 | 1 | -5/+8 |
| | | | |||||
| * | | Prettified command error messages | Tiger Wang | 2013-12-18 | 2 | -9/+23 |
| | | | | | | | | | | | | Using the magic of overlords (overloads) and standards compliance. | ||||
| * | | The "<>" of a player name is now coloured | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed 1.7 player disconnection not calling hook | Tiger Wang | 2013-12-18 | 1 | -4/+14 |
|/ / | | | | | | | This fixes #357 | ||||
| * | fixed bindings generation | Tycho Bickerstaff | 2013-12-19 | 9 | -8044/+1092 |
| | | |||||
| * | Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linux | Tycho Bickerstaff | 2013-12-19 | 7 | -0/+16336 |
| | | | | | | | | This reverts commit 906fd503439becaa0856119c573d5dfbbd7f7039. | ||||
| * | bindings regenration logic | Tycho Bickerstaff | 2013-12-19 | 7 | -32372/+290 |
| | | |||||
| * | added zlib and UI | Tycho Bickerstaff | 2013-12-18 | 2 | -0/+22 |
| | | |||||
| * | removed make file | Tycho Bickerstaff | 2013-12-18 | 1 | -194/+0 |
| | | |||||
| * | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 53 | -310/+1355 |
| |\ | |/ |/| | |||||
* | | Merge pull request #440 from mc-server/repeaterfixes | Mattes D | 2013-12-18 | 2 | -84/+77 |
|\ \ | | | | | | | Fixed redstone wire and certain repeater scenarios | ||||
| * | | Fixed wire powering blocks beneath | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed bad repeater power queuing in corner case | Tiger Wang | 2013-12-18 | 2 | -83/+76 |
| | | | | | | | | | | | | | | | Repeaters remain queued to power even if their original source has since unpowered. Also functionised and cleaned up code. | ||||
* | | | Merge pull request #442 from mc-server/Nether_Wart | Mattes D | 2013-12-18 | 4 | -0/+110 |
|\ \ \ | | | | | | | | | Implented Nether Wart. | ||||
| * | | | Implented Nether Wart. | STRWarrior | 2013-12-18 | 4 | -0/+110 |
| | | | | |||||
* | | | | Merge pull request #441 from mc-server/hookentityanimation | Mattes D | 2013-12-18 | 8 | -15/+51 |
|\ \ \ \ | |/ / / |/| | | | Renamed back EntityAnimation to PlayerAnimation | ||||
| * | | | Renamed back EntityAnimation to PlayerAnimation | Tiger Wang | 2013-12-18 | 8 | -15/+51 |
|/ / / | | | | | | | | | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4 | ||||
* / / | Removed offending tr1/memory header inclusion. | madmaxoft | 2013-12-18 | 1 | -3/+0 |
|/ / | | | | | | | We already use <memory> at line 160, this was a double include, additionally causing problems (#424). | ||||
* | | Fixed player falling through the floor on spawn. | madmaxoft | 2013-12-17 | 1 | -1/+5 |
| | | | | | | | | The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem. | ||||
* | | cBlockArea: origin is initialized in the constructor and the loader. | madmaxoft | 2013-12-17 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #439 from mc-server/Buckets | Mattes D | 2013-12-17 | 1 | -39/+81 |
|\ \ | | | | | | | Made buckets work when the player does not 'look' at a block. | ||||
| * | | Fixed naming and initialization. | madmaxoft | 2013-12-17 | 1 | -4/+12 |
| | | | |||||
| * | | Forgot to change one Vector3d to Vector3i. | STRWarrior | 2013-12-17 | 1 | -1/+1 |
| | | | |||||
| * | | Renamed Pos to m_Pos. | STRWarrior | 2013-12-17 | 1 | -3/+3 |
| | | | |||||
| * | | Using Recommendations. | STRWarrior | 2013-12-17 | 1 | -10/+23 |
| | | | |||||
| * | | Made buckets work when the player does not 'look' at a block. This fixes #265 | STRWarrior | 2013-12-17 | 1 | -32/+53 |
|/ / | |||||
* | | Merge pull request #438 from mc-server/Boats | Tiger Wang | 2013-12-16 | 5 | -14/+80 |
|\ \ | | | | | | | Implemented boating functionality. | ||||
| * | | Boats spawn on top of a block. not between 4 blocks. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | | |||||
| * | | Using suggestions for Boat placing. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | | |||||
| * | | Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. | STRWarrior | 2013-12-16 | 2 | -3/+33 |
| | | | |||||
| * | | Added HandleSpeedFromAttachee so an entity can override the function. | STRWarrior | 2013-12-16 | 2 | -4/+15 |
| | | | |||||
| * | | You can spawn boats on water. | STRWarrior | 2013-12-16 | 1 | -7/+32 |
| | | | |||||
* | | | APIDump: Ignoring the multi-inheritance members. | madmaxoft | 2013-12-16 | 2 | -2/+20 |
| | | | | | | | | | | | | We may get to documenting them one day, but for now they are unused anyway, so there's no point in documenting them. They are a by-product of multiple inheritance, re-introduced due to #422. | ||||
* | | | Fixed multiple inheritance in ToLua++. | madmaxoft | 2013-12-16 | 8 | -36/+127 |
| | | | | | | | | | | | | This fixes #422. | ||||
* | | | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 3 | -30/+0 |
|/ / | |||||
* | | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 5 | -31/+48 |
| | | | | | | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187. | ||||
* | | Fixed multiple player spawn broadcasts. | madmaxoft | 2013-12-16 | 1 | -3/+0 |
| | | |||||
* | | Server saves if a player is flying. | STRWarrior | 2013-12-15 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #437 from mc-server/ShootTo_function | STRWarrior | 2013-12-15 | 6 | -4/+50 |
|\ \ | | | | | | | Shoot to function | ||||
| * | | Documented ForceSetSpeed. | STRWarrior | 2013-12-15 | 1 | -0/+1 |
| | | | |||||
| * | | Exported to Lua | STRWarrior | 2013-12-15 | 2 | -10/+10 |
| | | | |||||
| * | | Renamed ShootTo function to ForceSetSpeed. | STRWarrior | 2013-12-15 | 2 | -3/+3 |
| | | | |||||
| * | | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 5 | -4/+49 |
| | | | |||||
* | | | Fixed player spawning packet. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323. | ||||
* | | | ProtoProxy: Fixed description-changing to work with 1.7.4. | madmaxoft | 2013-12-15 | 1 | -2/+3 |
| | | | |||||
* | | | Fixed calling OnPlayerJoined() in the wrong place. | madmaxoft | 2013-12-15 | 1 | -6/+1 |
| | | | | | | | | | | | | This is the first part of a fix for #187. | ||||
* | | | Merge pull request #433 from mc-server/redstoneimprovements | Mattes D | 2013-12-15 | 1 | -1/+33 |
|\ \ \ | | | | | | | | | Fixed more wire bugs | ||||
| * | | | Implemented xoft's suggestions | Tiger Wang | 2013-12-15 | 1 | -3/+16 |
| | | | | |||||
| * | | | Fixed wire repeater checking | Tiger Wang | 2013-12-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Wires now power repeaters properly | Tiger Wang | 2013-12-15 | 1 | -0/+7 |
| | | | | |||||
| * | | | Fixed the hopefully final wire self-powering bug | Tiger Wang | 2013-12-15 | 1 | -1/+13 |
| | | | | |||||
* | | | | Fixed indentation. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #434 from mc-server/Player_Abilities | Mattes D | 2013-12-15 | 8 | -5/+234 |
|\ \ \ \ | | |/ / | |/| | | Player abilities | ||||
| * | | | APIDump: Documented New functions | STRWarrior | 2013-12-15 | 1 | -0/+4 |
| | | | | |||||
| * | | | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 3 | -19/+23 |
| | | | | |||||
| * | | | Exported Set and Get functions to Lua. | STRWarrior | 2013-12-15 | 2 | -2/+136 |
| | | | | |||||
| * | | | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 5 | -3/+90 |
|/ / / | |||||
* | | | Merge pull request #432 from mc-server/Broadcast_Effects | Mattes D | 2013-12-15 | 7 | -3/+92 |
|\ \ \ | | | | | | | | | Broadcast effects | ||||
| * | | | cPlayer is using the broadcast functions. | STRWarrior | 2013-12-15 | 1 | -3/+3 |
| | | | | |||||
| * | | | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 6 | -0/+89 |
| | | | | |||||
* | | | | Fixed pre 1.7 clients crashing. | STRWarrior | 2013-12-15 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #431 from mc-server/Entity_Effects | Mattes D | 2013-12-14 | 15 | -4/+170 |
|\ \ \ | | | | | | | | | Entity Effects | ||||
| * | | | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h. | STRWarrior | 2013-12-14 | 5 | -4/+31 |
| | | | | |||||
| * | | | Added E_EFFECT_<Effect> | STRWarrior | 2013-12-14 | 2 | -3/+32 |
| | | | | |||||
| * | | | Forgot to commit the ClientHandle. | STRWarrior | 2013-12-14 | 2 | -0/+20 |
| | | | | |||||
| * | | | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 8 | -1/+91 |
| | | | | |||||
* | | | | Added tolua++ redirection include. | madmaxoft | 2013-12-14 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | This is needed because ToLua++ regenerates the Bindings file with bad #include, and it would be too difficult to fix ToLua++; this is an easier solution. Should fix PR #431. | ||||
* | | | | Removed leftover debugging messages from cProtocol172. | madmaxoft | 2013-12-14 | 1 | -4/+0 |
| | | | | |||||
* | | | | Merge pull request #430 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 9 | -33/+162 |
|\ \ \ \ | |/ / / |/| / / | |/ / | Implemented note block playing and fixed wire | ||||
| * | | Potentially fixed debug asserts | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | | |||||
| * | | Wires no longer power if a block cuts them off | Tiger Wang | 2013-12-14 | 1 | -23/+32 |
| | | | | | | | | | | | | Also reduced more unneeded code. | ||||
| * | | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 9 | -5/+125 |
| | | | | | | | | | | | | Game of Thrones music in Minecraft, here I come! | ||||
| | * | added zlib | Tycho Bickerstaff | 2013-12-11 | 3 | -2/+2 |
| | | | |||||
| | * | moved generating to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | |||||
| | * | added UI folder | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+3 |
| | | | |||||
| | * | moved Worldstorage to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | |||||
| | * | Merge branch 'master' of github.com:mc-server/MCServer into cmake | Tycho Bickerstaff | 2013-12-11 | 2 | -8/+7 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #429 from worktycho/quickfixs | Alexander Harkness | 2013-12-14 | 2 | -8/+7 |
|\ \ \ | | | | | | | | | a couple of fixes for warnings | ||||
| * \ \ | Merge branch 'master' into quickfixs | Tycho Bickerstaff | 2013-12-11 | 35 | -564/+639 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | fixed unused expression warnings in blockFire | Tycho Bickerstaff | 2013-12-10 | 1 | -7/+6 |
| | | | | |||||
| * | | | fixed comparison of thread handle to Null point rather than null handle | Tycho Bickerstaff | 2013-12-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | moved entities to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
| | | * | moved mobs to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
| | | * | moved simulor to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
| | | * | removed leakfinder form build | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 35 | -564/+639 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-12-14 | 4 | -9/+85 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #428 from mc-server/cTNTEntity_Export | Mattes D | 2013-12-14 | 4 | -9/+85 |
| |\ \ \ \ | | | | | | | | | | | | | Exported the cTNTEntity | ||||
| | * | | | | Exported the cTNTEntity | STRWarrior | 2013-12-14 | 4 | -9/+85 |
| |/ / / / | |||||
* / / / / | Documented cTNTEntity. | STRWarrior | 2013-12-14 | 1 | -0/+11 |
|/ / / / | |||||
* | | | | Merge pull request #426 from SamJBarney/master | Mattes D | 2013-12-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixed clang autodetection. | ||||
| * | | | | Fixed clang autodetection. | Samuel Barney | 2013-12-14 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #423 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 9 | -339/+158 |
|\ \ \ \ | | |/ / | |/| | | Redstone and configuration improvements | ||||
| * | | | Update Core | Tiger Wang | 2013-12-14 | 1 | -0/+0 |
| | | | | |||||
| * | | | Fixed compilating! | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | | | |||||
| * | | | Improved player permissions logging | Tiger Wang | 2013-12-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixes to redstone wire and torches | Tiger Wang | 2013-12-14 | 3 | -21/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Wires now power blocks around the block beneath * Torches no longer power off if it is on a linked powered block * Enhanced code, split functions, etc. | ||||
| * | | | Groups.ini and Users.ini are now generated | Tiger Wang | 2013-12-14 | 6 | -52/+25 |
| | | | | |||||
| * | | | Removed loads of unneeded code again | Tiger Wang | 2013-12-14 | 1 | -86/+60 |
| | | | | |||||
| * | | | Reduced loads of unneeded code | Tiger Wang | 2013-12-14 | 1 | -188/+44 |
| | | | | | | | | | | | | | | | | Merged wire powering detection code into a single function. | ||||
* | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-12-14 | 6 | -194/+236 |
|\| | | | |||||
| * | | | Merge pull request #419 from mc-server/redstoneloading | Mattes D | 2013-12-13 | 2 | -3/+17 |
| |\ \ \ | | | | | | | | | | | Redstone data is now loaded on chunk load | ||||
| | * | | | Improved redstone loading performance | Tiger Wang | 2013-12-13 | 1 | -2/+10 |
| | | | | | |||||
| | * | | | Fixed QueueSetBlock not sending to client changes | Tiger Wang | 2013-12-13 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Redstone data is now loaded on chunk load | Tiger Wang | 2013-12-13 | 2 | -0/+7 |
| | | | | | |||||
| * | | | | Fixed threading issues affecting cProtocol172. | madmaxoft | 2013-12-13 | 4 | -191/+219 |
| | | | | | |||||
* | | | | | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 2 | -1/+7 |
|/ / / / | |||||
* / / / | Using "a_ClosestPlayer != NULL" in cExpOrb. | STRWarrior | 2013-12-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | Unknown packet type extended to 32 bits. | madmaxoft | 2013-12-12 | 2 | -4/+4 |
| | | | |||||
* | | | Fixed protocol 1.7 recovery after unknown packet. | madmaxoft | 2013-12-12 | 1 | -4/+0 |
| | | | |||||
* | | | Fixed pistons being viable middle block | Tiger Wang | 2013-12-11 | 1 | -0/+3 |
| | | | | | | | | | | | | Also an excuse to update submodules | ||||
* | | | Merge pull request #417 from mc-server/WorldUpdate | Mattes D | 2013-12-11 | 10 | -2/+123 |
|\ \ \ | | | | | | | | | World update | ||||
| * | | | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used. | STRWarrior | 2013-12-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | Documented OnWorldStarted. | STRWarrior | 2013-12-11 | 1 | -0/+24 |
| | | | | |||||
| * | | | Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins. | STRWarrior | 2013-12-11 | 9 | -2/+98 |
| | | | | |||||
* | | | | ExpOrbs now move. | STRWarrior | 2013-12-11 | 1 | -4/+8 |
| | | | | |||||
* | | | | Merge pull request #416 from mc-server/repeaterfix | Mattes D | 2013-12-11 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Provides a possible fix for repeater timings | ||||
| * | | | | Provides a possible fix for repeater timings | Tiger Wang | 2013-12-10 | 2 | -2/+2 |
|/ / / / | | | | | | | | | | | | | Not completely reliable, but at least some types of clock work. | ||||
* | | | | Merge pull request #414 from worktycho/abortondeadlock | Mattes D | 2013-12-10 | 3 | -9/+8 |
|\ \ \ \ | |/ / / |/| | | | add abort call to deadlock detection code | ||||
| * | | | added abort to DeadlockDetector to generate core dumps on failure | Tycho Bickerstaff | 2013-12-10 | 1 | -5/+2 |
| |/ / | |||||
| | * | added tolua++ command and removed stackwalker from build | Tycho Bickerstaff | 2013-12-10 | 3 | -6/+8 |
| | | | |||||
| | * | more cmake changes | Tycho Bickerstaff | 2013-12-10 | 7 | -9/+33 |
| | | | |||||
| | * | removed more accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 10 | -3985/+5 |
| | | | |||||
| | * | removed accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 29 | -105/+1 |
| | | | |||||
| | * | more cmake | Tycho Bickerstaff | 2013-12-10 | 50 | -6/+4182 |
| | | | |||||
| | * | more cmake stuff | Tycho Bickerstaff | 2013-12-10 | 3 | -2/+18 |
| | | | |||||
| | * | started work on cmake | Tycho Bickerstaff | 2013-12-10 | 6 | -0/+50 |
| | | | |||||
| | * | added cmake ignores to gitignore | Tycho Bickerstaff | 2013-12-10 | 1 | -1/+10 |
| |/ | |||||
| * | Merge remote-tracking branch 'upstream/master' | Tycho Bickerstaff | 2013-12-10 | 11 | -94/+165 |
| |\ | |/ |/| | |||||
* | | Merge pull request #412 from mc-server/fixes | Mattes D | 2013-12-10 | 10 | -92/+159 |
|\ \ | | | | | | | Main feature: repeater delays! | ||||
| * | | Readded initial line | Tiger Wang | 2013-12-10 | 1 | -0/+1 |
| | | | |||||
| * | | Fixed compile (alas, no more goto) | Tiger Wang | 2013-12-10 | 1 | -11/+14 |
| | | | |||||
| * | | Reverted APIDump changes | Tiger Wang | 2013-12-10 | 1 | -0/+0 |
| | | | | | | | | | | | | They were wrong! | ||||
| * | | Fixed Floody lava to stone fizzle | Tiger Wang | 2013-12-10 | 2 | -2/+16 |
| | | | |||||
| * | | Added repeater delays | Tiger Wang | 2013-12-10 | 2 | -1/+62 |
| | | | | | | | | | | | | They DO sometimes get stuck though :P | ||||
| * | | Slight redstone wire performance improvement | Tiger Wang | 2013-12-10 | 1 | -1/+6 |
| | | | |||||
| * | | Changed more FastSetBlocks to SetBlocks | Tiger Wang | 2013-12-10 | 1 | -3/+3 |
| | | | | | | | | | | | | Fixes duplication bugs. | ||||
| * | | Improved pickups spawning speed again | Tiger Wang | 2013-12-10 | 2 | -7/+6 |
| | | | |||||
| * | | Fixed VS013 compile | Tiger Wang | 2013-12-09 | 5 | -79/+63 |
| | | | |||||
* | | | update d the contrib file. | Alexander Harkness | 2013-12-10 | 1 | -2/+6 |
| | | | |||||
* | | | Merge pull request #410 from worktycho/master | Mattes D | 2013-12-09 | 6 | -12/+22 |
|\ \ \ | |/ / |/| | | Micelanious fixes for various warnings | ||||
| | * | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+4 |
| | | | |||||
| | * | reordered initalisation order at src/Generating/Cave.h line 73 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
| |/ | |||||
| * | fixed warnings in src/Generating/BioGen.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725 | ||||
| * | added default fallthrough clause to switch at line 178 of src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -0/+4 |
| | | |||||
| * | Reordered Listed Initalisation order in src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | Reordered the Listed Initalisation order for CWindow to the executed initalisation order. The compiler initalises values in the order the fields are declared not the initalisations listed | ||||
| * | Removed unused variable ResultSlot | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+0 |
| | | |||||
| * | Merge pull request #1 from worktycho/patch-1 | worktycho | 2013-12-09 | 1296 | -135500/+146291 |
| |\ | | | | | | | Warning fixes | ||||
| | * | Fix Undefined behavior at Bindings/LuaWindow line 32 | worktycho | 2013-12-09 | 1 | -1/+4 |
| | | | |||||
| | * | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176 | worktycho | 2013-12-09 | 1 | -4/+3 |
| | | | |||||
| | * | Fixed warning unchecked enum value at Chunk.cpp line 841 | worktycho | 2013-12-09 | 1 | -2/+4 |
| | | | |||||
| | * | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54 | worktycho | 2013-12-09 | 1 | -1/+4 |
| |/ |/| | |||||
* | | Fixed angle normalization typo. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | |||||
* | | Fixed tolua++ compilation. | madmaxoft | 2013-12-08 | 12 | -205/+14 |
| | | | | | | | | Duplicate files, wrong includes, const-incorrect code... | ||||
* | | Fixed VS2008 compilation after those huge changes. | madmaxoft | 2013-12-08 | 3 | -5/+15 |
| | | |||||
* | | Merge pull request #408 from mc-server/SpawnPoint_Fix | Mattes D | 2013-12-08 | 1 | -1/+1 |
|\ \ | | | | | | | Now spawn points will not be in deep oceans or rivers etc. | ||||
| * | | Now spawn points will not be in deep oceans or rivers etc. | STRWarrior | 2013-12-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #404 from mc-server/fixesnfeatures | Mattes D | 2013-12-08 | 57 | -219/+1106 |
|\ \ \ | | | | | | | | | Fixes n' features | ||||
| * | | | Fixed binding generation and VS2013 compile | Tiger Wang | 2013-12-08 | 3 | -18/+18 |
| | | | | |||||
| * | | | Readded redstone lamp handler | Tiger Wang | 2013-12-08 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 48 | -1281/+1372 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | | | Fixed tabcompletion packet, fixes #356 | Tiger Wang | 2013-12-08 | 1 | -8/+4 |
| | | | | |||||
| * | | | Fixed falling block metas, fixes #406 | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bonemeal has particles, fixes #393 | Tiger Wang | 2013-12-08 | 2 | -3/+8 |
| | | | | |||||
| * | | | Console trims its commands before executing 'em | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fixed water starting fires | Tiger Wang | 2013-12-07 | 1 | -1/+0 |
| | | | | |||||
| * | | | Improved piston animations | Tiger Wang | 2013-12-07 | 1 | -4/+4 |
| | | | | |||||
| * | | | Fixed some new 1.7 client crash bugs | Tiger Wang | 2013-12-07 | 6 | -1/+41 |
| | | | | | | | | | | | | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash. | ||||
| * | | | Changed some FastSetBlocks to SetBlock | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Should fix some duplication glitches. | ||||
| * | | | Fixed trapdoors not toggling | Tiger Wang | 2013-12-07 | 3 | -17/+103 |
| | | | | | | | | | | | | | | | | The redstone simulator kept on resetting them. | ||||
| * | | | Added basic ender chests | Tiger Wang | 2013-12-07 | 12 | -14/+363 |
| | | | | | | | | | | | | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
| * | | | Renamed animation function | Tiger Wang | 2013-12-07 | 23 | -47/+82 |
| | | | | | | | | | | | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
| * | | | Fixed bed leave animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 7 | -16/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched. | ||||
| * | | | Added trapdoor cursor Y detection | Tiger Wang | 2013-12-06 | 1 | -2/+0 |
| | | | | |||||
| * | | | Puking now uses GetEyeHeight() | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added pickup invalid item check | Tiger Wang | 2013-12-06 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | They aren't spawned at all if their itemtype isn't valid; possibly fixes the client crashing with bad pickups. | ||||
| * | | | Re-implemented redstone duplicate checking | Tiger Wang | 2013-12-06 | 1 | -0/+29 |
| | | | | |||||
| * | | | Fixed eating using wrong animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed trapdoors not overriding OnUse | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Spawn eggs use IsGameMode() | Tiger Wang | 2013-12-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Possible fix for #316. | ||||
| * | | | Tools make a sound when breaking, fixes #266 | Tiger Wang | 2013-12-06 | 2 | -2/+5 |
| | | | | |||||
| * | | | Cleaned up torch code and added comments | Tiger Wang | 2013-12-06 | 1 | -31/+7 |
| | | | | |||||
| * | | | Removed another export and inline'd stuff | Tiger Wang | 2013-12-06 | 1 | -5/+5 |
| | | | | |||||
| * | | | Removed exporting of a torch function | Tiger Wang | 2013-12-06 | 1 | -3/+3 |
| | | | | |||||
| * | | | Updated comments for slabs | Tiger Wang | 2013-12-06 | 1 | -5/+6 |
| | | | | |||||
| * | | | Fixed pickups spawning for BlockEntities | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Regenerated VS2013 files | Tiger Wang | 2013-12-06 | 11 | -42/+413 |
| | | | | |||||
* | | | | Removed unused ToLua files. | madmaxoft | 2013-12-08 | 7 | -16336/+0 |
| |/ / |/| | | | | | | | | Those were used to compile the tolua executable and were getting in the way - Unix makefile tried to compile them into MCS. | ||||
* | | | Fixed normalizing large angles. | madmaxoft | 2013-12-08 | 4 | -8/+51 |
| | | | |||||
* | | | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 42 | -1262/+1257 |
| | | | | | | | | | | | | Ref.: #407 | ||||
* | | | Ignoring Gallery plugin settings. | madmaxoft | 2013-12-08 | 1 | -0/+3 |
| | | | |||||
* | | | Fixed stationary water starting fires and flowing lava not. | madmaxoft | 2013-12-08 | 1 | -2/+2 |
| | | | |||||
* | | | Updated core. | Alexander Harkness | 2013-12-07 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #405 from mc-server/SpawnFallingBlock | Mattes D | 2013-12-07 | 5 | -2/+94 |
|\ \ \ | | | | | | | | | Spawn falling block | ||||
| * | | | Documented SpawnFallingBlock() | STRWarrior | 2013-12-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 4 | -2/+93 |
|/ / / | |||||
* / / | Updated TRANSAPI | Alexander Harkness | 2013-12-07 | 1 | -6/+0 |
|/ / | |||||
* | | Merge pull request #394 from SamJBarney/master | Mattes D | 2013-12-06 | 3 | -4/+14 |
|\ \ | | | | | | | Fire no longer goes out when on top of nether rack | ||||
| * | | I don't know how this dissapeard. | Samuel Barney | 2013-12-06 | 1 | -0/+49 |
| | | | |||||
| * | | Merged if statements. | Samuel Barney | 2013-12-05 | 1 | -7/+1 |
| | | | |||||
| * | | Finished Merge | Samuel Barney | 2013-12-05 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mc-server/MCServer | Samuel Barney | 2013-12-05 | 21 | -38/+1454 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/FireSimulator.h | ||||
| * | | | Made suggested changes | Samuel Barney | 2013-12-04 | 2 | -6/+11 |
| | | | | |||||
| * | | | Fire no longer goes out when on top of nether rack | Samuel Barney | 2013-12-02 | 1 | -1/+6 |
| | | | | |||||
* | | | | APIDump: Documented the new cPluginManager:GetCurrentPlugin() function. | madmaxoft | 2013-12-05 | 1 | -1/+2 |
| | | | | |||||
* | | | | Added cPluginManager:GetCurrentPlugin() to Lua API. | madmaxoft | 2013-12-05 | 1 | -7/+22 |
| |/ / |/| | | |||||
* | | | ProtoProxy: Fixed metadata parsing. | madmaxoft | 2013-12-05 | 1 | -9/+27 |
| | | | |||||
* | | | ByteBuffer: Fixed optimization failures with threading checks. | madmaxoft | 2013-12-05 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed LuaStatic intermediate and output folders. | madmaxoft | 2013-12-04 | 6 | -12/+12 |
| | | | |||||
* | | | Added a new Debug_LuaStatic configuration. | madmaxoft | 2013-12-04 | 9 | -0/+1270 |
| | | | | | | | | | | | | This re-enables plugin debugging using Decoda, lost when we moved Lua out to a DLL. | ||||
* | | | Hopefully fixed the sparc not being detected | Alexander Harkness | 2013-12-04 | 1 | -1/+3 |
| | | | |||||
* | | | Lava can spawn fire. | madmaxoft | 2013-12-04 | 5 | -8/+93 |
| | | | | | | | | | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | | | Fixed an error in cChunk's block ticking. | madmaxoft | 2013-12-04 | 1 | -2/+2 |
| | | | | | | | | | | | | Absolute coords were passed to a handler expecting relative coords. | ||||
* | | | Fixed a linker warning in MSVC debug build. | madmaxoft | 2013-12-03 | 1 | -1/+1 |
| | | | |||||
* | | | Updated TransAPI, fixes #389 | Alexander Harkness | 2013-12-03 | 1 | -6/+0 |
| | | | | | | | | | | | | @madmaxoft is this the right API usage? | ||||
* | | | Added a quick LuaRocks testing plugin. | madmaxoft | 2013-12-03 | 1 | -0/+49 |
| | | | | | | | | | | | | You need to install the luarocks system and through it the luasocket and 30log rocks. | ||||
* | | | Allowed Linux builds to use LuaRocks. | madmaxoft | 2013-12-03 | 1 | -6/+14 |
| | | | | | | | | | | | | This works by exporting all the symbols for the dynamic loader so that LuaRocks' shared libraries may bind to them on load. Also allowed lua's dlopen(). | ||||
* | | | Made Lua compila as a standalone DLL on Windows. | madmaxoft | 2013-12-03 | 2 | -9/+31 |
| | | | | | | | | | | | | This enables us to use LuaRocks. | ||||
* | | | The server builds and uses Lua as DLL in Debug mode. | madmaxoft | 2013-12-02 | 3 | -8/+16 |
| | | | | | | | | | | | | This is a test to see how LuaRocks will interact. Only debug mode on Windows is affected, all other platforms and modes are unchanged. | ||||
* | | | APIDump: Added missing params to OnPlayerRightClick() hook. | madmaxoft | 2013-12-02 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #392 from SamJBarney/master | Mattes D | 2013-12-02 | 2 | -0/+12 |
|\| | | | | | | | | Fixed 1.7 slab and stair placement. | ||||
| * | | Removed stray printf, again. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | | | |||||
| * | | Switched to using provided ReadItem function. | Samuel Barney | 2013-12-02 | 2 | -17/+12 |
| | | | | | | | | | | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs. | ||||
| * | | Removed stray printf. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | | | |||||
| * | | Fixed 1.7 slab and stair placement. | Samuel Barney | 2013-12-02 | 1 | -0/+19 |
|/ / | |||||
* | | Fixed compiler warnings in LightingThread.cpp. | madmaxoft | 2013-12-01 | 1 | -2/+2 |
| | | |||||
* | | Fixed linux compile errors and formatting in RedstoneSimulator.cpp | madmaxoft | 2013-12-01 | 1 | -14/+26 |
| | | |||||
* | | DeadlockDetect is configurable now. | madmaxoft | 2013-11-30 | 3 | -7/+15 |
| | | | | | | | | This is needed when debugging Lua plugins. | ||||
* | | Fixed compiler warnings in IsBiomeNoDownfall(). | madmaxoft | 2013-11-30 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #387 from mc-server/trapdoors | Mattes D | 2013-11-30 | 23 | -374/+440 |
|\ \ | | | | | | | Trapdoors, redstone fixes, and snow | ||||
| * | | Fixed pistons extending | Tiger Wang | 2013-11-30 | 1 | -0/+10 |
| | | | | | | | | | | | | They didn't when a source was in front, but now they do! Yay! | ||||
| * | | Merge branch 'trapdoors' of https://github.com/mc-server/MCServer into trapdoors | Tiger Wang | 2013-11-30 | 1 | -20/+4 |
| |\ \ | |||||
| | * | | Added the trapdoor header to project file. | madmaxoft | 2013-11-30 | 1 | -0/+4 |
| | | | | |||||
| | * | | Fixed compilation in VS2008. | madmaxoft | 2013-11-30 | 1 | -20/+0 |
| | | | | |||||
| * | | | Removed redstone duplicate power checking | Tiger Wang | 2013-11-30 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | There was no need for it, and it introduced some bugs. | ||||
| * | | | Improved piston direction checking | Tiger Wang | 2013-11-30 | 1 | -62/+8 |
| |/ / | | | | | | | | | | Now uses AddFaceDirection, as suggested by xoft. | ||||
| * | | Pistons no longer accept power through front face | Tiger Wang | 2013-11-30 | 2 | -3/+96 |
| | | | | | | | | | | | | This fixes #60. | ||||
| * | | Fixed thin snow CanBeAt checking | Tiger Wang | 2013-11-30 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | Now takes into account the possibility that thin snow can be on top of full thin snow. | ||||
| * | | Properly fixed snow height, fixes #98 and #264 | Tiger Wang | 2013-11-30 | 3 | -25/+53 |
| | | | |||||
| * | | Improved redstone speed and fixed a wire bug | Tiger Wang | 2013-11-30 | 1 | -73/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | The redstone simulator no longer goes through the Powered and LinkedPowered blocks lists for EVERY item in the chunk data, instead, only at every tick. Also, wires powering each other that had the same data value is now fixed. | ||||
| * | | Stairs reset meta when dropped, fixes #269 | Tiger Wang | 2013-11-29 | 1 | -2/+22 |
| | | | | | | | | | | | | Additionally, they now have walking sounds. | ||||
| * | | Implemented trapdoors, fixes #43 and #105 | Tiger Wang | 2013-11-29 | 5 | -3/+131 |
| | | | | | | | | | | | | Also updated redstone simulator to support it | ||||
| * | | Removed unneeded CPP files | Tiger Wang | 2013-11-29 | 13 | -245/+82 |
| | | | | | | | | | | | | Also removed unneeded #include in BlockStems | ||||
* | | | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 15 | -63/+117 |
| | | | |||||
* | | | Added IsBiomeNoDownfall() function. | madmaxoft | 2013-11-30 | 3 | -103/+164 |
| | | | |||||
* | | | Explicitly set spawnpoint fixes. | madmaxoft | 2013-11-30 | 1 | -20/+11 |
| | | | | | | | | | | | | | | | The value names are case-insensitive. The debug message is printed only once. | ||||
* | | | Added the real tick duration to the OnWorldTick hook. | madmaxoft | 2013-11-30 | 8 | -17/+34 |
| | | | |||||
* | | | Grass doesn't spread to podzol or grassless dirt blocks. | madmaxoft | 2013-11-30 | 1 | -2/+3 |
| | | | |||||
* | | | APIDump: Updated the project file to include all partial docs files. | madmaxoft | 2013-11-30 | 1 | -1/+154 |
| | | | |||||
* | | | Added floor pattern for MegaTaiga biomes. | madmaxoft | 2013-11-30 | 1 | -1/+10 |
| | | | |||||
* | | | Implemented mesa biomes in DistortedHeightmap CompoGen. | madmaxoft | 2013-11-29 | 3 | -21/+106 |
| | | | |||||
* | | | Fixed CheckerboardBiomeGen in negative coords. | madmaxoft | 2013-11-29 | 1 | -2/+3 |
| | | | |||||
* | | | DistortedHeightmap: Improved speed, prepared for mesa biomes. | madmaxoft | 2013-11-29 | 2 | -157/+424 |
| | | | | | | | | | | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum. | ||||
* | | | Fixed an off-by-one error in cByteBuffer. | madmaxoft | 2013-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | | Could have caused random protocol errors and maybe even crashes. | ||||
* | | | Alpha-sorted BlockMetas, added red sand. | madmaxoft | 2013-11-29 | 1 | -125/+128 |
| | | | |||||
* | | | Trees will generate in the new biomes. | madmaxoft | 2013-11-28 | 2 | -14/+101 |
| | | | | | | | | | | | | Only the generic trees, the special variants haven't yet been implemented. | ||||
* | | | Added new biomes to old composition generator. | madmaxoft | 2013-11-28 | 4 | -0/+145 |
| | | | | | | | | | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators. | ||||
* | | | Added new biomes to old height generators. | madmaxoft | 2013-11-28 | 4 | -39/+179 |
| | | | | | | | | | | | | Now Biomal and DistortedHeight generators will work with new biomes. | ||||
* | | | BiomeVisualiser: Using the common BiomeGen creation code. | madmaxoft | 2013-11-28 | 1 | -67/+1 |
| | | | |||||
* | | | Moved BiomeGen creation from INI file data to BioGen.cpp. | madmaxoft | 2013-11-28 | 3 | -48/+74 |
| | | | | | | | | | | | | This way it can be shared between MCServer and BiomeVisualiser. | ||||
* | | | Moved json includes to where they are really needed. | madmaxoft | 2013-11-28 | 3 | -1/+2 |
| | | | |||||
* | | | BiomeVisualiser: Added the TwoLevel biome generator. | madmaxoft | 2013-11-28 | 3 | -0/+233 |
| | | | |||||
* | | | BiomeVisualiser: The biome settings are read from a file. | madmaxoft | 2013-11-28 | 3 | -5/+102 |
|/ / | |||||
* | | Merge pull request #362 from mc-server/redstonefixes | Mattes D | 2013-11-28 | 12 | -236/+510 |
|\ \ | | | | | | | Multiple bugfixes | ||||
| * | | Fixed a bug with TNT waking simulators | Tiger Wang | 2013-11-28 | 1 | -2/+2 |
| | | | |||||
| * | | Improved TNT pickup randomisation | Tiger Wang | 2013-11-28 | 1 | -1/+1 |
| | | | |||||
| * | | Made TNT pickups spawning chance 25% | Tiger Wang | 2013-11-27 | 2 | -3/+3 |
| | | | |||||
| * | | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 961 | -83738/+83688 |
| |\ \ | |||||
| * | | | Fixed spawn point being generally in an ocean | Tiger Wang | 2013-11-26 | 2 | -12/+78 |
| | | | | |||||
| * | | | Fixed repeaters not powering from wire | Tiger Wang | 2013-11-26 | 1 | -26/+24 |
| | | | | | | | | | | | | | | | | | | | | This should also fix comparators (in the future). This also updates XML comments so that they are compatible with Doxygen. | ||||
| * | | | Merge remote-tracking branch 'origin/master' into redstonefixes | Tiger Wang | 2013-11-25 | 8 | -41/+149 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into redstonefixes | Tiger Wang | 2013-11-24 | 89 | -2160/+4198 |
| |\ \ \ \ | |||||
| * | | | | | Fixed some comments and added debug logging | Tiger Wang | 2013-11-24 | 2 | -9/+12 |
| | | | | | | |||||
| * | | | | | Expanded one-line if statement | Tiger Wang | 2013-11-23 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Properly fixed piston bugs | Tiger Wang | 2013-11-23 | 2 | -5/+12 |
| | | | | | | |||||
| * | | | | | Fixed some piston bugs | Tiger Wang | 2013-11-22 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to our QueueSetBlocks, a fast extension then retraction would lead to invalid game states. This hopefully fixes it. Also reduced delay speed. | ||||
| * | | | | | Fixed spawning pickups with piston arms | Tiger Wang | 2013-11-22 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Multiple enhancements [SEE DESC] | Tiger Wang | 2013-11-21 | 6 | -70/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added lever location checking * Fixed button location checking * Fixed button pressing/unpressing * Fixed repeaters updating * Minor enhancements | ||||
| * | | | | | Multiple bugfixes [SEE DESC] | Tiger Wang | 2013-11-20 | 4 | -126/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed compilation on VC2013 * Fixed redstone self powering - still one more scenario to go + Redstone now powers block beneath * Improved code: functionized stuff, and reduced unneeded GetBlockMetas; also utilised direct chunk access, as recommended by xoft + Added torches powering blocks above it * Fixed repeaters getting power when they shouldn't - Stopped wires getting power from another wire through a block, which could lead to wire-powering loops (vanilla behaviour) | ||||
* | | | | | | Merge pull request #374 from mc-server/VS2013compilefix | Alexander Harkness | 2013-11-28 | 3 | -30/+46 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed VS2013 compiling | ||||
| * | | | | | | Fixed VS2013 compiling | Tiger Wang | 2013-11-27 | 3 | -30/+46 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Fixed RCONClient after foldermove. | madmaxoft | 2013-11-28 | 1 | -18/+18 |
| | | | | | | |||||
* | | | | | | Fixed MemDumpAnalysis after foldermove. | madmaxoft | 2013-11-28 | 3 | -44/+41 |
| | | | | | | |||||
* | | | | | | Fixed BlockZapper after folder move. | madmaxoft | 2013-11-28 | 6 | -44/+37 |
| | | | | | | |||||
* | | | | | | Fixed BiomeVisualiser after folder move. | madmaxoft | 2013-11-28 | 4 | -39/+47 |
| | | | | | | |||||
* | | | | | | Fixed AnvilStats after folder move. | madmaxoft | 2013-11-28 | 5 | -30/+30 |
| | | | | | | |||||
* | | | | | | ProtoProxy: Fixed after folder move. | madmaxoft | 2013-11-28 | 2 | -30/+34 |
|/ / / / / | |||||
* | | | | | Voronoi-related biomegens use the new cVoronoiMap class. | madmaxoft | 2013-11-27 | 3 | -54/+29 |
| | | | | | |||||
* | | | | | Removed some useless options. | Alexander Harkness | 2013-11-27 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Fixed a load of issues, clang autodetection works now. | Alexander Harkness | 2013-11-27 | 2 | -20/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes issue #210. This also removes the disableasm option, so it would be wise to remove it from any scripts that use it. I also removed a random line in the middle of globals.h, why was it there? | ||||
* | | | | | Removed the -g option for release builds, as binaries were getting huge. | Alexander Harkness | 2013-11-27 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Removed the -Og option, which is rather new. | Alexander Harkness | 2013-11-27 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | Added missing files for Voronoi map generation. | madmaxoft | 2013-11-27 | 2 | -0/+140 |
| | | | | | |||||
* | | | | | Fixed Win nightbuild scripts after folder moves. | madmaxoft | 2013-11-27 | 3 | -7/+15 |
| | | | | | |||||
* | | | | | Removed faulty .gitattributes. | madmaxoft | 2013-11-27 | 2 | -71/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | They cause git to think that files have been modified although they have not, and makes it impossible to revert the files to un-changed form. See http://stackoverflow.com/questions/5009096/files-showing-as-modified-directly-after-git-clone 's first answer. | ||||
* | | | | | Merge pull request #370 from mc-server/foldermove2 | Mattes D | 2013-11-27 | 941 | -73422/+73057 |
|\ \ \ \ \ | | | | | | | | | | | | | Moved all the folders :D | ||||
| * | | | | | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 16 | -32/+31 |
| | | | | | | |||||
| * | | | | | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 26 | -30/+30 |
| | | | | | | |||||
| * | | | | | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 9 | -11/+11 |
| | | | | | | |||||
| * | | | | | Removed a -Ofast bit. | Alexander Harkness | 2013-11-27 | 1 | -22/+7 |
| | | | | | | |||||
| * | | | | | Makefile fix | Tiger Wang | 2013-11-27 | 1 | -4/+10 |
| | | | | | | |||||
| * | | | | | ANOTHER compile fix | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This one was broken by bear. :P | ||||
| * | | | | | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 5 | -5/+5 |
| | | | | | | |||||
| * | | | | | Compile fix again | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed Linux compile again | Tiger Wang | 2013-11-26 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Possibly fixed Linux makefile | Tiger Wang | 2013-11-26 | 1 | -5/+18 |
| | | | | | | |||||
| * | | | | | Fixed tolua++ files | Tiger Wang | 2013-11-26 | 3 | -4/+4 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 20 | -6/+282 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | | | | | | cWorld::SpawnExperienceOrb() now returns the entity ID of the spawned orb. | STRWarrior | 2013-11-26 | 5 | -8/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | Documented etExpOrb. | ||||
* | | | | | | Merge pull request #368 from mc-server/ExpOrbs | Mattes D | 2013-11-26 | 19 | -2/+270 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Exp orbs | ||||
| * | | | | | Added ExpOrb.cpp and ExpOrb.h to MCServer.vcproj. | STRWarrior | 2013-11-25 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | Documented SpawnExperienceOrb in cWorld | STRWarrior | 2013-11-25 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Exported cWorld::SpawnExperienceOrb() function to the Lua API. | STRWarrior | 2013-11-25 | 2 | -2/+43 |
| | | | | | | |||||
| * | | | | | Fixed Details Xoft gave. | STRWarrior | 2013-11-25 | 12 | -30/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased the range where orbs (should) track you. Blazes give 10 xp now. | ||||
| * | | | | | Added cWorld::SpawnExperienceOrb function. | STRWarrior | 2013-11-25 | 3 | -3/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | Most mobs now give proper Exp. | ||||
| * | | | | | Implented ExpOrb class. | STRWarrior | 2013-11-25 | 2 | -0/+89 |
| | | | | | | |||||
| * | | | | | Implented SendExperienceOrb in ClientHandle. | STRWarrior | 2013-11-25 | 4 | -0/+15 |
| | | | | | | |||||
| * | | | | | Implented Spawn Experience Orb packet. | STRWarrior | 2013-11-25 | 7 | -0/+47 |
| | | | | | | |||||
* | | | | | | Fixed cFile compilation on Linux. | madmaxoft | 2013-11-25 | 1 | -4/+5 |
|/ / / / / | |||||
| * | | | | Merge branch 'master' into foldermove2 | Alexander Harkness | 2013-11-26 | 7 | -37/+144 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | AnvilStats: Fixed compilation. | madmaxoft | 2013-11-24 | 2 | -2/+3 |
| | | | | | |||||
* | | | | | BiomeVisualiser: Added 1.7 biomes, recolored using AMIDST colors. | madmaxoft | 2013-11-24 | 4 | -32/+141 |
| | | | | | |||||
* | | | | | Removed a stale comment. | madmaxoft | 2013-11-24 | 1 | -3/+0 |
| |_|/ / |/| | | | |||||
| * | | | Fixed loads more of them. | Alexander Harkness | 2013-11-26 | 11 | -13/+13 |
| | | | | |||||
| * | | | Another | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | And another. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed another. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed another one. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed a mis-include | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed all outstanding VS compilation issues | Tiger Wang | 2013-11-25 | 14 | -100/+110 |
| | | | | | | | | | | | | | | | | Also updated VS2008 files. | ||||
| * | | | Updated VS includes | Tiger Wang | 2013-11-25 | 1 | -3/+3 |
| | | | | |||||
| * | | | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 31 | -38/+54 |
| | | | | |||||
| * | | | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 64 | -153/+132 |
| | | | | |||||
| * | | | Moved SQLite, LuaExpat, and MD5 to /lib | Tiger Wang | 2013-11-24 | 8 | -0/+0 |
| | | | | |||||
| * | | | Removed old project files | Tiger Wang | 2013-11-24 | 7 | -9891/+0 |
| | | | | |||||
| * | | | Fixed Visual Studio Files | Tiger Wang | 2013-11-24 | 40 | -3444/+12977 |
| | | | | |||||
| * | | | Removed excess includes. | Alexander Harkness | 2013-11-24 | 1 | -13/+6 |
| | | | | |||||
| * | | | Removed extra endif. | Alexander Harkness | 2013-11-24 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 131 | -3531/+6056 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: GNUmakefile | ||||
* | | | | RCONClient: Initial implementation. | madmaxoft | 2013-11-24 | 8 | -0/+920 |
| | | | | | | | | | | | | | | | | Fix #79. | ||||
* | | | | RCON server: Login failure gets sent to the client. | madmaxoft | 2013-11-24 | 1 | -0/+1 |
| | | | | |||||
* | | | | Fixed socket connection startup. | madmaxoft | 2013-11-24 | 2 | -7/+8 |
| | | | | |||||
* | | | | APIDump: Moved projectiles' documentation to a separate file. | madmaxoft | 2013-11-24 | 2 | -110/+112 |
| | | | | |||||
* | | | | APIDump: Removed needless whitespace output. | madmaxoft | 2013-11-24 | 1 | -123/+108 |
| | | | | |||||
* | | | | APIDump: Removed unwanted functions. | madmaxoft | 2013-11-23 | 1 | -1/+2 |
| | | | | |||||
* | | | | APIDump: Reformatted the sqlite docs. | madmaxoft | 2013-11-23 | 1 | -4/+16 |
| | | | | |||||
* | | | | APIDump: The descriptions are read from multiple files. | madmaxoft | 2013-11-23 | 52 | -1682/+2036 |
| | | | | | | | | | | | | | | | | All the files in the Classes subfolder are read for class descriptions, and in the Hooks subfolder for the hook descriptions. | ||||
* | | | | Documented sqlite functions. Used: http://lua.sqlite.org/index.cgi/doc/tip/doc/lsqlite3.wiki#sqlite3_functions | STRWarrior | 2013-11-23 | 1 | -0/+18 |
| | | | | |||||
* | | | | Fixed Lua bindings for cFile:GetFolderContents(). | madmaxoft | 2013-11-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Added cFile:ReadWholeFile() to Lua API. | madmaxoft | 2013-11-23 | 4 | -2/+53 |
| | | | | |||||
* | | | | APIDump: Added more constant groups. | madmaxoft | 2013-11-23 | 2 | -20/+121 |
| | | | | | | | | | | | | | | | | Also fixed the parsing of the Include data in the constant groups, and added linkification to group texts. | ||||
* | | | | APIDump: Added a few constant groups to the descriptions. | madmaxoft | 2013-11-22 | 1 | -92/+78 |
| | | | | |||||
* | | | | APIDump: Implemented constant groups. | madmaxoft | 2013-11-22 | 2 | -18/+144 |
| | | | | | | | | | | | | | | | | Fix #289. | ||||
* | | | | Added cFile:GetFolderContents(). | madmaxoft | 2013-11-22 | 11 | -69/+155 |
| | | | | | | | | | | | | | | | | Fix 162. | ||||
* | | | | APIDump: Fixed cRoot's furnace query API. | madmaxoft | 2013-11-22 | 1 | -1/+3 |
| | | | | |||||
* | | | | Added cRoot:GetFurnaceFuelBurnTime() to Lua API. | madmaxoft | 2013-11-22 | 5 | -3/+67 |
| | | | | |||||
* | | | | Fixed cRoot:GetFurnaceRecipe() Lua binding. | madmaxoft | 2013-11-22 | 3 | -4/+41 |
| | | | | |||||
* | | | | APIDump: Documented new cRoot:GetFurnaceRecipe(). | madmaxoft | 2013-11-22 | 1 | -2/+27 |
| | | | | |||||
* | | | | Debuggers: Added a test harness for cRoot:GetFurnaceRecipe(). | madmaxoft | 2013-11-22 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | The "/fr" command lists the furnace recipe for the currently held item. | ||||
* | | | | Changed cRoot:GetFurnaceRecipe() Lua binding signature. | madmaxoft | 2013-11-22 | 4 | -44/+50 |
| | | | | | | | | | | | | | | | | Fix #364. | ||||
* | | | | APIDump: Documented cPlayer XP-related functions. | madmaxoft | 2013-11-21 | 1 | -0/+8 |
| | | | | |||||
* | | | | Exported static XP calculation to Lua API. | madmaxoft | 2013-11-21 | 4 | -38/+105 |
| | | | | |||||
* | | | | APIDump: Documented cWorld:ForEachBlockEntityInChunk() and cWorld:DoWithBlockEntityAt(). | madmaxoft | 2013-11-20 | 1 | -0/+2 |
| | | | | |||||
* | | | | Debuggers: Test harness for cWorld:ForEachBlockEntityInChunk(). | madmaxoft | 2013-11-20 | 1 | -19/+59 |
| | | | | | | | | | | | | | | | | The fill command will fill all empty slots in block entities with containment with gold nuggets, one per slot. | ||||
* | | | | Added cWorld:ForEachBlockEntityInChunk() and cWorld:DoWithBlockEntityAt() functions. | madmaxoft | 2013-11-20 | 8 | -24/+145 |
| | | | | | | | | | | | | | | | | Also exported them to the Lua API. | ||||
* | | | | Ignoring SDF files. | madmaxoft | 2013-11-20 | 1 | -0/+1 |
| | | | | |||||
* | | | | Removed the bloody sdf file. | madmaxoft | 2013-11-20 | 1 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #360 from mc-server/redstonefixes | Mattes D | 2013-11-20 | 1 | -3/+3 |
|\ \ \ \ | | |/ / | |/| | | Fixed piston sound effect (when unable to extend) | ||||
| * | | | Fixed piston sound effect (when unable to extend) | Tiger Wang | 2013-11-19 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #350 from mc-server/arrows | Mattes D | 2013-11-19 | 6 | -45/+260 |
|\ \ \ | | | | | | | | | Fixed arrow bugs | ||||
| * | | | General fixes [SEE DESC] | Tiger Wang | 2013-11-16 | 5 | -35/+226 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed faulty block face enumeration and functions + Added fireworks and exp bottle spawning * Fixed arrows again | ||||
| * | | | Switchified If, ElseIf statement | Tiger Wang | 2013-11-15 | 1 | -11/+16 |
| | | | | | | | | | | | | | | | | Also updated comments | ||||
| * | | | Fixed arrow bugs | Tiger Wang | 2013-11-14 | 3 | -25/+44 |
| | | | | | | | | | | | | | | | | * Fixed arrows hitting blocks wrong | ||||
* | | | | Merge pull request #359 from mc-server/redstone | Mattes D | 2013-11-19 | 17 | -1002/+1045 |
|\ \ \ \ | | | | | | | | | | | Redstone Megacommit | ||||
| * | | | | Possible compile fix | Tiger Wang | 2013-11-19 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | Also removed unneeded variables. | ||||
| * | | | | Redstone Megacommit [SEE DESC] | Tiger Wang | 2013-11-18 | 16 | -1000/+1045 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Updated BlockID - look for yourself * Improved button, repeater, lever, and comparator code -> simplification and splitting of some stuff from the redstone simulator file * Fixed buttons not breaking when in an invalid game state * Fixed QueueSetBlock -> improved (AGAIN) piston code + Rewrote redstone simulator Fixes: #57, #58, #205, and part of #131. Fixes FS issues: 281, 116, and 102 | ||||
* | | | | | Merge branch 'master' of git://github.com/nesco/MCServer. | madmaxoft | 2013-11-19 | 2 | -5/+13 |
|\ \ \ \ \ | |||||
| * | | | | | flower=38 | nesco | 2013-11-18 | 1 | -4/+2 |
| | | | | | | |||||
| * | | | | | Blank Line added | nesco | 2013-11-17 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Update items.ini | nesco | 2013-11-15 | 1 | -1/+15 |
| | | | | | | |||||
| * | | | | | Update Giant.cpp | nesco | 2013-11-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update Giant.cpp | nesco | 2013-11-14 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | APIDump: Slight performance improvement. | madmaxoft | 2013-11-19 | 1 | -17/+17 |
| | | | | | | | | | | | | | | | | | | | | Strings don't need concatenation when using write(). | ||||
* | | | | | APIDump: Documented Vector3i. | madmaxoft | 2013-11-19 | 1 | -5/+25 |
| |/ / / |/| | | | |||||
* | | | | Mineshafts: silenced a compiler warning. | madmaxoft | 2013-11-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | APIDump: Documented Vector3f. | madmaxoft | 2013-11-17 | 1 | -3/+33 |
| | | | | |||||
* | | | | Merge pull request #345 from mc-server/warningfixes | Mattes D | 2013-11-17 | 12 | -245/+249 |
|\ \ \ \ | | | | | | | | | | | Fix Some Compiler Warnings | ||||
| * | | | | And another... | Alexander Harkness | 2013-11-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | another | Alexander Harkness | 2013-11-16 | 1 | -7/+7 |
| | | | | | |||||
| * | | | | Fixed another one. | Alexander Harkness | 2013-11-16 | 1 | -15/+15 |
| | | | | | |||||
| * | | | | Fixed some unsigned int comparison warnings. | Alexander Harkness | 2013-11-16 | 1 | -18/+18 |
| | | | | | |||||
| * | | | | WaveNoise not used, removing. | Alexander Harkness | 2013-11-16 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | This is a copy-paste fail, right? | Alexander Harkness | 2013-11-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Got rid of yet another unused variable. | Alexander Harkness | 2013-11-16 | 1 | -51/+50 |
| | | | | | |||||
| * | | | | Got rid of another unused variable. | Alexander Harkness | 2013-11-16 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Those variables weren't used. | Alexander Harkness | 2013-11-16 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | It seems strange for them to be there, is the code written wrong? | ||||
| * | | | | Fixed another one... | Alexander Harkness | 2013-11-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed yet another unsigned integer comparison. | Alexander Harkness | 2013-11-16 | 1 | -26/+26 |
| | | | | | |||||
| * | | | | Fixed typo causing buggy code. | Alexander Harkness | 2013-11-16 | 1 | -9/+9 |
| | | | | | |||||
| * | | | | Fixed another unsigned integer comparison. | Alexander Harkness | 2013-11-16 | 1 | -12/+12 |
| | | | | | |||||
| * | | | | Fixed unsigned integer comparison. | Alexander Harkness | 2013-11-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed a warning about brackets. | Alexander Harkness | 2013-11-16 | 1 | -58/+58 |
| | | | | | | | | | | | | | | | | | | | | Is this the right way round? This is how C++ interprets it, so it should be changed if this is the wrong way round. | ||||
| * | | | | Fixed a warning about unsigned int comparison - probably was a real issue. | Alexander Harkness | 2013-11-16 | 1 | -22/+26 |
| | | | | | |||||
| * | | | | Revert "Silenced another warning." | Alexander Harkness | 2013-11-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit dc94b927534f6216a0ace7690ba250b69c014407. | ||||
| * | | | | Revert "Silenced yet another not completed enum warning." | Alexander Harkness | 2013-11-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 444e6e4fa74e987880133bb52433b047ff3981b2. | ||||
| * | | | | Revert "Fixed another one." | Alexander Harkness | 2013-11-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3328c80aec768cf0e64e48eb40e50bf02bfff59c. | ||||
| * | | | | Always warn about everything! | Alexander Harkness | 2013-11-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | This should help me in my efforts. | ||||
| * | | | | Fixed another one. | Alexander Harkness | 2013-11-14 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Silenced yet another not completed enum warning. | Alexander Harkness | 2013-11-14 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Silenced another warning. | Alexander Harkness | 2013-11-14 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Added the last bit of the enum, and alpha-sorted the switch. | Alexander Harkness | 2013-11-13 | 1 | -10/+13 |
| | | | | | |||||
| * | | | | Removed unnecessary format data. | Alexander Harkness | 2013-11-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Got rid of warnings caused by the -s option on Clang, and it doesn't seem to do anything anyway. | Alexander Harkness | 2013-11-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed some of the comments in the makefile. | Alexander Harkness | 2013-11-13 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Fixed link error with clang on x86_64. | Alexander Harkness | 2013-11-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #353 from marmot21/playerxp | Mattes D | 2013-11-17 | 14 | -79/+246 |
|\ \ \ \ \ | | | | | | | | | | | | | Playerxp | ||||
| * | | | | | fix *.sdf? | Daniel O'Brien | 2013-11-16 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | removed *.sdf file | Daniel O'Brien | 2013-11-16 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | minor change in LOGD call | Daniel O'Brien | 2013-11-16 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | removed magic number | Daniel O'Brien | 2013-11-16 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | edited comment and changed error behavior of DeltaXp | Daniel O'Brien | 2013-11-16 | 2 | -4/+11 |
| | | | | | | |||||
| * | | | | | updated plugin again... | Daniel O'Brien | 2013-11-16 | 3 | -6/+6 |
| | | | | | | |||||
| * | | | | | updated plugin | Daniel O'Brien | 2013-11-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | removed SpendExperience and changed AddExperience to handle removing Xp | Daniel O'Brien | 2013-11-16 | 5 | -79/+20 |
| | | | | | | |||||
| * | | | | | fixed bug and added SpendExperience() | Daniel O'Brien | 2013-11-16 | 6 | -40/+146 |
| | | | | | | |||||
| * | | | | | fix possible threadlock issue, changed function names to be closer to standard | Daniel O'Brien | 2013-11-16 | 2 | -26/+45 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' into playerxp | Daniel O'Brien | 2013-11-16 | 2 | -7/+118 |
| |\ \ \ \ \ | |||||
| * | | | | | | alignment fixes :) | Daniel O'Brien | 2013-11-15 | 6 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | finished #143 I believe | Daniel O'Brien | 2013-11-15 | 14 | -16/+45 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into playerxp | Daniel O'Brien | 2013-11-15 | 20 | -763/+175 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | added cProtocol function to pass xp to client | Daniel O'Brien | 2013-11-15 | 7 | -28/+44 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into playerxp | Daniel O'Brien | 2013-11-15 | 17 | -216/+824 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | cProtocol add SendExperience() and debugging | Daniel O'Brien | 2013-11-14 | 8 | -1/+48 |
| | | | | | | | | | |||||
| * | | | | | | | | fixed XpGetPercentage | Daniel O'Brien | 2013-11-14 | 2 | -1/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| | | | | | * | | Removed pedantic build and added optimisation to debug builds. | Alexander Harkness | 2013-11-24 | 1 | -12/+2 |
| | | | | | | | | |||||
| | | | | | * | | Moved tolua++ | Alexander Harkness | 2013-11-24 | 57 | -0/+0 |
| | | | | | | | | |||||
| | | | | | * | | Moved zlib | Alexander Harkness | 2013-11-24 | 28 | -0/+0 |
| | | | | | | | | |||||
| | | | | | * | | Moved Lua | Alexander Harkness | 2013-11-24 | 61 | -0/+0 |
| | | | | | | | | |||||
| | | | | | * | | Moved JSONCPP | Alexander Harkness | 2013-11-24 | 16 | -0/+0 |
| | | | | | | | | |||||
| | | | | | * | | Moved iniFile | Alexander Harkness | 2013-11-24 | 2 | -0/+0 |
| | | | | | | | | |||||
| | | | | | * | | Moved expat | Alexander Harkness | 2013-11-24 | 18 | -0/+0 |
| | | | | | | | | |||||
| | | | | | * | | move cryptopp into lib | Alexander Harkness | 2013-11-24 | 193 | -0/+0 |
| | | | | | | | | |||||
| | | | | | * | | Moved source to src | Alexander Harkness | 2013-11-24 | 469 | -0/+0 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | LineBlockTracer: Using the coord-based block faces. | madmaxoft | 2013-11-16 | 1 | -3/+3 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | APIDump: Documented lxp, the XML parser class. | madmaxoft | 2013-11-15 | 1 | -0/+106 |
| | | | | | | |||||
* | | | | | | APIDump: Functions that are documented are never ignored. | madmaxoft | 2013-11-15 | 1 | -7/+12 |
| |_|/ / / |/| | | | | | | | | | | | | | | This simplifies exclude-filters for functions such as lxp.new() that need inclusion. | ||||
* | | | | | APIDump: Small fixes and additions. | madmaxoft | 2013-11-15 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | APIDump: Documented cSignEntity. | madmaxoft | 2013-11-15 | 1 | -7/+6 |
| | | | | | |||||
* | | | | | APIDump: Documented cNoteEntity. | madmaxoft | 2013-11-15 | 1 | -1/+20 |
| | | | | | |||||
* | | | | | APIDump: Documented the cJukeboxEntity. | madmaxoft | 2013-11-15 | 1 | -0/+16 |
| | | | | | |||||
* | | | | | APIDump: Documented cChunkDesc:GetBlockEntity(). | madmaxoft | 2013-11-15 | 1 | -1/+37 |
| | | | | | |||||
* | | | | | cChunkDesc::GetBlockEntity() re-creates block entity when blocktype doesn't match. | madmaxoft | 2013-11-15 | 1 | -1/+8 |
| | | | | | |||||
* | | | | | Debuggers: Removed the old OnChunkGenerated code testing the cBlockArea writing. | madmaxoft | 2013-11-15 | 1 | -15/+0 |
| | | | | | |||||
* | | | | | Removed cBlockEntity:CreateByBlockType() from the Lua API. | madmaxoft | 2013-11-15 | 3 | -45/+4 |
| | | | | | | | | | | | | | | | | | | | | Plugins cannot be allowed to create block entities, that would result in memory leaks. | ||||
* | | | | | cRoot::SaveAllChunks() doesn't wait for the save (deadlocks). | madmaxoft | 2013-11-15 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Rather, it only queues the save task onto each world's tick thread. | ||||
* | | | | | APIDump: Removed the BlockEntity constructors' docs. | madmaxoft | 2013-11-15 | 1 | -62/+24 |
| | | | | | |||||
* | | | | | Re-added rose to items.ini. | madmaxoft | 2013-11-15 | 1 | -1/+5 |
| | | | | | |||||
* | | | | | Debuggers: Added the BlockEntity test harness when generating chunks. | madmaxoft | 2013-11-15 | 1 | -0/+22 |
| | | | | | |||||
* | | | | | Removed BlockEntities' constructors from the API. | madmaxoft | 2013-11-15 | 14 | -630/+30 |
| |/ / / |/| | | | | | | | | | | | Plugins shouldn't construct block entities, rather, they will query them either from the cWorld (while playing), or from cChunkDesc (while generating). | ||||
* | | | | Merge pull request #349 from SamJBarney/master | Alexander Harkness | 2013-11-14 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Fixed growing issue with crops. | ||||
| * | | | | Fixed growing issue with crops. | Samuel Barney | 2013-11-14 | 1 | -0/+6 |
|/ / / / | |||||
* | | | | Added cNoteEntity to Lua API. | madmaxoft | 2013-11-14 | 4 | -39/+171 |
| | | | | | | | | | | | | | | | | Ref. #228. | ||||
* | | | | Exported cJukeboxEntity to Lua API. | madmaxoft | 2013-11-14 | 5 | -41/+180 |
| | | | | | | | | | | | | | | | | Ref. #228 | ||||
* | | | | Added cSignEntity into API, added cChunkDesc:GetBlockEntity(). | madmaxoft | 2013-11-14 | 16 | -168/+499 |
|/ / / | | | | | | | | | | This fixes both #228 and #347. | ||||
* | | | Merge pull request #344 from marmot21/playerxp | Mattes D | 2013-11-14 | 9 | -752/+1209 |
|\ \ \ | | | | | | | | | PlayerXp | ||||
| * | | | fixed function name | Daniel O'Brien | 2013-11-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | added tolua export snippet for VC | Daniel O'Brien | 2013-11-14 | 2 | -0/+50 |
| | | | | |||||
| * | | | luaExport | Daniel O'Brien | 2013-11-14 | 3 | -5/+260 |
| | | | | |||||
| * | | | fixed comment | Daniel O'Brien | 2013-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | changed function name | Daniel O'Brien | 2013-11-13 | 2 | -4/+4 |
| | | | | |||||
| * | | | minor changes | Daniel O'Brien | 2013-11-13 | 2 | -6/+6 |
| | | | | |||||
| * | | | changed name convention | Daniel O'Brien | 2013-11-13 | 2 | -5/+5 |
| | | | | |||||
| * | | | Fixed problems with code style etc | Daniel O'Brien | 2013-11-13 | 3 | -53/+90 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into playerxp | Daniel O'Brien | 2013-11-13 | 4 | -50/+157 |
| |\| | | |||||
| * | | | Player Xp, includes get/set and addExperience | Daniel O'Brien | 2013-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Player Xp, includes get/set and addExperience | Daniel O'Brien | 2013-11-13 | 1 | -1/+2 |
| | | | | |||||
| * | | | Player Xp | Daniel O'Brien | 2013-11-13 | 5 | -748/+862 |
| | | | | |||||
* | | | | Updated the Core. | madmaxoft | 2013-11-13 | 1 | -0/+0 |
| | | | | |||||
* | | | | Fix for NULL arithmetic compiler warning in Linux. | madmaxoft | 2013-11-13 | 2 | -4/+16 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/WolfUpdate' | madmaxoft | 2013-11-13 | 2 | -28/+36 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: source/Mobs/Wolf.h | ||||
| * | | | | Now using a TickFollowPlayer function. | STRWarrior | 2013-11-12 | 2 | -46/+60 |
| | | | | | |||||
| * | | | | Removed #include "../Root.h" since it isn't needed. | STRWarrior | 2013-11-10 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Update items.ini | nesco | 2013-11-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Update items.ini | nesco | 2013-11-13 | 1 | -3/+59 |
| | | | | | |||||
* | | | | | Update crafting.txt with StainedGlass and StainedGlassPane | nesco | 2013-11-13 | 1 | -2/+38 |
| | | | | | |||||
* | | | | | Implemented the "help" console command in the server. | madmaxoft | 2013-11-13 | 1 | -1/+33 |
| | | | | | | | | | | | | | | | | | | | | Fixes #42. | ||||
* | | | | | Console "reload" command implemented in MCServer, rather than in a plugin. | madmaxoft | 2013-11-13 | 2 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | First part of #42. | ||||
* | | | | | cPluginManager:BindCommand() and :BindConsoleComman() now report full Lua stacktrace on failure. | madmaxoft | 2013-11-13 | 1 | -2/+6 |
| | | | | | |||||
* | | | | | Fixed compiler warning. | madmaxoft | 2013-11-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | PluginManager::Bind displays more information in the error message. | madmaxoft | 2013-11-13 | 1 | -2/+2 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #339 from nesco/master | Mattes D | 2013-11-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Bug correction | ||||
| * | | | | Bug correction | nesco | 2013-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Syntax error | ||||
* | | | | | Merge pull request #337 from nesco/master | Mattes D | 2013-11-13 | 4 | -49/+156 |
|\| | | | | |_|/ / |/| | | | Updating enchantments list and ID/Metas List and some properties to the 1.7.2 version of Minecraft | ||||
| * | | | compatibility update | nesco | 2013-11-13 | 1 | -3/+7 |
| | | | | |||||
| * | | | compatibility update | nesco | 2013-11-13 | 1 | -1/+3 |
| | | | | |||||
| * | | | Update Enchantments.cpp | nesco | 2013-11-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update Enchantments.h | nesco | 2013-11-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Delete BiomeID.h | nesco | 2013-11-12 | 1 | -76/+0 |
| | | | | |||||
| * | | | Sorting by Name on g_BlockTransparent | nesco | 2013-11-12 | 1 | -4/+4 |
| | | | | |||||
| * | | | BiomeFile, if not needed, will be removed | nesco | 2013-11-12 | 1 | -0/+76 |
| | | | | |||||
| * | | | Update BlockID.cpp | nesco | 2013-11-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Corrected the comma error | nesco | 2013-11-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update BlockID.cpp | nesco | 2013-11-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | Update Enchantments.cpp | nesco | 2013-11-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Assigning properties to the blocks recently added. | nesco | 2013-11-12 | 1 | -10/+19 |
| | | | | |||||
| * | | | Update BlockID.h | nesco | 2013-11-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Replace tabs by spaces | nesco | 2013-11-12 | 1 | -35/+35 |
| | | | | |||||
| * | | | Update BlockID.h | nesco | 2013-11-12 | 1 | -0/+12 |
| | | | | |||||
| * | | | Update in progress to minecraft 1.7 | nesco | 2013-11-12 | 1 | -4/+82 |
| | | | | |||||
| * | | | Added the new enchantments of Minecraft 1.7 | nesco | 2013-11-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | -Luck of the sea -Lure | ||||
| * | | | Added the new enchantments of Minecraft 1.7 | nesco | 2013-11-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Added the following enchantments : Luck of the Sea : ID = 61 Lure : ID = 62 | ||||
* | | | | Merge remote-tracking branch 'origin/fixes'. | madmaxoft | 2013-11-13 | 18 | -91/+264 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bundled fixes [SEE DESC] | Tiger Wang | 2013-11-12 | 9 | -25/+147 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * BoundingBox now returns FACE_NONE + Arrows can be picked up * Arrows dug up resume physics simulations * Added sound effects for bows, lava to stone, and arrows * Fixed SoundParticleEffect on <1.7 protocols | ||||
| * | | | Bundled fixes [SEE DESC] | Tiger Wang | 2013-11-10 | 9 | -19/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed compiler warning in Monster.cpp * Future proofed particle effects * Improved pickups, made less jittery | ||||
| * | | | Bundled fixes [SEE DESC] | Tiger Wang | 2013-11-10 | 8 | -44/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed pickups spawning in an incorrect position from a JukeBox * Pickups make a popping sound in Prtcl1.7 * Arrows make a *what sort of sound does an arrow make anyway‽* when hitting a block, and a popping sound when fired * Mobs again have metadata * Fixed Prtcl1.7 not using valid JSON to kick a client * Minecarts and arrows again have metadata | ||||
* | | | | cWindow: Fixed item dupe glitch with painting (#278) | madmaxoft | 2013-11-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | Fixed dblclicking in crafting slot area. | madmaxoft | 2013-11-11 | 2 | -0/+15 |
| | | | | | | | | | | | | | | | | Fixes #229. | ||||
* | | | | APIDump: Documented Vector3d. | madmaxoft | 2013-11-11 | 1 | -8/+43 |
| | | | | |||||
* | | | | Merge pull request #328 from mborland/master | Mattes D | 2013-11-11 | 21 | -4/+5651 |
|\ \ \ \ | | | | | | | | | | | VC2013 Build Files | ||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | mborland | 2013-11-11 | 15 | -54/+348 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Fixed cRoot::FindAndDoWithPlayer(). | madmaxoft | 2013-11-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Now /kick and /ban work. | ||||
* | | | | | Protocol 1.7: Fixed crashes and d/c with bad packets. | madmaxoft | 2013-11-10 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Fixes #332. | ||||
* | | | | | ProtoProxy: Added dblquotes. | madmaxoft | 2013-11-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #330 from tonibm19/patch-1 | Mattes D | 2013-11-10 | 1 | -6/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Added sheep dyeing | ||||
| * | | | | | Fixes (SEE DESC) | tonibm19 | 2013-11-10 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entity metadata is broadcasted. If player is in survival, his equipped item is removed. If you have green dye, and sheep is green, your equipped item won't be removed. | ||||
| * | | | | | STR_Warrior was right. | tonibm19 | 2013-11-10 | 1 | -160/+1 |
| | | | | | | | | | | | | | | | | | | Simplified code. | ||||
| * | | | | | Fixed compilation | tonibm19 | 2013-11-10 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | You can no longer color with wood | tonibm19 | 2013-11-10 | 1 | -158/+161 |
| | | | | | | |||||
| * | | | | | Added sheep dyeing | tonibm19 | 2013-11-10 | 1 | -2/+156 |
| | | | | | | |||||
* | | | | | | Removed #include "../Root.h" since it isn't needed. | STRWarrior | 2013-11-10 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Small code-style fixes. | madmaxoft | 2013-11-10 | 2 | -22/+32 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into WolfUpdate | madmaxoft | 2013-11-10 | 8 | -7/+180 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Implemented inventory dblclick. | madmaxoft | 2013-11-10 | 4 | -5/+133 |
| | | | | | | | | | | | | | | | | | | | | | | | | Implements #229. | ||||
| * | | | | | Added cItem::GetMaxStackSize() | madmaxoft | 2013-11-10 | 4 | -2/+47 |
| |/ / / / | |||||
* | | | | | Renamed variables in cWolf. | STRWarrior | 2013-11-10 | 2 | -29/+29 |
| | | | | | |||||
* | | | | | Using DoWithPlayer instead of FindAndDoWithPlayer for callbacks. | STRWarrior | 2013-11-10 | 3 | -7/+20 |
| | | | | | | | | | | | | | | | | | | | | You are able to dye the collar. | ||||
* | | | | | The owner object isn't stored anymore. Instead we use the name of the player. | STRWarrior | 2013-11-10 | 2 | -10/+24 |
| | | | | | | | | | | | | | | | | | | | | This means only players can now have a wolf, but it fixes the bug where when you log out the wolf isn't your wolf anymore. | ||||
* | | | | | Using cMonster::Tick instead of super::cMonster::Tick | STRWarrior | 2013-11-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Wolves can now be owned by an entity. | STRWarrior | 2013-11-10 | 2 | -17/+100 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They only sit when right clicked by their owner. They beg if the closest player has meat or bones in his hand. They follow their owner. They teleport to their owner if they are more then 30 blocks away. They don't attack players if they are not angry anymore. They don't move if they are sitting. | ||||
* | | | | Protocol 1.7: Attempt at fixing SoundParticleEffect packet. | madmaxoft | 2013-11-10 | 1 | -5/+3 |
| | | | | |||||
* | | | | Fixed Player animation packet. | madmaxoft | 2013-11-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fixes #329. | ||||
* | | | | APIDump: Documented cServer:IsHardCore() | madmaxoft | 2013-11-09 | 1 | -0/+1 |
| |/ / |/| | | |||||
| * | | VC2013 | mborland | 2013-11-10 | 21 | -4/+5651 |
|/ / | | | | | | | 3rd times a charm? | ||||
* | | Removed cStringMap. | madmaxoft | 2013-11-09 | 9 | -273/+217 |
| | | | | | | | | It wasn't used for anything anymore. | ||||
* | | Fixed cTracer's tolua markup. | madmaxoft | 2013-11-09 | 1 | -18/+38 |
| | | | | | | | | Cleaned up unneeded member variables. | ||||
* | | APIDump: Documented TakeDamageInfo. | madmaxoft | 2013-11-09 | 1 | -5/+29 |
| | | |||||
* | | APIDump: Documented the relevant tolua functions. | madmaxoft | 2013-11-09 | 1 | -2/+48 |
| | | |||||
* | | APIDump: Added logging to see what takes so long. | madmaxoft | 2013-11-09 | 1 | -0/+5 |
| | | |||||
* | | Prepared the VC2013 folder. | madmaxoft | 2013-11-09 | 1 | -0/+7 |
| | | |||||
* | | Removed redundant qualifier | mborland | 2013-11-09 | 1 | -1/+1 |
| | | | | | | | | Removes compiler warning C4114 | ||||
* | | Hard Reset | mborland | 2013-11-09 | 1 | -0/+63 |
| | | |||||
* | | Updated Core and ProtectionAreas. | madmaxoft | 2013-11-09 | 2 | -0/+0 |
| | | |||||
* | | Fixed sprinting in 1.7 protocol. | madmaxoft | 2013-11-08 | 1 | -1/+17 |
| | | | | | | | | Fixes #324 | ||||
* | | Declaring 1.7.2 compatibility. | madmaxoft | 2013-11-08 | 2 | -2/+3 |
| | | |||||
* | | MobSpawner: Added skeleton and wolf conditions. | madmaxoft | 2013-11-08 | 1 | -19/+91 |
| | | | | | | | | This fixes the flood of warnings in the server console in Debug mode. | ||||
* | | cProtocol::SendWindowOpen() signature changed. | madmaxoft | 2013-11-08 | 15 | -48/+59 |
| | | | | | | | | This implements #313. | ||||
* | | Fixed code style. | madmaxoft | 2013-11-08 | 1 | -2/+2 |
| | | |||||
* | | Protocol 1.7: Fixed using entities. | madmaxoft | 2013-11-08 | 1 | -2/+1 |
| | | | | | | | | The mouse buttons were swapped. | ||||
* | | Protocol 1.7: Copied Mob Metadata code from 1.2.5. | madmaxoft | 2013-11-08 | 3 | -19/+197 |
| | | |||||
* | | Merge pull request #321 from mc-server/1.7pickupsfix | Mattes D | 2013-11-08 | 2 | -5/+8 |
|\ \ | | | | | | | Fix for entity spawning in general | ||||
| * | | Added hardcore client effect | Tiger Wang | 2013-11-07 | 2 | -2/+5 |
| | | | | | | | | | | | | Also fixed multiple world comments issue. | ||||
| * | | Fix for entity spawning in general | Tiger Wang | 2013-11-07 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #322 from tonibm19/master | Mattes D | 2013-11-08 | 2 | -6/+39 |
|\ \ \ | | | | | | | | | Now chicken drop eggs | ||||
| * | | | Changed variable name | tonibm19 | 2013-11-08 | 1 | -7/+6 |
| | | | | |||||
| * | | | Changed variable name | tonibm19 | 2013-11-08 | 1 | -2/+1 |
| | | | | |||||
| * | | | Now chicken drop eggs | tonibm19 | 2013-11-08 | 1 | -1/+6 |
| | | | | |||||
| * | | | Now chickens can drop eggs. | tonibm19 | 2013-11-08 | 1 | -3/+33 |
|/ / / | | | | | | | They drop an egg every 5 or 10 minutes. | ||||
* | | | Merge pull request #320 from mc-server/1.7pickupsfix | Mattes D | 2013-11-07 | 1 | -1/+1 |
|\| | | | | | | | | Fix for 1.7 pickup spawning | ||||
| * | | Possible fix for 1.7 pickup spawning | Tiger Wang | 2013-11-07 | 1 | -1/+1 |
|/ / | |||||
* | | ProtoProxy: Fixed SpawnMob packet. | madmaxoft | 2013-11-07 | 1 | -12/+13 |
| | | |||||
* | | Protocol 1.7: Fixed the Spawn Mob packet. | madmaxoft | 2013-11-07 | 1 | -1/+1 |
| | | | | | | | | This should fix #318 | ||||
* | | Protocol 1.7: Added the remaining server-bound packets. | madmaxoft | 2013-11-06 | 2 | -15/+99 |
| | | |||||
* | | Protocol 1.7: Added more server-bound packets. | madmaxoft | 2013-11-06 | 2 | -25/+138 |
| | | |||||
* | | Protocol 1.7: Finished the client-bound packets. | madmaxoft | 2013-11-06 | 1 | -7/+32 |
| | | |||||
* | | Made the cDeadlockDetect class work in clang. | madmaxoft | 2013-11-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #312 from SamJBarney/master | Mattes D | 2013-11-05 | 3 | -45/+38 |
|\ \ | | | | | | | Flowers, mushrooms and air are no longer collidable. | ||||
| * | | More documentation. | Samuel Barney | 2013-11-05 | 1 | -1/+4 |
| | | | |||||
| * | | Added missing check for a_LineOfSight | Samuel Barney | 2013-11-05 | 1 | -1/+1 |
| | | | |||||
| * | | cTracer can now handle mob sight. | Samuel Barney | 2013-11-05 | 2 | -4/+10 |
| | | | |||||
| * | | Added more documentation. Changed cTracer::Trace to return a bool instead of an int because it was only returning 1 or 0 anyways. | Samuel Barney | 2013-11-05 | 2 | -7/+12 |
| | | | |||||
| * | | Moved cTracer::SetValues to be an internal function because it is only ever used in cTracer::Trace. | Samuel Barney | 2013-11-05 | 2 | -37/+16 |
| | | | | | | | | | | | | | | | Removed SetValues from Bindings.cpp. Added some commenting to explain what each function does in cTracer. | ||||
| * | | Reworked collision to use g_BlockIsSolid | Samuel Barney | 2013-11-05 | 1 | -15/+6 |
| | | | |||||
| * | | Flowers, mushrooms and air are no longer collidable. | Samuel Barney | 2013-11-05 | 1 | -6/+15 |
| | | | |||||
* | | | Merge pull request #309 from mc-server/configautogen | Mattes D | 2013-11-05 | 18 | -117/+101 |
|\ \ \ | | | | | | | | | Autogeneration of settings.ini and webadmin.ini | ||||
| * | | | Implemented suggestions | Tiger Wang | 2013-11-05 | 6 | -24/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reverted changes to WebAdmin.cpp IPv6 ports and Server.cpp server description + Added default value explicitly for HardCore value * Split PluginManager plugin defaults write to new function - Removed a commented block from BlockTorch and... + Added g_BlockIsTorchPlaceable to Defines.h | ||||
| * | | | Removed settings/webadmin.example.ini files | Tiger Wang | 2013-11-04 | 6 | -41/+6 |
| | | | | | | | | | | | | | | | | | | | | Additionally, added some default plugins to autogeneration. Also moved nbt examples to docs/NBT Examples. | ||||
| * | | | Autogeneration of settings.ini and webadmin.ini | Tiger Wang | 2013-11-04 | 11 | -65/+80 |
| | | | | | | | | | | | | | | | | Fixes issue #75 | ||||
* | | | | Clarified cBlockHandler::ConvertToPickups() dox. | madmaxoft | 2013-11-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | APIDump: Documented ItemCategory. | madmaxoft | 2013-11-05 | 1 | -0/+38 |
| | | | | |||||
* | | | | Protocol 1.7: More client-bound packets. | madmaxoft | 2013-11-05 | 1 | -17/+27 |
| | | | | | | | | | | | | | | | | Also removed the SendWholeInventory(cInventory &) function, as promised in prev commit. | ||||
* | | | | Removed the obsolete SendWholeInventory(cInventory &) function. | madmaxoft | 2013-11-05 | 10 | -46/+2 |
| | | | | | | | | | | | | | | | | This won't compile because there's still a change in Protocol17x.cpp pending; the next commit will fix this. | ||||
* | | | | Merge pull request #307 from mc-server/MobImprovements | Mattes D | 2013-11-05 | 11 | -16/+127 |
|\ \ \ \ | |/ / / |/| | | | Mob projectiles | ||||
| * | | | Fixed indentation. | STRWarrior | 2013-11-05 | 2 | -0/+2 |
| | | | | |||||
| * | | | Skeleton, Ghast and Blaze's projectile code is now in their respective class. | STRWarrior | 2013-11-04 | 8 | -68/+91 |
| | | | | |||||
| * | | | Skeleton.cpp doesn't have to load ProjectileEntity.h and Entity.h. | STRWarrior | 2013-11-02 | 1 | -3/+0 |
| | | | | |||||
| * | | | Small update to the monster.ini. | STRWarrior | 2013-11-02 | 1 | -6/+5 |
| | | | | |||||
| * | | | Skeletons, Blazes and Ghasts now shoot their projectile to the target. | STRWarrior | 2013-11-02 | 1 | -5/+63 |
| | | | | |||||
| * | | | Zombies and Skeletons don't walk into the sun anymore. | STRWarrior | 2013-11-02 | 4 | -0/+32 |
| | | | | |||||
* | | | | Protocol 1.7: Added more client-bound packets. | madmaxoft | 2013-11-04 | 2 | -15/+166 |
| |/ / |/| | | | | | | | | Untested, still more to come. | ||||
* | | | Protocol 1.7: Added client status packet. | madmaxoft | 2013-11-03 | 1 | -1/+22 |
| | | | |||||
* | | | Merge pull request #306 from tigerw/master | Mattes D | 2013-11-03 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Flipped some variables in Portals | ||||
| * | | | Flipped some variables in Portals | Tiger Wang | 2013-11-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | To make them work on the X axis. | ||||
* | | | | Protocol 1.7: Rewritten packet-sending to use cPacketizer. | madmaxoft | 2013-11-03 | 2 | -166/+402 |
| | | | | | | | | | | | | | | | | Implemented enough of the protocol that the client now spawns in the world (but cannot do anything). | ||||
* | | | | cByteBuffer: Fixed GetUsedSpace() off-by-one error. | madmaxoft | 2013-11-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | ClientHandle: Fixed an error in player-joining hook. | madmaxoft | 2013-11-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Players being disconnected used to fire the PlayerJoined hook repeatedly. | ||||
* | | | | ProtoProxy: Fixed the SpawnObjectVehicle packet. | madmaxoft | 2013-11-03 | 1 | -1/+13 |
| | | | | |||||
* | | | | ProtoProxy: Removed unused enums. | madmaxoft | 2013-11-03 | 1 | -109/+3 |
| | | | | |||||
* | | | | ProtoProxy: Fixed handling of incomplete packets. | madmaxoft | 2013-11-03 | 1 | -0/+2 |
| | | | | |||||
* | | | | Added cEntity:GetYaw() and cEntity:SetYaw(). | madmaxoft | 2013-11-03 | 4 | -6/+108 |
| | | | | | | | | | | | | | | | | This is the preferred way to get / set rotation, GetRotation() and SetRotation is obsoleted due to bad name. | ||||
* | | | | Added cPlayer::GetEffectiveGameMode(). | madmaxoft | 2013-11-03 | 1 | -0/+4 |
| | | | | |||||
* | | | | Updated README.md since MCServer development will continue even if people don't donate. | STRWarrior | 2013-11-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update READme a bit more | Alexander Harkness | 2013-11-02 | 1 | -0/+2 |
| | | | | |||||
* | | | | Updated some stuff about submodule init. | Alexander Harkness | 2013-11-02 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #303 from tigerw/bugfixes | Mattes D | 2013-11-02 | 4 | -3/+303 |
|\ \ \ | | | | | | | | | Nether portal creation | ||||
| * | | | Split border finder into separate function | Tiger Wang | 2013-11-02 | 1 | -10/+16 |
| | | | | |||||
| * | | | Implement suggestions | Tiger Wang | 2013-11-02 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | - Removed unneeded parameter * Changed 0 - 1 to -1 | ||||
| * | | | Readded BlockPortal.h (portals) | Tiger Wang | 2013-11-02 | 3 | -1/+115 |
| | | | | |||||
| * | | | Fixed compile error (portals) | Tiger Wang | 2013-11-02 | 1 | -2/+182 |
| | | | | | | | | | | | | | | | | WITH A FULL REFORK | ||||
* | | | | Merge pull request #305 from tigerw/morebugfixes | Mattes D | 2013-11-02 | 5 | -12/+42 |
|\ \ \ \ | |/ / / |/| | | | Dropspensing speed fix, bows get damaged. | ||||
| * | | | Fixed bow damage in creative | Tiger Wang | 2013-11-02 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | Also reverted indenting change | ||||
| * | | | Fixed dropspensing speed and position | Tiger Wang | 2013-11-02 | 1 | -1/+22 |
| | | | | |||||
| * | | | Multiple fixes | Tiger Wang | 2013-11-02 | 4 | -12/+17 |
|/ / / | | | | | | | | | | | | | | | | * Fixed #282 * Fixed bow not taking damage * Enhanced Player.cpp code | ||||
* | | | Protocol 1.7: Implemented the first batch of sent packets. | madmaxoft | 2013-11-01 | 6 | -3/+658 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer | madmaxoft | 2013-11-01 | 1 | -0/+8 |
|\ \ \ | |||||
| * \ \ | Merge pull request #302 from SamJBarney/master | Mattes D | 2013-10-31 | 1 | -0/+8 |
| |\ \ \ | | | | | | | | | | | Broken rail blocks now stack. | ||||
| | * | | | Adhering to project standards. | Samuel Barney | 2013-10-31 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | Added missing conventions for windows. | Samuel Barney | 2013-10-31 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Broken rail blocks now stack. | Samuel Barney | 2013-10-30 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch 'griefer'sdelight' of git://github.com/tigerw/MCServer. | madmaxoft | 2013-11-01 | 1 | -1/+18 |
|\ \ \ \ \ | |||||
| * | | | | | TNT Spawns Pickups | Tiger Wang | 2013-10-24 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes FS#397. | ||||
* | | | | | | Protocol 1.7: Added skeleton functions for reading client packets. | madmaxoft | 2013-10-31 | 2 | -20/+349 |
| | | | | | | | | | | | | | | | | | | | | | | | | Untested, this is skeleton code only. | ||||
* | | | | | | APIDump: Fixed HOOK_LOGIN short desc. | madmaxoft | 2013-10-31 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | ByteBuffer: Writing a string doesn't modify it (missing const). | madmaxoft | 2013-10-31 | 2 | -3/+3 |
| |/ / / / |/| | | | | |||||
* | | | | | Protocol 1.7: Added status ping handling. | madmaxoft | 2013-10-30 | 2 | -0/+27 |
| | | | | | |||||
* | | | | | Fixed a compiler warning. | madmaxoft | 2013-10-30 | 1 | -26/+31 |
| |/ / / |/| | | | | | | | | | | | Also updated code to match our style. | ||||
* | | | | Merge pull request #292 from SamJBarney/MobSpawning | Mattes D | 2013-10-30 | 7 | -88/+157 |
|\ \ \ \ | | | | | | | | | | | Mob Spawning based on light values | ||||
| * | | | | Last of the nitpicker note fixes. Added some inline commenting. | Samuel Barney | 2013-10-30 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Changes based on madmaxoft's nitpicker notes. | Samuel Barney | 2013-10-29 | 5 | -19/+16 |
| | | | | | |||||
| * | | | | Update to allow the light map to remain the same, but allow alteration of sky light values based on time. | Samuel Barney | 2013-10-29 | 7 | -17/+73 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/SamJBarney/MCServer into MobSpawning | Samuel Barney | 2013-10-28 | 42 | -1239/+1465 |
| |\ \ \ \ | |||||
| * | | | | | Got spiders and other mobs respecting night and day for spawning | Samuel Barney | 2013-10-28 | 3 | -14/+23 |
| | | | | | | |||||
| * | | | | | Made mob spawning code use the chunk so that it could use varying sizes of areas for different mobs. | Samuel Barney | 2013-10-28 | 3 | -52/+79 |
| | | | | | | |||||
| * | | | | | Disabling Endermen and spiders until I rework the CanSpawnHere to take a chunk and a position. | Samuel Barney | 2013-10-26 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Moving spawning position to the center of the block. | Samuel Barney | 2013-10-26 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Checked Endermen; they work; adding them back in. | Samuel Barney | 2013-10-25 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Fixed mob spawning so that hostile mobs will not spawn incorrectly. | Samuel Barney | 2013-10-25 | 1 | -68/+38 |
| | | | | | | |||||
| * | | | | | Using provided UnboundedRelGetBlockBlockLight and UnboundedRelGetBlockSkyLight. | Samuel Barney | 2013-10-24 | 1 | -5/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/SamJBarney/MCServer into MobSpawning | Samuel Barney | 2013-10-24 | 18 | -396/+406 |
| |\ \ \ \ \ | |||||
| * | | | | | | Removed my hackish Light functions | Samuel Barney | 2013-10-24 | 2 | -98/+0 |
| | | | | | | | |||||
| * | | | | | | Bats only spawn where there is no sunlight, and the light level is below 5 | Samuel Barney | 2013-10-23 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Invalid light value is now 127 | Samuel Barney | 2013-10-23 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Added two new unbounded del functions to deal with looking up the lighting. | Samuel Barney | 2013-10-21 | 2 | -11/+103 |
| | | | | | | | |||||
| * | | | | | | Swapped which block is checked for light first. | Samuel Barney | 2013-10-21 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Current Mob Spawning code. | Samuel Barney | 2013-10-21 | 3 | -22/+37 |
| | | | | | | | |||||
* | | | | | | | Added 1.7 to protocol recognizer. | madmaxoft | 2013-10-30 | 7 | -11/+455 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 1.7 protocol currently only reports server description and playercount. | ||||
* | | | | | | | ProtoProxy: Working 1.7 protocol. | madmaxoft | 2013-10-29 | 2 | -158/+160 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Players can login, move around, dig blocks. | ||||
* | | | | | | | Merge pull request #301 from SamJBarney/master | Mattes D | 2013-10-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Grass no longer grows under water, and water on top kills it. | ||||
| * | | | | | | | Grass no longer grows under water, and water on top kills it. | Samuel Barney | 2013-10-29 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | ProtoProxy: Updated the server-side packets to 1.7. | madmaxoft | 2013-10-29 | 1 | -171/+239 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgotten a file in the previous commit. | ||||
* | | | | | | | | Merge pull request #299 from tonibm19/master | Mattes D | 2013-10-29 | 3 | -3/+19 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Saddles are dropped, chicken spawn out of thrown eggs. | ||||
| * | | | | | | | Using tabs | tonibm19 | 2013-10-29 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | fixed indentation | tonibm19 | 2013-10-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | extra line | tonibm19 | 2013-10-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | attempt at fixing indentation | tonibm19 | 2013-10-28 | 1 | -3/+2 |
| | | | | | | | | |||||
| * | | | | | | | Extra line | tonibm19 | 2013-10-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fixed indentation | tonibm19 | 2013-10-28 | 1 | -5/+2 |
| | | | | | | | | |||||
| * | | | | | | | Added random chicken spawn when throwing an egg | tonibm19 | 2013-10-28 | 1 | -2/+13 |
| | | | | | | | | |||||
| * | | | | | | | Now saddled horses spawn a saddle pickup when killed | tonibm19 | 2013-10-28 | 1 | -1/+4 |
| | | | | | | | | |||||
| * | | | | | | | Now saddle pigs spawn a saddle pickup when killed | tonibm19 | 2013-10-28 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Changed GameMode() == 1 to IsGameModeCreative in AggressiveMonster.cpp and ClientHandle.cpp | STRWarrior | 2013-10-29 | 2 | -2/+2 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Fixed bug where creative inventory didn't work. | STRWarrior | 2013-10-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | ProtoProxy: Updated the server-side packets to 1.7. | madmaxoft | 2013-10-29 | 1 | -0/+5 |
| | | | | | | | |||||
* | | | | | | | ProtoProxy: The login part of the protocol is implemented. | madmaxoft | 2013-10-29 | 2 | -220/+229 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | ProtoProxy: Implemented 1.7.2 status request / response / ping. | madmaxoft | 2013-10-28 | 2 | -113/+272 |
| | | | | | | |||||
* | | | | | | ProtoProxy: Fixed compilation after the previous cByteBuffer changes. | madmaxoft | 2013-10-28 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | MC uses VarInts only up to 32-bits. | madmaxoft | 2013-10-28 | 2 | -13/+13 |
| | | | | | | |||||
* | | | | | | cByteBuffer: Added the VarInt and VarUTF8String type reading and writing. | madmaxoft | 2013-10-28 | 2 | -5/+147 |
|/ / / / / | | | | | | | | | | | | | | | | This implements #296. | ||||
* | | | | | Fixed indentation in tonibm19's code. | madmaxoft | 2013-10-28 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #294 from tonibm19/patch-3 | Mattes D | 2013-10-28 | 1 | -2/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Correct wool drops when shearing a sheep. | ||||
| * | | | | | Fixed compilation | tonibm19 | 2013-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | STR_Warrior code had an error (I copied&pasted it before) | ||||
| * | | | | | Use STR_Warrior code and changed variable name | tonibm19 | 2013-10-28 | 1 | -17/+4 |
| | | | | | | |||||
| * | | | | | Extra line | tonibm19 | 2013-10-27 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Sheep fixes. | tonibm19 | 2013-10-27 | 1 | -4/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Now amount of wool you get when shearing a sheep is random. Sheeps only spawn in white color (I will add sheep dying soon). | ||||
* | | | | | | Debuggers: Fixed after the cWindow API change. | madmaxoft | 2013-10-28 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | APIDump: Documented cWindow. | madmaxoft | 2013-10-28 | 1 | -21/+33 |
| | | | | | | |||||
* | | | | | | Renamed cWindow constants to include the "wt" prefix. | madmaxoft | 2013-10-28 | 8 | -40/+40 |
| | | | | | | |||||
* | | | | | | APIDump: Documented HTTPFormData and HTTPRequest. | madmaxoft | 2013-10-28 | 1 | -5/+39 |
| | | | | | | |||||
* | | | | | | APIDump: Fixed a failure in documented classes with no functions. | madmaxoft | 2013-10-28 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | APIDump: Documented cWorld. | madmaxoft | 2013-10-27 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | APIDump: Documented cRoot. | madmaxoft | 2013-10-27 | 1 | -3/+12 |
|/ / / / / | |||||
* | | | | | APIDump: Documented cProjectileEntity. | madmaxoft | 2013-10-27 | 1 | -3/+21 |
| | | | | | |||||
* | | | | | Added cChunk::UnboundedRelGetBlockLights(). | madmaxoft | 2013-10-27 | 2 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | This queries both BlockLight and SkyLight for the specified block. | ||||
* | | | | | Authenticator doesn't save the ini file. | madmaxoft | 2013-10-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Didn't load it -> shouldn't save it. | ||||
* | | | | | Merge branch 'origin/LoadWorlds/cAuthenticatorINI' | madmaxoft | 2013-10-27 | 4 | -18/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Changed "cIniFile IniFile" to cIniFile & IniFile" | STRWarrior | 2013-10-26 | 4 | -6/+6 |
| | | | | | | |||||
| * | | | | | Both the LoadWorlds() function and cAuthenticator now use the cIniFile object from the Root::Start() function. | STRWarrior | 2013-10-26 | 4 | -17/+9 |
| | | | | | | |||||
* | | | | | | APIDump: Documented cPickup. | madmaxoft | 2013-10-26 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'IniFileCleanup' | madmaxoft | 2013-10-26 | 17 | -927/+572 |
|\ \ \ \ \ \ | |||||
| * | | | | | | APIDump: Documented cIniFile. | madmaxoft | 2013-10-26 | 1 | -81/+135 |
| | | | | | | | |||||
| * | | | | | | cIniFile: Improved doxy-comments. | madmaxoft | 2013-10-26 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | ChunkWorx: Updated for the cIniFile changes. | madmaxoft | 2013-10-25 | 2 | -52/+62 |
| | | | | | | | |||||
| * | | | | | | cIniFile: Renamed functions to make meaning more explicit. | madmaxoft | 2013-10-25 | 6 | -584/+322 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example KeyComment() -> GetKeyComment() / AddKeyComment() | ||||
| * | | | | | | cIniFile doesn't store filename internally anymore. | madmaxoft | 2013-10-25 | 14 | -213/+56 |
| |/ / / / / | |||||
* / / / / / | cMonster: Improved doxycomments. | madmaxoft | 2013-10-25 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | APIDump: Documented cMonster. | madmaxoft | 2013-10-24 | 1 | -3/+52 |
| | | | | | |||||
* | | | | | Renamed cMonster::GetSpawnRate() to GetSpawnDelay(). | madmaxoft | 2013-10-24 | 5 | -35/+76 |
| | | | | | |||||
* | | | | | cPickup cleanup. | madmaxoft | 2013-10-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | APIDump: Documented cEnchantments. | madmaxoft | 2013-10-24 | 1 | -4/+37 |
| | | | | | | | | | | | | | | | | | | | | The constants are self-documenting, no need to describe them further. | ||||
* | | | | | APIDump: Documented cPickup. | madmaxoft | 2013-10-24 | 1 | -8/+10 |
| | | | | | |||||
* | | | | | Fixed cPickup's constructor's parameter naming. | madmaxoft | 2013-10-24 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | APIDump: Documented cItemGrid and cPlayer. | madmaxoft | 2013-10-24 | 1 | -30/+75 |
| | | | | | |||||
* | | | | | Cleanup in cPlayer. | madmaxoft | 2013-10-24 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Unified cPlayer's Heal() function with cEntity's. | madmaxoft | 2013-10-24 | 2 | -11/+11 |
| | | | | | |||||
* | | | | | Merge pull request #286 from tigerw/pickupdelay | Alexander Harkness | 2013-10-24 | 7 | -13/+19 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Pickups now have collection delay when vomited | ||||
| * | | | | Pickups now have collection delay when vomited | Tiger Wang | 2013-10-24 | 7 | -13/+19 |
| | |/ / | |/| | | | | | | | | | | Implements FS#394. | ||||
* | | | | APIDump: Added cChatColor constants. | madmaxoft | 2013-10-23 | 1 | -3/+23 |
| | | | | | | | | | | | | | | | | They don't really need much documentation, so just ignoring them in the Undocumented output. | ||||
* | | | | Fixed cLuaWindow's binding. | madmaxoft | 2013-10-23 | 3 | -25/+6 |
| | | | | | | | | | | | | | | | | No longer exporting multiple inheritance. | ||||
* | | | | APIDump: Documented the cHopperEntity class. | madmaxoft | 2013-10-23 | 1 | -0/+22 |
| | | | | |||||
* | | | | APIDump: Linkified cEntity returns. | madmaxoft | 2013-10-23 | 1 | -4/+7 |
| | | | | |||||
* | | | | Fixed bindings for cHopperEntity:GetOutputBlockPos(). | madmaxoft | 2013-10-23 | 4 | -51/+48 |
| | | | | |||||
* | | | | Fixed cDropSpenserEntity bindings generating an extra var. | madmaxoft | 2013-10-23 | 3 | -30/+11 |
| | | | | | | | | | | | | | | | | Caused by inadvertently exporting multiple-inheritance from a class that is not Lua-exported. | ||||
* | | | | Exported cHopperEntity to API. | madmaxoft | 2013-10-23 | 4 | -21/+157 |
| | | | | | | | | | | | | | | | | This allows hoppers to be created by plugins during chunk generation. | ||||
* | | | | Removed cRoot:m_PrimaryServerVersion from Lua API. | madmaxoft | 2013-10-23 | 4 | -41/+10 |
| | | | | | | | | | | | | | | | | We have the accessor methods for it. | ||||
* | | | | APIDump: member variables without a setter are considered constants. | madmaxoft | 2013-10-22 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | This fixes cChatColor constants being reported erroneously as member variables. | ||||
* | | | | APIDump: Inheritance is tested properly. | madmaxoft | 2013-10-22 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | This fixes #195 's second iteration. | ||||
* | | | | Temporary fix for world not locking chunkmap in TickMobs. | madmaxoft | 2013-10-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Reported as #283; this is a hotfix only. | ||||
* | | | | Fixed an assert in cMonster | madmaxoft | 2013-10-22 | 1 | -2/+2 |
| | | | | |||||
* | | | | Implemented UnboundedRel BlockLight and SkyLight. | madmaxoft | 2013-10-22 | 2 | -258/+124 |
| | | | | | | | | | | | | | | | | Also unified the various UnboundedRel operations to use the same underlying structure. | ||||
* | | | | Ignoring a few generated files. | madmaxoft | 2013-10-21 | 2 | -0/+2 |
| | | | | |||||
* | | | | Added ASSERTs to all ChunkDef operations. | madmaxoft | 2013-10-21 | 1 | -15/+40 |
| |/ / |/| | | | | | | | | This should avoid errors such as #276. | ||||
* | | | Fixed GetHTMLEscapedString() binding, removed obsolete memory function from API. | madmaxoft | 2013-10-21 | 4 | -57/+13 |
| | | | |||||
* | | | APIDump: Added link from cItem to the global ItemToString() et al. | madmaxoft | 2013-10-20 | 1 | -1/+5 |
| | | | |||||
* | | | APIDump: Fixed link in cPawn's desc. | madmaxoft | 2013-10-20 | 1 | -1/+1 |
| | | | |||||
* | | | APIDump: Various small fixes and additions. | madmaxoft | 2013-10-20 | 1 | -6/+53 |
| | | | |||||
* | | | APIDump: Fixed a few broken links. | madmaxoft | 2013-10-20 | 1 | -4/+4 |
| | | | |||||
* | | | APIDump: Statistics have a graphical meter; added hooks. | madmaxoft | 2013-10-20 | 1 | -9/+39 |
| | | | |||||
* | | | Fixed memory leak in cMobFamilyCollecter. | madmaxoft | 2013-10-20 | 3 | -52/+21 |
| | | | |||||
* | | | Reimplemented cMonster::FamilyFromType() as a simple switch (duh!) | madmaxoft | 2013-10-20 | 1 | -38/+27 |
| | | | |||||
* | | | Fixed memory leaks in cMobCensus, moved GetSpawnRate() to cMonster. | madmaxoft | 2013-10-20 | 7 | -89/+96 |
| | | | |||||
* | | | Fixed binary search in StringToMobType(). | madmaxoft | 2013-10-20 | 1 | -3/+3 |
| | | | |||||
* | | | Fixed memory leaks in cMobSpawner. | madmaxoft | 2013-10-20 | 3 | -62/+55 |
| | | | |||||
* | | | Moved all MobTypesManager functions to cMonster. | madmaxoft | 2013-10-20 | 9 | -298/+351 |
| | | | | | | | | | | | | This removes some of the memory leaks and is more logical in structure. Also the functions are exported to Lua. | ||||
* | | | Rewritten MobTypesManager not to leak memory. | madmaxoft | 2013-10-20 | 2 | -126/+112 |
| | | | |||||
* | | | APIDump: Added basic statistics about the docs. | madmaxoft | 2013-10-20 | 2 | -6/+83 |
| | | | |||||
* | | | APIDump: Fixed listing undocumented objects. | madmaxoft | 2013-10-20 | 1 | -5/+27 |
| | | | | | | | | | | | | Classes with undefined "Functions" section would not list their functions as undocumented; similar for "Constants" and "Variables". | ||||
* | | | Fixed loading allowed mobs in world. | madmaxoft | 2013-10-20 | 43 | -161/+320 |
| | | | |||||
* | | | Merge branch 'htmlescape'. | madmaxoft | 2013-10-20 | 4 | -113/+150 |
|\ \ \ | |||||
| * | | | Added a string reserve. | Alexander Harkness | 2013-10-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed compile error. silly parentheses creeping in. | Alexander Harkness | 2013-10-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added a APIDump description for GetHTMLEscapedString. | Alexander Harkness | 2013-10-19 | 1 | -63/+66 |
| | | | | |||||
| * | | | Changed the code according to xoft's suggestions. | Alexander Harkness | 2013-10-19 | 1 | -10/+10 |
| | | | | |||||
| * | | | Fixed general failings with everything. Fixes #211. | Alexander Harkness | 2013-10-19 | 2 | -15/+16 |
| | | | | | | | | | | | | | | | | My editor fixed some extra tabs in globals. | ||||
| * | | | Added a HTML escaping function to cWebAdmin. | Alexander Harkness | 2013-10-19 | 2 | -38/+80 |
| | | | | | | | | | | | | | | | | Apparently my editor fixed some failed tabs too. | ||||
* | | | | APIDump: Undocumented member variables are listed. | madmaxoft | 2013-10-19 | 1 | -4/+16 |
| | | | | |||||
* | | | | APIDump: Extra pages use the local prettify and CSS. | madmaxoft | 2013-10-19 | 1 | -2/+7 |
| | | | | |||||
* | | | | APIDump: Added member-variable filtering. | madmaxoft | 2013-10-19 | 2 | -0/+14 |
| | | | | |||||
* | | | | APIDump: Member variables are read from the API. | madmaxoft | 2013-10-19 | 1 | -10/+48 |
| | | | | |||||
* | | | | APIDump: Better header text for classes. | madmaxoft | 2013-10-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | APIDump: Added cIniFile additional info. | madmaxoft | 2013-10-18 | 2 | -1/+29 |
| | | | |||||
* | | | APIDump: Offline prettify is working. | madmaxoft | 2013-10-18 | 1 | -1/+11 |
| | | | |||||
* | | | APIDump: Added example code to cItem. | madmaxoft | 2013-10-18 | 1 | -0/+32 |
| | | | |||||
* | | | APIDump: Documented cItem's variables. | madmaxoft | 2013-10-18 | 1 | -4/+11 |
| | | | |||||
* | | | APIDump: Added support for member variables. | madmaxoft | 2013-10-18 | 2 | -4/+59 |
| | | | |||||
* | | | APIDump: Added prettify's license. | madmaxoft | 2013-10-18 | 1 | -0/+191 |
| | | | |||||
* | | | APIDump: Fixed offline JS. | madmaxoft | 2013-10-18 | 5 | -108/+41 |
| | | | | | | | | | | | | This time it's really offline :) | ||||
* | | | APIDump: Do not list empty Constants or Functions sections. | madmaxoft | 2013-10-18 | 1 | -14/+46 |
| | | | | | | | | | | | | Also implemented writing inherited constants. | ||||
* | | | APIDump: Split long code into functions. | madmaxoft | 2013-10-18 | 2 | -94/+110 |
| | | | |||||
* | | | APIDump: Ignore internal APIDump stuff. | madmaxoft | 2013-10-18 | 1 | -0/+2 |
| | | | |||||
* | | | APIDump: using local JS files instead of networked. | madmaxoft | 2013-10-18 | 3 | -4/+100 |
| | | | | | | | | | | | | This allows offline API browsing. | ||||
* | | | Adapted code style. | madmaxoft | 2013-10-18 | 5 | -85/+157 |
| | | | |||||
* | | | StringToItem() recognizes "ItemName:Dmg" strings. | madmaxoft | 2013-10-18 | 1 | -18/+21 |
| | | | | | | | | | | | | This allows commands such as "/i woodenshovel:40" | ||||
* | | | Fixed item-breaking. | madmaxoft | 2013-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | This fixes #232. | ||||
* | | | Fixed indentation and re-styled conditions. | madmaxoft | 2013-10-18 | 1 | -38/+44 |
| | | | |||||
* | | | Merge pull request #259 from tonibm19/patch-2 | Mattes D | 2013-10-18 | 1 | -30/+38 |
|\ \ \ | | | | | | | | | Fixed horse saddle | ||||
| * | | | Moved lines | tonibm19 | 2013-10-17 | 1 | -16/+17 |
| | | | | | | | | | | | | don't know if I did well | ||||
| * | | | More fixes | tonibm19 | 2013-10-17 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | - You can only tame horses with nothing at hand - Fixed rearing | ||||
| * | | | Improved horse saddling [SEE DESC] | tonibm19 | 2013-10-16 | 1 | -32/+32 |
| | | | | | | | | | | | | Now it checks if horse is already saddled, and if it's, you don't lose the saddle. Also, if the horse isn't tammed, you can't saddle it. | ||||
| * | | | Added extra line | tonibm19 | 2013-10-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed saddle horse | tonibm19 | 2013-10-15 | 1 | -4/+5 |
| | | | | |||||
* | | | | Fixed project file after mob update. | madmaxoft | 2013-10-18 | 1 | -0/+44 |
| | | | | |||||
* | | | | Fixed webadmin logging. | madmaxoft | 2013-10-18 | 3 | -3/+17 |
| | | | | | | | | | | | | | | | | This fixes #262. | ||||
* | | | | Merge pull request #253 from SamJBarney/master | Mattes D | 2013-10-18 | 29 | -227/+1349 |
|\ \ \ \ | | | | | | | | | | | Merge of Mob Spawning code by mgueydan | ||||
| * | | | | Removed reading default values from settings.ini for worlds. | Samuel Barney | 2013-10-14 | 1 | -10/+1 |
| | | | | | |||||
| * | | | | General fixes to get the new Monster spawning code working. | Samuel Barney | 2013-10-14 | 1 | -6/+17 |
| | | | | | | | | | | | | | | | | | | | | Also wrote in some code to use the default settings for monsters located in settings.ini | ||||
| * | | | | Merge branch 'MobSpawning' of https://github.com/mgueydan/MCServer into MobSpawning | Samuel Barney | 2013-10-14 | 29 | -227/+1345 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: source/Mobs/Bat.h source/Mobs/Monster.h source/World.cpp | ||||
| | * \ \ \ | Merge branch 'master' into MobSpawning | mgueydan | 2013-09-22 | 27 | -201/+2414 |
| | |\ \ \ \ | |||||
| | * | | | | | Inside cMonster::getMobFamily() : replacing Polymorphism by Map, in order to remove redundancy | mgueydan | 2013-09-10 | 11 | -29/+9 |
| | | | | | | | |||||
| | * | | | | | Changing Bat to AMbiant creature | mgueydan | 2013-09-10 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | replacing dynamic_cast by c-style cast | mgueydan | 2013-09-09 | 1 | -11/+4 |
| | | | | | | | |||||
| | * | | | | | replacing C-style cast by dynamic_cast | mgueydan | 2013-09-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Replacing chunCk by chunk | mgueydan | 2013-09-08 | 5 | -12/+12 |
| | | | | | | | |||||
| | * | | | | | replacing asserts by ASSERTs | mgueydan | 2013-09-08 | 3 | -6/+10 |
| | | | | | | | |||||
| | * | | | | | removing an assert + correcting a distance calculation bug | mgueydan | 2013-09-08 | 1 | -3/+9 |
| | | | | | | | |||||
| | * | | | | | renaming the cChunk::getRandomBlock method + removing a buggy working log | mgueydan | 2013-09-08 | 3 | -6/+3 |
| | | | | | | | |||||
| | * | | | | | incrementing .gitignore : adding emacs stuff and world | mgueydan | 2013-09-08 | 1 | -0/+20 |
| | | | | | | | |||||
| | * | | | | | Adding mobtype filter inside world.ini | mgueydan | 2013-09-08 | 2 | -9/+15 |
| | | | | | | | |||||
| | * | | | | | Adding glue to call everything done in last commits - now the mobs are spawning | mgueydan | 2013-09-08 | 3 | -140/+135 |
| | | | | | | | |||||
| | * | | | | | Disabeling current mob spawning and tick | mgueydan | 2013-09-08 | 3 | -8/+13 |
| | | | | | | | |||||
| | * | | | | | Implementing the MobSpawner (not used yet) that contains spawning rules | mgueydan | 2013-09-08 | 5 | -9/+384 |
| | | | | | | | |||||
| | * | | | | | Adding an Empty shell that would launch mob spawner - not called yet | mgueydan | 2013-09-08 | 5 | -3/+109 |
| | | | | | | | |||||
| | * | | | | | Adding mob census (sorry this is a big commit as work was done before git integration i couldn't split it more) | mgueydan | 2013-09-07 | 14 | -0/+622 |
| | | | | | | | |||||
| | * | | | | | Adding a getType in Monster that return an enum instead of an int or char | mgueydan | 2013-09-07 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | relockating mobs includes (they probably will end somewhere else in order not to recompile world each time you update a mob) | mgueydan | 2013-09-07 | 2 | -23/+24 |
| | | | | | | | |||||
| | * | | | | | Adding Family for monsters : Hostile/Passive/Water/Ambient | mgueydan | 2013-09-07 | 9 | -6/+56 |
| | | | | | | | |||||
| | * | | | | | Adding Water and Lava as transparency blocks | mgueydan | 2013-09-07 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Samuel Barney | 2013-10-14 | 49 | -138/+1564 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Mobs no longer spawn up in the air. | Samuel Barney | 2013-10-14 | 1 | -0/+2 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Renamed output for helper stuff. | madmaxoft | 2013-10-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Undocumented objects are output to _undocumented.lua Overdocumented objects are output to _unexported-documented.txt Missing pages are output to _missingPages.txt | ||||
* | | | | | | | | APIDump: Makes a list of bad links. | madmaxoft | 2013-10-18 | 1 | -17/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #219. | ||||
* | | | | | | | | APIDump: Improved page titles. | madmaxoft | 2013-10-18 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_RIGHT_CLICKING_ENTITY. | madmaxoft | 2013-10-18 | 1 | -0/+20 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_SHOOTING. | madmaxoft | 2013-10-18 | 1 | -0/+25 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_SPAWNED. | madmaxoft | 2013-10-18 | 1 | -0/+25 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_TOSSING_ITEM. | madmaxoft | 2013-10-18 | 1 | -0/+23 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_USED_BLOCK. | madmaxoft | 2013-10-17 | 1 | -0/+39 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_USED_ITEM. | madmaxoft | 2013-10-17 | 1 | -0/+39 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_USING_BLOCK. | madmaxoft | 2013-10-17 | 1 | -2/+45 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_PLAYER_USING_ITEM. | madmaxoft | 2013-10-17 | 1 | -0/+36 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_UPDATED_SIGN. | madmaxoft | 2013-10-17 | 1 | -0/+30 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_TICK. | madmaxoft | 2013-10-17 | 1 | -0/+22 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_TAKE_DAMAGE. | madmaxoft | 2013-10-17 | 1 | -0/+24 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_UPDATING_SIGN. | madmaxoft | 2013-10-17 | 1 | -0/+50 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: More robust against missing APIDesc items. | madmaxoft | 2013-10-17 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_WEATHER_CHANGED. | madmaxoft | 2013-10-16 | 1 | -0/+21 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_WEATHER_CHANGING. | madmaxoft | 2013-10-16 | 1 | -0/+24 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented HOOK_WORLD_TICK. | madmaxoft | 2013-10-16 | 1 | -0/+24 |
| | | | | | | | | |||||
* | | | | | | | | Fixed compilation errors. | madmaxoft | 2013-10-16 | 1 | -2/+6 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Nicer HTML visage. | madmaxoft | 2013-10-16 | 3 | -158/+230 |
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed whacky HTML indentation + Added fancy CSS! + Now HTML5 compatible! | ||||
* | | | | | | | Merge remote-tracking branch 'upstream/master' | Tiger Wang | 2013-10-15 | 11 | -29/+1053 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added HOOK_PLAYER_RIGHT_CLICK | Alexander Harkness | 2013-10-15 | 1 | -8/+38 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Linkification supports #anchors. | madmaxoft | 2013-10-15 | 1 | -2/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements #198. | ||||
| * | | | | | | | Merge pull request #258 from tonibm19/patch-2 | Alexander Harkness | 2013-10-15 | 3 | -4/+25 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | Added horse saddling and basic milk code. | ||||
| | * | | | | | | Fixed a big fail.I did | tonibm19 | 2013-10-15 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Added extra line (yes, again) | tonibm19 | 2013-10-15 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Added basic milk code. | tonibm19 | 2013-10-15 | 1 | -5/+12 |
| | | | | | | | | |||||
| | * | | | | | | Added extra line | tonibm19 | 2013-10-15 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Added horse saddling | tonibm19 | 2013-10-15 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | It uses pig code, sorry if it don't works, i'm a noob, but it should work. | ||||
| * | | | | | | | APIDump: Documented HOOK_SPAWNING_MONSTER. | madmaxoft | 2013-10-15 | 1 | -0/+26 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_SPAWNING_ENTITY. | madmaxoft | 2013-10-15 | 1 | -2/+34 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_SPAWNED_MONSTER. | madmaxoft | 2013-10-15 | 1 | -1/+21 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_SPAWNED_ENTITY. | madmaxoft | 2013-10-15 | 1 | -0/+20 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_PRE_CRAFTING. | madmaxoft | 2013-10-15 | 1 | -0/+30 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_POST_CRAFTING. | madmaxoft | 2013-10-15 | 1 | -0/+29 |
| |/ / / / / / | |||||
| * | | | | | | APIDump: Documented HOOK_PLAYER_PLACING_BLOCK. | madmaxoft | 2013-10-15 | 1 | -0/+38 |
| | | | | | | | |||||
| * | | | | | | APIDump: Documented HOOK_PLAYER_MOVING and HOOK_PLAYER_PLACED_BLOCK. | madmaxoft | 2013-10-15 | 1 | -0/+53 |
| | | | | | | | |||||
| * | | | | | | APIDump: Documented HOOK_PLAYER_LEFT_CLICK. | madmaxoft | 2013-10-15 | 1 | -0/+40 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #257 from Sofapriester/patch-1 | Alexander Harkness | 2013-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update BlockID.cpp -> fix Issue #254 | ||||
| | * | | | | | | Update BlockID.cpp | Sofapriester | 2013-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added g_BlockIsTorchPlaceable[E_BLOCK_STONE_BRICKS] = true; -> this should fix Issue #254 -> Please check if ok Thx | ||||
| * | | | | | | | APIDump: Documented HOOK_PLAYER_JOINED. | madmaxoft | 2013-10-15 | 1 | -0/+22 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_PLAYER_EATING. | madmaxoft | 2013-10-15 | 1 | -0/+20 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_PLAYER_BROKEN_BLOCK. | madmaxoft | 2013-10-15 | 1 | -2/+31 |
| | | | | | | | | |||||
| * | | | | | | | APIDump: Documented HOOK_PLAYER_BREAKING_BLOCK. | madmaxoft | 2013-10-15 | 1 | -0/+30 |
| |/ / / / / / | |||||
| * | | | | | | APIDump: Documented HOOK_PLAYER_ANIMATION. | madmaxoft | 2013-10-14 | 1 | -0/+21 |
| | | | | | | | |||||
| * | | | | | | APIDump: Removed HOOK_MAX and HOOK_NUM_HOOKS from documentation. | madmaxoft | 2013-10-14 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're not really hooks, just constants for the maximum. | ||||
| * | | | | | | APIDump: Documented HOOK_LOGIN. | madmaxoft | 2013-10-14 | 1 | -0/+25 |
| | | | | | | | |||||
| * | | | | | | APIDump: Documented HOOK_KILLING. | madmaxoft | 2013-10-14 | 1 | -0/+27 |
| | | | | | | | |||||
| * | | | | | | APIDump: Documented HOOK_HOPPER_PUSHING_ITEM. | madmaxoft | 2013-10-14 | 1 | -3/+28 |
| | | | | | | | |||||
| * | | | | | | APIDump: Documented HOOK_HOPPER_PULLING_ITEM. | madmaxoft | 2013-10-14 | 1 | -0/+23 |
| | | | | | | | |||||
| * | | | | | | Add the first line back. | Alexander Harkness | 2013-10-14 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #251 from tonibm19/patch-1 | Alexander Harkness | 2013-10-14 | 1 | -1/+4 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Stairs crafting fixes | ||||
| | * | | | | | Stairs crafting fixes | tonibm19 | 2013-10-14 | 1 | -1/+4 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Fixes #233 Added Stone Brick Stairs crafting recipe and added alternative crafting recipes for Nether Brick Stairs and Quartz Stairs | ||||
| * | | | | | APIDump: Documented HOOK_HANDSHAKE. | madmaxoft | 2013-10-14 | 1 | -0/+23 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_EXPLODING. | madmaxoft | 2013-10-14 | 1 | -0/+44 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_EXPLODED. | madmaxoft | 2013-10-14 | 1 | -0/+43 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_EXECUTE_COMMAND. | madmaxoft | 2013-10-14 | 1 | -0/+25 |
| | | | | | | |||||
| * | | | | | APIDump: Updated the template for undocumented hooks. | madmaxoft | 2013-10-14 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_DISCONNECT. | madmaxoft | 2013-10-14 | 1 | -0/+26 |
| | | | | | | |||||
| * | | | | | APIDump: Fixed info missing from cCraftingRecipe. | madmaxoft | 2013-10-14 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_CRAFTING_NO_RECIPE. | madmaxoft | 2013-10-14 | 1 | -0/+26 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_COLLECTING_PICKUP. | madmaxoft | 2013-10-14 | 1 | -0/+27 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_CHUNK_UNLOADING. | madmaxoft | 2013-10-14 | 1 | -0/+23 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_CHUNK_UNLOADED. | madmaxoft | 2013-10-14 | 1 | -0/+22 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_CHUNK_GENERATING. | madmaxoft | 2013-10-14 | 1 | -1/+33 |
| | | | | | | |||||
| * | | | | | APIDump: Fixed undocumented hook param generator. | madmaxoft | 2013-10-14 | 1 | -8/+9 |
| | | | | | | |||||
| * | | | | | APIDump: Added example to HOOK_CHUNK_GENERATED. | madmaxoft | 2013-10-14 | 1 | -0/+37 |
| | | | | | | |||||
| * | | | | | APIDump: Documented HOOK_CHUNK_GENERATED. | madmaxoft | 2013-10-14 | 1 | -0/+26 |
| | | | | | | |||||
| * | | | | | APIDump: The undocumented hooks template now has 8 params. | madmaxoft | 2013-10-14 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | This allows for easier copypasting, hooks with less than 9 params don't need an extra copy-paste for a new param entry. | ||||
| * | | | | | APIDump: Documented HOOK_CHUNK_AVAILABLE. | madmaxoft | 2013-10-14 | 1 | -0/+21 |
| | | | | | | |||||
| * | | | | | WebAdmin honors the [WebAdmin].Enable setting. | madmaxoft | 2013-10-13 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes #234. | ||||
| * | | | | | Fixed WebAdmin's request parameters. | madmaxoft | 2013-10-13 | 4 | -7/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also added doxycomments on what they really contain. | ||||
* | | | | | | Merge submodule changes | Tiger Wang | 2013-10-13 | 3 | -0/+6 |
|/ / / / / | |||||
* | | | | | Merge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata. | madmaxoft | 2013-10-13 | 39 | -121/+980 |
|\ \ \ \ \ | |||||
| * | | | | | Eight round of fixes | Tiger Wang | 2013-10-13 | 6 | -29/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed IsA() to *long if statement* - Removed deprecated values in Entity.h - to blazes with the plugins! * Renamed villager type enumerations to be LESS SHOUTY and more vt-y + Use vtMax for World.cpp testificate spawning | ||||
| * | | | | | Seventh round of fixes | Tiger Wang | 2013-10-13 | 1 | -21/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed arrows not critical-effecting because they were in MOBS! (derp) * Used cMonster::mtXX as per xoft's suggestions | ||||
| * | | | | | Sixth round of fixes | Tiger Wang | 2013-10-11 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Made horse rearing time fixed instead of random | ||||
| * | | | | | Fifth round of fixes | Tiger Wang | 2013-10-11 | 3 | -7/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Enumerated Villager spawning | ||||
| * | | | | | Fourth round of fixes | Tiger Wang | 2013-10-11 | 2 | -135/+153 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switchified WriteMobMetadata * Renamed Horse functions to be better | ||||
| * | | | | | Third round of fixes | Tiger Wang | 2013-10-11 | 8 | -82/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split WriteMetadata into three functions for common, entity, and mob * Edited a few mob sizes to Vanilla values | ||||
| * | | | | | Second round of fixes | Tiger Wang | 2013-10-09 | 17 | -112/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Implemented suggestions | ||||
| * | | | | | Initial round of fixes | Tiger Wang | 2013-10-08 | 4 | -25/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed intentional misspelling of baby! :D * Better chested horse bool name * Fixed some weird continuity issues with my recent changes not being pushed up initially * Fixed derpy hexadecimal values | ||||
| * | | | | | Initial Metadata Commit [SEE DESC] | Tiger Wang | 2013-10-08 | 23 | -95/+714 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Pigs, Minecarts, Sheep, Skeletons, Slimes, Villagers, Wolves, and Horses have metadata + Base code on taming wolves, shearing sheep, and taming horses + Sheep and horses have different colours when spawned | ||||
* | | | | | | Merge pull request #226 from SamJBarney/master | Mattes D | 2013-10-13 | 1 | -1/+7 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | Crop blocks now respect light. | ||||
| * | | | | | Removed faulty code dealing with water. | Samuel Barney | 2013-10-13 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Crop blocks now respect water and light. Currently a block has to be "watered" or the crop has a chance of breaking anyways. | Samuel Barney | 2013-10-12 | 1 | -1/+8 |
| | | | | | | |||||
* | | | | | | Re-added the cWorld:GetSignLines() to the API. | madmaxoft | 2013-10-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Somehow this got lost somewhere. | ||||
* | | | | | | Added 1.7 biome constants. | madmaxoft | 2013-10-12 | 2 | -2/+89 |
| | | | | | | |||||
* | | | | | | APIDump: Documented the webserver vs world threads. | madmaxoft | 2013-10-12 | 1 | -2/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes #12. | ||||
* | | | | | | Merge pull request #225 from SamJBarney/master | Mattes D | 2013-10-12 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | Fix: Wrong arg name | ||||
| * | | | | | Fix: Wrong arg name | Samuel Barney | 2013-10-12 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #224 from tonibm19/patch-7 | Mattes D | 2013-10-12 | 1 | -3/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | Added Horses, Blazes and EnderDragons spawning. | ||||
| * | | | | | Added more ghast spawning probability | tonibm19 | 2013-10-12 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Added extra line | tonibm19 | 2013-10-12 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Mob spawning changes | tonibm19 | 2013-10-12 | 1 | -4/+24 |
| | | | | | | | | | | | | | | | | | | Added EnderDragon, Blaze and Horse spawning. | ||||
* | | | | | | Fixed and exported cWorld:QueueTask(). | madmaxoft | 2013-10-12 | 4 | -3/+105 |
|/ / / / / | | | | | | | | | | | | | | | | This implements #220. | ||||
* | | | | | APIDump: Added pretty-printing to code examples. | madmaxoft | 2013-10-12 | 2 | -30/+35 |
| | | | | | |||||
* | | | | | APIDump: Added an OnBlockToPickups() code example. | madmaxoft | 2013-10-12 | 1 | -0/+26 |
| | | | | | |||||
* | | | | | APIDump: Added the possibility of extra code examples for hooks. | madmaxoft | 2013-10-12 | 1 | -2/+8 |
| | | | | | |||||
* | | | | | APIDump: Documented OnBlockToPickups. | madmaxoft | 2013-10-12 | 1 | -0/+30 |
| | | | | | |||||
* | | | | | APIDump: Hook notes are linkified. | madmaxoft | 2013-10-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | BiomeVisualiser: fixed crash at shutdown caused by bad logging | madmaxoft | 2013-10-12 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | Fixed second logger constructor. | madmaxoft | 2013-10-12 | 2 | -22/+43 |
| | | | | | |||||
* | | | | | Updated BiomeVisualiser to compile again. | madmaxoft | 2013-10-11 | 3 | -9/+24 |
| | | | | | |||||
* | | | | | CompoGen and HeiGen read their settings in their respective Initialize() functions. | madmaxoft | 2013-10-11 | 8 | -92/+199 |
| | | | | | |||||
* | | | | | Added GetIniItemSet() function. | madmaxoft | 2013-10-11 | 4 | -8/+73 |
| | | | | | | | | | | | | | | | | | | | | It reads a block / item description from the specified INI file value and returns as cItem; stores and uses the default if value doesn't exist. | ||||
* | | | | | Generator: Renamed cBiomeGenerator's Initialize() to InitializeBiomeGen(). | madmaxoft | 2013-10-10 | 4 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | This will allow initializing generators that implement both cBiomeGenerator and other generators. | ||||
* | | | | | APIDump: Fixed extra pages copying. | madmaxoft | 2013-10-09 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | APIDump: Implemented basic hook documentation. | madmaxoft | 2013-10-09 | 2 | -11/+152 |
| | | | | | |||||
* | | | | | Fixed cFile::CopyFile Linux compilation. | madmaxoft | 2013-10-09 | 1 | -7/+3 |
| | | | | | |||||
* | | | | | APIDump: Documented the new cFile API functions. | madmaxoft | 2013-10-09 | 2 | -2/+26 |
| | | | | | |||||
* | | | | | APIDump: Added support for extra pages. | madmaxoft | 2013-10-09 | 3 | -3/+52 |
| | | | | | | | | | | | | | | | | | | | | Referenced by file links and titles and copied directly from the plugin folder to the dest folder. | ||||
* | | | | | APIDump: Taking advantage of the new cFile API. | madmaxoft | 2013-10-09 | 1 | -9/+7 |
| | | | | | |||||
* | | | | | Moved cMakeDir::MakeDir to cFile::CreateFolder. | madmaxoft | 2013-10-09 | 12 | -70/+66 |
| | | | | | | | | | | | | | | | | | | | | And exported to Lua. | ||||
* | | | | | Added static cFile functions to Lua API. | madmaxoft | 2013-10-09 | 6 | -16/+320 |
| | | | | | |||||
* | | | | | Fixed warning in cFireSimulator. | madmaxoft | 2013-10-09 | 1 | -13/+8 |
| | | | | | | | | | | | | | | | | | | | | All code paths now have a return value. | ||||
* | | | | | Merge branch 'magicalcarpets' of git://github.com/tigerw/MCServer into tigerw-magicalcarpets | madmaxoft | 2013-10-08 | 2 | -8/+26 |
|\ \ \ \ \ | |||||
| * | | | | | Some additional changes | Tiger Wang | 2013-10-08 | 2 | -18/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert to Core:Call() - Removed variable | ||||
| * | | | | | Made MagicCarpet more magical! | Tiger Wang | 2013-10-04 | 3 | -7/+33 |
| | | | | | | |||||
| * | | | | | Fixed discrepancy | Tiger Wang | 2013-10-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | MagicCarpet Fixes [SEE DESC] | Tiger Wang | 2013-10-02 | 1 | -6/+9 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | + Version 2! * Fixed loading plugin + Now uses Core messaging functions | ||||
* | | | | | Fixed WebAdmin template after moving the memory stats functions to cRoot. | madmaxoft | 2013-10-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Implemented the two memory-statistics functions in cRoot. | madmaxoft | 2013-10-08 | 5 | -57/+185 |
| | | | | | | | | | | | | | | | | | | | | This fixes #185. cWebAdmin::GetMemoryUsage() is accessible but deprecated (with a warning output to the screen). | ||||
* | | | | | Cleaned up cEntity's enums. | madmaxoft | 2013-10-08 | 3 | -43/+22 |
| | | | | | | | | | | | | | | | | | | | | Several were obsoleted and unused, others weren't supposed to be exported to the Lua API. | ||||
* | | | | | Merge pull request #208 from mc-server/NewWebServer | Mattes D | 2013-10-07 | 43 | -2610/+3203 |
|\ \ \ \ \ | | | | | | | | | | | | | New web server | ||||
| * | | | | | Fixed memory leaks in the HTTP framework | madmaxoft | 2013-10-06 | 5 | -6/+43 |
| | | | | | | |||||
| * | | | | | cListenThread: Fixed thread termination. | madmaxoft | 2013-10-06 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Added proper shutdown to HTTPServer. | madmaxoft | 2013-10-06 | 2 | -0/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into NewWebServer | madmaxoft | 2013-10-06 | 18 | -211/+749 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | This should simplify merging | ||||
| * | | | | | | Removed remnants of the old webserver. | madmaxoft | 2013-10-06 | 2 | -32/+2 |
| | | | | | | | |||||
| * | | | | | | Removed the old WebServer library. | madmaxoft | 2013-10-05 | 19 | -2298/+1 |
| | | | | | | | |||||
| * | | | | | | WebAdmin uses the new HTTP functionality. | madmaxoft | 2013-10-05 | 10 | -301/+414 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial implementation of #183. | ||||
| * | | | | | | Fixed Base64Decode() returning wrong value. | madmaxoft | 2013-10-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | cHTTPConnection sends Content-Length with HTTP errors, too. | madmaxoft | 2013-10-05 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Added Basic auth support to cHTTPRequest. | madmaxoft | 2013-10-04 | 7 | -1/+136 |
| | | | | | | | |||||
| * | | | | | | HTTP Server can now parse multipart/form-data forms; better architecture. | madmaxoft | 2013-10-04 | 8 | -185/+342 |
| | | | | | | | |||||
| * | | | | | | Fixed MultiPartParser's boundary parsing. | madmaxoft | 2013-10-04 | 2 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Added cEnvelopeParser and cMultipartParser. | madmaxoft | 2013-10-04 | 4 | -0/+532 |
| | | | | | | | |||||
| * | | | | | | Added cNameValueParser. | madmaxoft | 2013-10-04 | 2 | -0/+482 |
| | | | | | | | |||||
| * | | | | | | Added StrToLower(), URLDecode() and ReplaceAllCharOccurrences(). | madmaxoft | 2013-10-04 | 2 | -0/+20 |
| | | | | | | | |||||
| * | | | | | | Improved the HTTPFormParser code. | madmaxoft | 2013-09-28 | 2 | -57/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | No change to the functionality. | ||||
| * | | | | | | Fixed recognition of multipart-form-data forms. | madmaxoft | 2013-09-28 | 2 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Created basic cHTTPFormParser. | madmaxoft | 2013-09-28 | 6 | -2/+324 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads. | ||||
| * | | | | | | Added URLDecode() and ReplaceAllCharOccurrences() to StringUtils. | madmaxoft | 2013-09-28 | 2 | -0/+76 |
| | | | | | | | |||||
| * | | | | | | Added UserData to cHTTPRequest. | madmaxoft | 2013-09-27 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callbacks may store one pointer of per-request data in the cHTTPRequest object. The object doesn't touch this data (doesn't own it). | ||||
| * | | | | | | Added cHTTPServer callbacks; fixed keep-alives. | madmaxoft | 2013-09-27 | 4 | -13/+132 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection. | ||||
| * | | | | | | Fixed leaking HTTPRequest objects | madmaxoft | 2013-09-27 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Fixed parsing and implemented write nofitication. | madmaxoft | 2013-09-27 | 6 | -13/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The web connection finally works with a browser. | ||||
| * | | | | | | Split cHTTPConnection implementation into a separate file. | madmaxoft | 2013-09-27 | 5 | -205/+246 |
| | | | | | | | |||||
| * | | | | | | Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes. | madmaxoft | 2013-09-27 | 9 | -474/+831 |
| | | | | | | | |||||
| * | | | | | | Implemented basic HTTP message header parsing. | madmaxoft | 2013-09-24 | 5 | -4/+475 |
| | | | | | | | |||||
* | | | | | | | Fixed startup timings on server restart. | madmaxoft | 2013-10-07 | 1 | -4/+3 |
| | | | | | | | |||||
* | | | | | | | Fixed authenticator thread restart. | madmaxoft | 2013-10-07 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #209. | ||||
* | | | | | | | Updated plugins. | Alexander Harkness | 2013-10-07 | 3 | -6/+0 |
| | | | | | | | |||||
* | | | | | | | Plugin folders now check for "." and "..". | madmaxoft | 2013-10-06 | 1 | -2/+2 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | This fixes #207. | ||||
* | | | | | | APIDump: Brought cItem docs up-to-date. | madmaxoft | 2013-10-05 | 1 | -5/+7 |
| | | | | | | |||||
* | | | | | | APIDump: Added cLineBlockTracer documentation. | madmaxoft | 2013-10-04 | 1 | -4/+86 |
| | | | | | | |||||
* | | | | | | APIDump: Documented cPlugin | STRWarrior | 2013-10-04 | 1 | -5/+9 |
| | | | | | | |||||
* | | | | | | APIDump: Added the cWorld:IsWeatherXXX() functions. | madmaxoft | 2013-10-04 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Optimized cBlockFarmlandHandler in wet weather. | madmaxoft | 2013-10-04 | 1 | -27/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | The area isn't read at all when the weather is wet, since it isn't needed. | ||||
* | | | | | | Added cWorld::IsWeatherXXX() functions | madmaxoft | 2013-10-04 | 3 | -3/+143 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of git://github.com/SamJBarney/MCServer into SamJBarney-master | madmaxoft | 2013-10-04 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added comparison for desert biomes. | Samuel Barney | 2013-10-04 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Rain now waters farmland. | Samuel Barney | 2013-10-04 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | APIDump: Removed ignored classes logging. | madmaxoft | 2013-10-02 | 1 | -2/+0 |
| | | | | | | | |||||
* | | | | | | | APIDump: Fixed operator == rename having bad DocID. | madmaxoft | 2013-10-02 | 2 | -3/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #201 from SamJBarney/master | Mattes D | 2013-10-02 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | Added glass pane as transparent. Removed duplicate g_BlockOneHitDig[E_BLOCK_REDSTAONE_WIRE] | ||||
| * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Samuel Barney | 2013-10-02 | 13 | -115/+292 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #193 from tigerw/bugfixes | Mattes D | 2013-10-01 | 9 | -48/+60 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Startup messages revision. | ||||
| * | | | | | | | Removed unneeded statement | Tiger Wang | 2013-09-30 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also LOGINFO'd "Starting WebAdmin" | ||||
| * | | | | | | | Improvements to startup timer | Tiger Wang | 2013-09-29 | 2 | -17/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by xoft. Also reverted changes of displayed protocol version. | ||||
| * | | | | | | | Updated README | Tiger Wang | 2013-09-28 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See for yourself :) | ||||
| * | | | | | | | Minor startup streamlining | Tiger Wang | 2013-09-28 | 8 | -41/+60 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LOGD'd unneeded debugging messages, streamlining startup + Added a basic timer for how long in seconds it took to start up + Added two checks for plural (plugin/s, second/s) | ||||
* | | | | | | | Merge pull request #199 from tigerw/moar-bugfixes | Mattes D | 2013-10-01 | 1 | -5/+17 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed a fire simulator bug | ||||
| * | | | | | | | Fixed issues | Tiger Wang | 2013-09-30 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fixed a fire simulator bug | Tiger Wang | 2013-09-30 | 1 | -6/+18 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fire now doesn't stay when it isn't on a flammable block. Fixes the "fire creates chandeliers" bug in report #131 | ||||
| * | | | | | | Merge pull request #2 from tigerw/bugfixes | Tiger Wang | 2013-09-24 | 44 | -249/+923 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Bugfixes | ||||
| * \ \ \ \ \ \ | Merge pull request #1 from tigerw/bugfixes | Tiger Wang | 2013-09-17 | 2 | -20/+21 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Bugfixes branch merge | ||||
* | | | | | | | | | APIDump: Added equality operator renaming. | madmaxoft | 2013-09-30 | 1 | -0/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | APIDump: Fixed overloaded functions' docs. | madmaxoft | 2013-09-29 | 1 | -18/+45 |
| | | | | | | | | | |||||
* | | | | | | | | | APIDump: Added more inheritance and linkification. | madmaxoft | 2013-09-29 | 1 | -4/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | APIDump: Linkified cDropSpenser constants. | madmaxoft | 2013-09-29 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | APIDump: Added the possibility to ignore classes. Ignoring Lua builtins. | madmaxoft | 2013-09-29 | 2 | -1/+40 |
| | | | | | | | | | |||||
* | | | | | | | | | APIDump: Updated cEntity docs. | madmaxoft | 2013-09-27 | 1 | -33/+115 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed a typo in cEntity doxycomments. | madmaxoft | 2013-09-27 | 1 | -4/+4 |
| | | | | | | | | | |||||
| | | | * | | | | | Added glass pane as transparent. Removed excess g_BlockOneHitDig[E_BLOCK_REDSTONE_WIRE]. | Samuel Barney | 2013-10-01 | 1 | -1/+1 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | APIDump: Documented cServer | STRWarrior | 2013-09-27 | 1 | -1/+6 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Completed cCuboid docs. | madmaxoft | 2013-09-26 | 1 | -6/+28 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Completed cCraftingGrid's documentation. | madmaxoft | 2013-09-26 | 1 | -3/+8 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: completed cChestEntity docs. | madmaxoft | 2013-09-26 | 1 | -1/+30 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Updated cBlockArea docs. | madmaxoft | 2013-09-25 | 1 | -0/+3 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Updated cChunkDesc docs. | madmaxoft | 2013-09-25 | 1 | -2/+25 |
| | | | | | | | | |||||
* | | | | | | | | Removed cChunkDesc::SetChunkCoords() from Lua API. | madmaxoft | 2013-09-25 | 3 | -41/+5 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Updated cClientHandle documentation | madmaxoft | 2013-09-25 | 1 | -5/+7 |
| | | | | | | | | |||||
* | | | | | | | | APIDump: Documented the cBoundingBox class. | madmaxoft | 2013-09-24 | 1 | -2/+35 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Fixed a few compiler warnings | madmaxoft | 2013-09-22 | 3 | -23/+36 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #186 from tigerw/bugfixes | Mattes D | 2013-09-22 | 15 | -47/+125 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | One feature and a few changes | ||||
| * | | | | | | Removed some unneeded includes | Tiger Wang | 2013-09-22 | 9 | -12/+0 |
| | | | | | | | |||||
| * | | | | | | Changed a comment | Tiger Wang | 2013-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was a remnant of my TypeType minecarts :D | ||||
| * | | | | | | Added button placement handler | Tiger Wang | 2013-09-22 | 5 | -1/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed an unneeded variable in the stair handler | ||||
| * | | | | | | Removed OnDigging for Redstone devices | Tiger Wang | 2013-09-22 | 6 | -30/+1 |
| | | | | | | | |||||
| * | | | | | | Increase piston delay to a second | Tiger Wang | 2013-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another fix for #57 | ||||
| * | | | | | | Changed to SetBlockMeta | Tiger Wang | 2013-09-22 | 3 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Added a simple valgrind script for easier testing. | madmaxoft | 2013-09-22 | 3 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | APIDump: Forgot a function in globals. | STRWarrior | 2013-09-22 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | APIDump: Documented the globals. | STRWarrior | 2013-09-22 | 1 | -0/+37 |
| | | | | | | | |||||
* | | | | | | | Updated coding style to match ours. | madmaxoft | 2013-09-22 | 1 | -4/+8 |
| | | | | | | | |||||
* | | | | | | | Implemented Apple-specific GetMemoryUsage. | Samuel Barney | 2013-09-22 | 1 | -2/+11 |
| | | | | | | | |||||
* | | | | | | | Prepared cWebAdmin for Apple-specific GetMmeoryUsage() | madmaxoft | 2013-09-21 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Fixed Linux threading issues. | madmaxoft | 2013-09-21 | 4 | -17/+8 |
| | | | | | | | |||||
* | | | | | | | Fixed cFile:IsFolder() and plugin-loading. | madmaxoft | 2013-09-21 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix loading plugins on Linux. | ||||
* | | | | | | | Implemented cWebAdmin:GetMemoryUsage() on Linux proper. | madmaxoft | 2013-09-21 | 5 | -62/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also the function now returns an int, number of KiB used, or -1 on failure. | ||||
* | | | | | | | Fixed pickup spawning with inherited gamemode. | madmaxoft | 2013-09-21 | 2 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #179 from tonibm19/patch-6 | Mattes D | 2013-09-21 | 1 | -0/+30 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added new mobs health. | ||||
| * | | | | | | | Added new mobs health. | tonibm19 | 2013-09-19 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't merge until tigerw PR is merged. Health set according to minecraftwiki. | ||||
* | | | | | | | | Linux compilation fix #3. | madmaxoft | 2013-09-21 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Linux compilation fix #2. | madmaxoft | 2013-09-21 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Fixed Linux compilation. | madmaxoft | 2013-09-21 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Fixed compilation from previous commit. | madmaxoft | 2013-09-21 | 2 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes | madmaxoft | 2013-09-20 | 28 | -122/+678 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Fixed pickup block spawning | Tiger Wang | 2013-09-19 | 1 | -8/+9 |
| | | | | | | | | |||||
| * | | | | | | | Implemented xoft's suggestions | Tiger Wang | 2013-09-19 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fixed new monster aggressiveness issue | Tiger Wang | 2013-09-19 | 2 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Fixed pickups | Tiger Wang | 2013-09-18 | 4 | -23/+16 |
| | | | | | | | | |||||
| * | | | | | | | Added moar mobs! | Tiger Wang | 2013-09-18 | 20 | -95/+473 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added dragons + Added golems + Added giants + Added horses + Added some missing items + Added missing spawn egg metas | ||||
| * | | | | | | | Implemented redstone comparators | Tiger Wang | 2013-09-18 | 7 | -2/+186 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They can be placed and toggled, but stills needs proper redstone support | ||||
* | | | | | | | | Fixed rounding errors in cProtocol125::SendExplosion(). | madmaxoft | 2013-09-19 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix #129. | ||||
* | | | | | | | | ProtoProxy: Added handling for the Explosion packet. | madmaxoft | 2013-09-19 | 2 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help #129. | ||||
* | | | | | | | | Fixed a crash in cEntity when the entity was at BlockY == 0. | madmaxoft | 2013-09-19 | 1 | -3/+2 |
| | | | | | | | | |||||
* | | | | | | | | ProtoProxy: Removed the per-packet sleep from the DEBUG version. | madmaxoft | 2013-09-19 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now enabled by defining a macro, by default off. | ||||
* | | | | | | | | Added support for 1.6.3 and 1.6.4 protocols. | madmaxoft | 2013-09-19 | 4 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No relevant changes have been detected, using the 1.6.2 protocol handler. | ||||
* | | | | | | | | APIDump: Automatic corrections. | madmaxoft | 2013-09-19 | 1 | -83/+78 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Added a global "g_Plugin" object to all Lua plugins. | madmaxoft | 2013-09-18 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows plugins to have an empty Initialize function and implementing all their initialization at global level, thus modularising everything. | ||||
* | | | | | | | Improved error message in cPlugin:AddWebTab() API. | madmaxoft | 2013-09-18 | 1 | -4/+6 |
| | | | | | | | |||||
* | | | | | | | Added cPlugin:GetLocalFolder() API function. | madmaxoft | 2013-09-18 | 4 | -9/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This supersedes the cPlugin:GetLocalDirectory() function. | ||||
* | | | | | | | APIDump: Updated cPluginManager documentation. | madmaxoft | 2013-09-18 | 1 | -16/+88 |
| | | | | | | | |||||
* | | | | | | | Proper folder / file distinction in plugin loading. | madmaxoft | 2013-09-18 | 3 | -3/+20 |
| | | | | | | | |||||
* | | | | | | | cPluginManager:BindConsoleCommand can be called with the dot operator, too. | madmaxoft | 2013-09-18 | 1 | -15/+20 |
| | | | | | | | |||||
* | | | | | | | cPluginManager:BindCommand can be called with the dot operator, too. | madmaxoft | 2013-09-18 | 1 | -12/+19 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-09-18 | 11 | -100/+140 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Merge pull request #176 from tigerw/bugfixes | Mattes D | 2013-09-18 | 8 | -97/+72 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Fixed repeater and wood placement | ||||
| | * | | | | | | Multiple fixes [SEE DESC] | Tiger Wang | 2013-09-18 | 8 | -97/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed two random block handling files in the item handling section that didn't do anything. (One was an attempt at making slabs work, but failed to realise that the coords would have to be the block CLICKED, and another was just a random empty file for handling wooden planks.) * Fixed placing repeater blocks not directioning properly * Fixed wood directions breaking plank metadata | ||||
| * | | | | | | | Merge pull request #175 from tigerw/bugfixes | Mattes D | 2013-09-17 | 3 | -3/+68 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Bugfixes | ||||
| | * | | | | | | Snow now supports meta values | Tiger Wang | 2013-09-17 | 1 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #98 | ||||
| | * | | | | | | Added wood directions | Tiger Wang | 2013-09-17 | 1 | -0/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added wood directions | ||||
| | * | | | | | | Fixed undead burning | Tiger Wang | 2013-09-17 | 1 | -1/+1 |
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | (c'mon xoft, test ya code :P) | ||||
* | / | | | | | APIDump: Small cRoot improvement. | STRWarrior | 2013-09-18 | 1 | -17/+17 |
|/ / / / / / | |||||
* | | | | | | Documented cRoot. | STRWarrior | 2013-09-17 | 1 | -0/+19 |
| | | | | | | |||||
* | | | | | | Merge pull request #172 from tigerw/bugfixes | Alexander Harkness | 2013-09-17 | 2 | -20/+21 |
|\| | | | | | | | | | | | | | | | | | Fixes to torches and entities - because they were derpy zubzubs. | ||||
| * | | | | | Fixed derpy comparison | Tiger Wang | 2013-09-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed friction for entities | Tiger Wang | 2013-09-16 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | Due to a misplaced else, other entities weren't getting friction | ||||
| * | | | | | Torch fixes [SEE DESC] | Tiger Wang | 2013-09-16 | 1 | -7/+8 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | * Torches snap to neighbour when placed on bottom * CanBeAt takes into account cobblestone walls + Used more BLOCK_FACEs instead of numbers | ||||
* | | | | | APIDump: Additional information is linkified, too. | madmaxoft | 2013-09-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | APIDump: Added a slight visual style to <pre> tags | madmaxoft | 2013-09-16 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Updated the Core to the latest. | madmaxoft | 2013-09-16 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | Does this even matter in any way? | ||||
* | | | | | Fixed missing newline. | Alexander Harkness | 2013-09-16 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #171 from tonibm19/patch-5 | Alexander Harkness | 2013-09-16 | 1 | -3/+2 |
|\ \ \ \ | | | | | | | | | | | Vanilla like maximum and default view distance | ||||
| * | | | | Vanilla like maximum and default view distance | tonibm19 | 2013-09-16 | 1 | -3/+2 |
|/ / / / | |||||
* | | | | Attempt at fixing linux crash on player login. | Matyas Dolak | 2013-09-16 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1244 | ||||
* | | | | APIDump: Added callback examples to cWorld. | madmaxoft | 2013-09-16 | 1 | -0/+60 |
| | | | | |||||
* | | | | Exported cMonster:GetMobType() to the Lua API. | madmaxoft | 2013-09-16 | 3 | -3/+38 |
| | | | | |||||
* | | | | APIDump: All cWorld functions are documented. | madmaxoft | 2013-09-16 | 1 | -25/+44 |
| | | | | |||||
* | | | | Removed cWorld:SaveAllChunks() from the API. | madmaxoft | 2013-09-16 | 3 | -35/+3 |
| | | | | | | | | | | | | | | | | Use cWorld:QueueSaveAllChunks() instead, the old function was prone to deadlocks. | ||||
* | | | | cWorld:QueueTickBlock takes the delay in ticks. | madmaxoft | 2013-09-16 | 4 | -16/+19 |
| | | | | |||||
* | | | | APIDump: Next batch of cWorld documentation. | madmaxoft | 2013-09-15 | 1 | -35/+34 |
| | | | | |||||
* | | | | Fixed doxycomments of cWorld plant-growing code | madmaxoft | 2013-09-15 | 2 | -7/+12 |
| | | | | |||||
* | | | | Fixed previous commit | madmaxoft | 2013-09-15 | 2 | -38/+4 |
| | | | | |||||
* | | | | Removed cWorld deprecated API: SetWorldTime() | madmaxoft | 2013-09-15 | 1 | -6/+0 |
| | | | | |||||
* | | | | Removed obsoleted cWorld functions from the API: | madmaxoft | 2013-09-15 | 3 | -70/+5 |
| | | | | | | | | | | | | | | | | | | | | GetClassStatic() (is used only internally by ManualBindings) GetTime() (is replaced with GetWorldAge() and GetTimeOfDay() | ||||
* | | | | Fixed previous commit. | madmaxoft | 2013-09-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fixed API bindings of cWorld:GetSignLines(), exported cWorld:UseBlockEntity(). | madmaxoft | 2013-09-15 | 4 | -32/+74 |
| | | | | |||||
* | | | | Fixed tigerw's leftovers. | madmaxoft | 2013-09-15 | 1 | -6/+0 |
| | | | | |||||
* | | | | Updated the bindings again. | madmaxoft | 2013-09-15 | 2 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickups | madmaxoft | 2013-09-15 | 12 | -78/+135 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: source/BlockID.cpp source/Entities/Entity.cpp | ||||
| * | | | | Added break | Tiger Wang | 2013-09-15 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Even better pickup physics | Tiger Wang | 2013-09-13 | 1 | -18/+23 |
| | | | | | |||||
| * | | | | Even more fixes [SEE DESC] | Tiger Wang | 2013-09-13 | 4 | -23/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed minecarts breaking completely due to stuff * Rails are now non solid again + Added IsRail inline bool - Removed Herobrine | ||||
| * | | | | Fixed water speed issues | Tiger Wang | 2013-09-13 | 1 | -5/+6 |
| | | | | | |||||
| * | | | | Implemented xoft's suggestions again | Tiger Wang | 2013-09-12 | 1 | -19/+16 |
| | | | | | |||||
| * | | | | Implemented xoft's suggestions | Tiger Wang | 2013-09-11 | 1 | -5/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I totally didn't copy this from the fire simulator... (I did, but I changed it quite a bit :P) | ||||
| * | | | | Fixed two bugs | Tiger Wang | 2013-09-11 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Fixed DropSpensers not rotating properly | Tiger Wang | 2013-09-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added a few changes [SEE DESC] | Tiger Wang | 2013-09-09 | 5 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revised pickup comments * SlotArea pickup tossing now reflects Player.cpp * Removed unneeded ItemShears comment (was working already) * Sand and gravel pickups spawn with correct speed | ||||
| * | | | | A few Minecart fixes | Tiger Wang | 2013-09-09 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Removed unneeded flatrail setpos * Fixed health checking | ||||
| * | | | | Fixed formatting and removed gravity thing | Tiger Wang | 2013-09-07 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Further physics improvements [SEE DESC] | Tiger Wang | 2013-09-05 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was mainly focused on pickups, but it works for other things too. * Entities no longer clip through blocks positive-vertically (this fixes pickup issues as well). * Entities lie flat against a block when they hit it. * Reduced entity (mainly pickup) block clipping in non vertical directions. | ||||
| * | | | | Pickups spawn with correct speed and position | Tiger Wang | 2013-09-04 | 2 | -30/+12 |
| | | | | | | | | | | | | | | | | | | | | Added a comment-space as well. | ||||
| * | | | | Players toss a little further | Tiger Wang | 2013-09-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Pickups are a little less jittery | Tiger Wang | 2013-09-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | They also spawn closer to player mouth. | ||||
| * | | | | Added better push out of entities | Tiger Wang | 2013-09-04 | 1 | -1/+8 |
| | | | | | |||||
* | | | | | Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes | madmaxoft | 2013-09-15 | 22 | -229/+165 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: source/Blocks/BlockTorch.h | ||||
| * | | | | | Possible Linux compile fix | Tiger Wang | 2013-09-15 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Fixed pistons pulling un-pullables | Tiger Wang | 2013-09-15 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | Mycelium now has correct placement sound | Tiger Wang | 2013-09-15 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Torches work properly | Tiger Wang | 2013-09-15 | 4 | -59/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a naming inconsistency concerning quartz stairs. | ||||
| * | | | | | Removed leftover CanBePlacedOnSide | Tiger Wang | 2013-09-15 | 3 | -19/+0 |
| | | | | | | |||||
| * | | | | | Removed leftover DoesAllowBlockOnTop | Tiger Wang | 2013-09-15 | 3 | -22/+1 |
| | | | | | | |||||
| * | | | | | Removed torch top placement prevention | Tiger Wang | 2013-09-13 | 1 | -6/+0 |
| | | | | | | |||||
| * | | | | | Removed place on top and side preventions | Tiger Wang | 2013-09-13 | 13 | -113/+0 |
| | | | | | | |||||
* | | | | | | APIDump: Added a first part of cWorld documentation. | madmaxoft | 2013-09-15 | 1 | -2/+118 |
| | | | | | | |||||
* | | | | | | APIDump: Fixed linkification with multiple links in one string. | madmaxoft | 2013-09-15 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Fixed cWorld bindings for GetBlockInfo() and GetBlockTypeMeta(). | madmaxoft | 2013-09-15 | 4 | -100/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | They no longer require the superficial arguments. | ||||
* | | | | | | Updated the automatic bindings. | madmaxoft | 2013-09-15 | 2 | -2/+36 |
| | | | | | | |||||
* | | | | | | Added a script that uploads the APIDump's docs to a website. | madmaxoft | 2013-09-15 | 1 | -0/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | An API nightbuild has been set up at http://mc-server.xoft.cz/LuaAPI | ||||
* | | | | | | APIDump: Undescribed classes are listed as undocumented. | madmaxoft | 2013-09-14 | 1 | -14/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | Previously class that was not listed in APIDesc was not listed in Undocumented. | ||||
* | | | | | | APIDump: Added most missing classes as empty templates. | madmaxoft | 2013-09-14 | 1 | -1/+93 |
| | | | | | | |||||
* | | | | | | APIDump: Removed most unexported-documented classes. | madmaxoft | 2013-09-14 | 1 | -232/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixed most functions that were erroneously parsed as constants by the automatic wiki import. | ||||
* | | | | | | APIDump: Fixed dumping when APIDesc doesn't contain Constants section. | madmaxoft | 2013-09-14 | 1 | -10/+14 |
| | | | | | | |||||
* | | | | | | APIDump: Fixed cLuaWindow documentation. | madmaxoft | 2013-09-14 | 1 | -62/+64 |
| | | | | | | |||||
* | | | | | | APIDump: Added creating the list of unexported-documented API objects. | madmaxoft | 2013-09-14 | 1 | -0/+24 |
| | | | | | | |||||
* | | | | | | APIDump: Implemented creating the list of undocumented API objects. | madmaxoft | 2013-09-14 | 1 | -3/+65 |
| | | | | | | |||||
* | | | | | | APIDump: Added a simple header to the class index. | madmaxoft | 2013-09-14 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Set the minimum viewdistance to 3. | madmaxoft | 2013-09-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #167. | ||||
* | | | | | | APIDump: Added cArrowEntity documentation | madmaxoft | 2013-09-14 | 1 | -0/+29 |
| | | | | | | |||||
* | | | | | | APIDump: Added an example on how to fill in the documentation. | madmaxoft | 2013-09-14 | 1 | -8/+55 |
| | | | | | | |||||
* | | | | | | APIDump: Added support for additional info exported with each class. | madmaxoft | 2013-09-14 | 2 | -1/+91 |
| | | | | | | |||||
* | | | | | | APIDump: Added support for overloaded functions. | madmaxoft | 2013-09-14 | 2 | -13/+57 |
| | | | | | | |||||
* | | | | | | APIDump: Do not dump the g_APIDesc and APIDump's functions. | madmaxoft | 2013-09-14 | 2 | -4/+13 |
| | | | | | | |||||
* | | | | | | APIDump: Moved sorting after the renaming. | madmaxoft | 2013-09-14 | 2 | -21/+25 |
| | | | | | | |||||
* | | | | | | APIDump: Linkifications works for simple {{link}} too. | madmaxoft | 2013-09-14 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | APIDump: Added special-function renaming (constructor, operators). | madmaxoft | 2013-09-14 | 2 | -5/+22 |
| | | | | | | |||||
* | | | | | | APIDump: Added more globally-ignored functions. | madmaxoft | 2013-09-14 | 1 | -1/+4 |
| | | | | | | |||||
* | | | | | | APIDump: Ignored functions are removed from undocumented classes, too. | madmaxoft | 2013-09-14 | 1 | -10/+9 |
| | | | | | | |||||
* | | | | | | Fixed empty-handed itemhandler. | madmaxoft | 2013-09-14 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | This should fix FS 430. | ||||
* | | | | | | Merge pull request #165 from tonibm19/patch-2 | Mattes D | 2013-09-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed mobs attack range being too long | ||||
| * | | | | | | Added an extra line. | tonibm19 | 2013-09-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | In first commit it says I removed first line | ||||
| * | | | | | | Fixed mobs attack range being too long | tonibm19 | 2013-09-13 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | It was set to 5, I think 2 is better because now mobs can kill you when there is a block (or 2) between you and monster. | ||||
* | | | | | | | Merge pull request #166 from tonibm19/patch-3 | Mattes D | 2013-09-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Updated default permissions | ||||
| * | | | | | | Updated default permissions | tonibm19 | 2013-09-13 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | Added 2 vanilla commands (/me and /tell) permissions to default. | ||||
* | | | | | | APIDump: Ignoring some Lua internal stuff from API-scanning. | madmaxoft | 2013-09-13 | 1 | -4/+10 |
| | | | | | | |||||
* | | | | | | APIDump: Fixed link in cBlockArea's docs | madmaxoft | 2013-09-13 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | APIDump: Basic CSS file makes tables visible | madmaxoft | 2013-09-13 | 2 | -0/+35 |
| | | | | | | |||||
* | | | | | | APIDump: Constructors are renamed and can have documentation | madmaxoft | 2013-09-13 | 2 | -2/+7 |
| | | | | | | |||||
* | | | | | | APIDump: Added support for ignoring functions; ignoring the lua/tolua internals. | madmaxoft | 2013-09-13 | 2 | -14/+30 |
| | | | | | | |||||
* | | | | | | APIDump: Fixed cItem's description. | madmaxoft | 2013-09-13 | 1 | -12/+17 |
| | | | | | | |||||
* | | | | | | APIDump: Linkification works. | madmaxoft | 2013-09-13 | 1 | -4/+3 |
| | | | | | | |||||
* | | | | | | APIDump: Added descendants specified through inheritance. | madmaxoft | 2013-09-13 | 1 | -27/+59 |
| | | | | | | |||||
* | | | | | | APIDump: Added support for inheritance | madmaxoft | 2013-09-13 | 1 | -29/+68 |
| | | | | | | |||||
* | | | | | | APIDump: Read through and fixed the first few classes desc. | madmaxoft | 2013-09-12 | 1 | -92/+71 |
| | | | | | | |||||
* | | | | | | APIDump: Imported the descriptions from the wiki. | madmaxoft | 2013-09-12 | 2 | -156/+1268 |
| | | | | | | |||||
* | | | | | | APIDump: Fixed nesting | madmaxoft | 2013-09-12 | 1 | -3/+2 |
| | | | | | | |||||
* | | | | | | APIDump: Processing wiki-style bullets (" * ") into <li> tag | madmaxoft | 2013-09-12 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | APIDump: Added parsing for older wiki format, "Class Definition" header. | madmaxoft | 2013-09-12 | 1 | -6/+44 |
| | | | | | | |||||
* | | | | | | APIDump: The APIDesc from wiki can be read back by Lua. | madmaxoft | 2013-09-12 | 1 | -10/+21 |
| | | | | | | |||||
* | | | | | | APIDump: replacing wiki-style markup with APIDump-style markup | madmaxoft | 2013-09-12 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | APIDump: Fixed parsing tables with wiki-links. | madmaxoft | 2013-09-12 | 1 | -10/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also added real class name, description and constructor renaming. | ||||
* | | | | | | APIDump: Fixed a missing tab | madmaxoft | 2013-09-11 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | APIDump: Added a testing constant description | madmaxoft | 2013-09-11 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | APIDump: Initial implementation of wiki-to-lua conversion | madmaxoft | 2013-09-11 | 1 | -3/+85 |
| | | | | | | |||||
* | | | | | | Added StringSplitAndTrim() to Lua API | madmaxoft | 2013-09-11 | 1 | -6/+22 |
| | | | | | | |||||
* | | | | | | Merge pull request #159 from tigerw/bugfix | Mattes D | 2013-09-11 | 5 | -5/+107 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Multiple fixes and features | ||||
| * | | | | | | More changes [SEE DESC] | Tiger Wang | 2013-09-11 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improved (again) pumpkin direction handling * Fixed spacing in Entity.cpp | ||||
| * | | | | | | Pumpkins | Tiger Wang | 2013-09-11 | 1 | -1/+1 |
| | | | | | | |