Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 10 | -3/+117 |
|\ | | | | | | | | | Conflicts: src/OSSupport/Queue.h | ||||
| * | merged changes from upstream | Tycho Bickerstaff | 2013-12-31 | 9 | -3/+112 |
| |\ | |||||
| | * | Merge branch 'FishingHook' | madmaxoft | 2014-01-01 | 8 | -1/+110 |
| | |\ | |||||
| | | * | OnPlayerFishing doesn't have a const cItems anymore | STRWarrior | 2014-01-01 | 5 | -5/+5 |
| | | | | |||||
| | | * | implemented the recommendations Xoft gave. | STRWarrior | 2013-12-31 | 7 | -12/+25 |
| | | | | |||||
| | | * | Implented OnPlayerFishing and OnPlayerFished. | STRWarrior | 2013-12-30 | 6 | -1/+97 |
| | | | | |||||
| | * | | Fixed GetPhysicalRAMUsage on Linux | andrew | 2014-01-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into cmake-fixes | Tycho Bickerstaff | 2013-12-31 | 14 | -16/+56 |
| |\| | | |||||
| * | | | fixed bad merge | Tycho Bickerstaff | 2013-12-22 | 1 | -4/+0 |
| | | | | |||||
| * | | | merged in more warning fixes | Tycho Bickerstaff | 2013-12-22 | 2 | -3/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | merged in changes | Tycho Bickerstaff | 2013-12-22 | 3 | -2/+12 |
| |\ \ \ | |||||
| * | | | | merged in warnings changes | Tycho Bickerstaff | 2013-12-22 | 26 | -93/+94 |
| | | | | | |||||
| * | | | | 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 | 2 | -1/+33 |
| | | | | | |||||
* | | | | | 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 | 20 | -91/+69 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. | Morgan Redshaw | 2013-12-31 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
| * | | | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 6 | -75/+13 |
| | |/ | |/| | | | | | | | Also removed an unused inline header file (yuck). | ||||
* | | | 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 |
| | | | |||||
* | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 24 | -29/+92 |
|\| | | |||||
| * | | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 16 | -39/+100 |
| | | | |||||
| * | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 60 | -233/+1990 |
| |\| | |||||
| * | | 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 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 60 | -233/+1990 |
|\ \ \ | | |/ | |/| | |||||
| * | | Added HOOK_PLUGINS_LOADED. | madmaxoft | 2013-12-29 | 6 | -3/+64 |
| | | | | | | | | | | | | 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 |
| |/ / | |||||
| * | | Merge branch 'master' into cmake-win | madmaxoft | 2013-12-27 | 2 | -4/+56 |
| |\ \ | |||||
| | * | | 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 | 4 | -21/+27 |
| | | | | | |||||
| * | | | | Added proper precompiled headers for MSVC. | madmaxoft | 2013-12-26 | 1 | -48/+47 |
| |/ / / | |||||
| * | | | 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 | 2 | -9/+64 |
| |\ \ \ \ | |||||
| | * | | | | (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 |
| | | | | | | |||||
| | * | | | | 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. | ||||
| * | | | | | 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 | 2 | -3/+9 |
| |\ \ \ \ | | | | | | | | | | | | | Android update | ||||
| | * | | | | Fixed getting configure button going to port 0. | STRWarrior | 2013-12-24 | 2 | -3/+9 |
| | |/ / / | |||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | 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 | ||||
| * | | | | 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 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | You are now able to get different items from fishing. | STRWarrior | 2013-12-21 | 1 | -2/+108 |
| | | | | |||||
| * | | | Bindings regen script updated. | madmaxoft | 2013-12-21 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | The Bindings.cpp / .h files are no longer stored in the git repo. | ||||
| * | | | Floater now dissapears when the player doesn't have an fishing rod equipped. | STRWarrior | 2013-12-21 | 2 | -0/+32 |
| | |/ | |/| | |||||
* / | | basic threadsafe queue interface | Tycho Bickerstaff | 2013-12-21 | 2 | -0/+34 |
|/ / | |||||
* | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-21 | 2 | -5/+25 |
|\ \ | |||||
| * | | added precompiled headers | tycho | 2013-12-20 | 1 | -13/+24 |
| | | | |||||
| * | | fixed include of math on windows | tycho | 2013-12-20 | 2 | -1/+10 |
| | | | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 26 | -174/+221 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 |
| |/ | |||||
| * | 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 | 9 | -97/+92 |
| |\ | |||||
| | * | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 9 | -97/+92 |
| | | | |||||
| * | | 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 |
| | | |||||
| * | 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 |
| | | |||||
* | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -6/+16 |
|\ \ | |||||
| * | | fixed include paths on windows and added build dir to gitignore | tycho | 2013-12-20 | 1 | -0/+2 |
| | | | |||||
| * | | fixed compile errors with headers and math library | tycho | 2013-12-20 | 1 | -6/+15 |
| | | | |||||
| * | | Merge branch 'master' into cmake | tycho | 2013-12-20 | 12 | -26/+276 |
| |\ \ | |||||
| * | | | fixed multiprocessing on windows and removed redundend compile of headers | tycho | 2013-12-20 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 2 | -21/+21 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fixed clang warnings in Noise.cpp. | madmaxoft | 2013-12-20 | 1 | -20/+20 |
| | | | | | | | | | | | | | | | | Fix-a-random-warning-per-day :) | ||||
| * | | | Fixed assertion during dirt block OnUpdate() | Tiger Wang | 2013-12-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 12 | -26/+276 |
|\| | | |/ |/| | |||||
| * | 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 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | 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 |
| | | | |||||
* | | | fixed a number of windows issues | tycho | 2013-12-19 | 1 | -13/+28 |
| | | | |||||
* | | | added md5 as a dependency for bindings | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+2 |
| | | | |||||
* | | | added expat as lua bindings dependincy | Tycho Bickerstaff | 2013-12-19 | 2 | -2/+2 |
| | | | |||||
* | | | 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 | 3 | -14/+41 |
|\| | | |||||
| * | | 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 | 1 | -8/+2 |
| | | |||||
* | | bindings regenration logic | Tycho Bickerstaff | 2013-12-19 | 3 | -32240/+8 |
| | | |||||
* | | added zlib and UI | Tycho Bickerstaff | 2013-12-18 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 50 | -306/+1327 |
|\| | |||||
| * | 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 |
| | | | | |||||
| * | | | 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 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | 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 | 5 | -4/+49 |
| |\ | | | | | | | Shoot to function | ||||
| | * | 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. | ||||
| * | | 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 |
| | |/ | |/| | |||||
| * | | 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 | 1 | -1/+1 |
| | | | |||||
* | | | 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 branch 'master' into quickfixs | Tycho Bickerstaff | 2013-12-11 | 27 | -514/+603 |
| |\ \ | |||||
| * | | | 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 | 27 | -514/+603 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Exported the cTNTEntity | STRWarrior | 2013-12-14 | 4 | -9/+85 |
| | | | | |||||
| * | | | Merge pull request #423 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 4 | -290/+158 |
| |\ \ \ | | | |/ | | |/| | Redstone and configuration improvements | ||||
| | * | | 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 | 2 | -3/+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 | 9 | -2/+99 |
| |\ \ | | | | | | | | | World update | ||||
| | * | | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used. | STRWarrior | 2013-12-11 | 1 | -0/+1 |
| | | | | |||||
| | * | | 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 |
| | | | | |||||
| * | | | 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. | ||||
| * | | | 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 | 3 | -6/+15 |
| | | | |||||
* | | | removed more accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 9 | -3985/+0 |
| | | | |||||
* | | | removed accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 27 | -0/+0 |
| | | | |||||
* | | | more cmake | Tycho Bickerstaff | 2013-12-10 | 46 | -6/+4051 |
| | | | |||||
* | | | more cmake stuff | Tycho Bickerstaff | 2013-12-10 | 3 | -2/+18 |
| | | | |||||
* | | | started work on cmake | Tycho Bickerstaff | 2013-12-10 | 4 | -0/+36 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/master' | Tycho Bickerstaff | 2013-12-10 | 5 | -13/+96 |
|\| | |||||
| * | Merge pull request #412 from mc-server/fixes | Mattes D | 2013-12-10 | 5 | -13/+96 |
| |\ | | | | | | | 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 |
| | | | |||||
| | * | Fixed Floody lava to stone fizzle | Tiger Wang | 2013-12-10 | 1 | -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 |
| | | | |||||
* | | | 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 |
| | | |||||
* | | 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 | 7 | -192/+5 |
| | | | | Duplicate files, wrong includes, const-incorrect code... | ||||
* | Fixed VS2008 compilation after those huge changes. | madmaxoft | 2013-12-08 | 2 | -5/+7 |
| | |||||
* | 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 |
| | | |||||
* | | 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 | 43 | -1251/+1348 |
|\| | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Fixed normalizing large angles. | madmaxoft | 2013-12-08 | 4 | -8/+51 |
| | | |||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 41 | -1238/+1237 |
| | | | | | | | | Ref.: #407 | ||||
| * | Fixed stationary water starting fires and flowing lava not. | madmaxoft | 2013-12-08 | 1 | -2/+2 |
| | | |||||
| * | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 4 | -2/+93 |
| | | |||||
* | | 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 | 4 | -1/+37 |
| | | | | | | | | | | 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 | 10 | -14/+355 |
| | | | | | | | | 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 |
|/ | |||||
* | Merge pull request #394 from SamJBarney/master | Mattes D | 2013-12-06 | 2 | -4/+8 |
|\ | | | | | Fire no longer goes out when on top of nether rack | ||||
| * | 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 | 7 | -10/+97 |
| |\ | | | | | | | | | | | | | 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 |
| | | | |||||
* | | | Added cPluginManager:GetCurrentPlugin() to Lua API. | madmaxoft | 2013-12-05 | 1 | -7/+22 |
| |/ |/| | |||||
* | | ByteBuffer: Fixed optimization failures with threading checks. | madmaxoft | 2013-12-05 | 1 | -1/+1 |
| | | |||||
* | | 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. | ||||
* | 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 | 20 | -330/+431 |
|\ | | | | | 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! | ||||
| * | 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 | 11 | -221/+77 |
| | | | | | | | | 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 |
| | | |||||
* | | 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. | ||||
* | | 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 | 2 | -0/+229 |
|/ | |||||
* | 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 | 465 | -0/+138834 |
|\ | |||||
| * | Voronoi-related biomegens use the new cVoronoiMap class. | madmaxoft | 2013-11-27 | 3 | -54/+29 |
| | | |||||
| * | Fixed a load of issues, clang autodetection works now. | Alexander Harkness | 2013-11-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | 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? | ||||
| * | Added missing files for Voronoi map generation. | madmaxoft | 2013-11-27 | 2 | -0/+140 |
| | | |||||
| * | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 12 | -12/+12 |
| | | |||||
| * | 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 |
| | | |||||
| * | 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 | 1 | -1/+1 |
| | | |||||
| * | Fixed tolua++ files | Tiger Wang | 2013-11-26 | 3 | -4/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 18 | -6/+268 |
| |\ | |/ |/| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
| * | Merge branch 'master' into foldermove2 | Alexander Harkness | 2013-11-26 | 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 |
| | | |||||
| * | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 24 | -27/+27 |
| | | |||||
| * | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 48 | -59/+58 |
| | | |||||
| * | Moved SQLite, LuaExpat, and MD5 to /lib | Tiger Wang | 2013-11-24 | 8 | -148557/+0 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 66 | -1497/+2365 |
| |\ | |/ |/| | | | | | Conflicts: GNUmakefile | ||||
| * | Moved source to src | Alexander Harkness | 2013-11-24 | 469 | -0/+285880 |
|/ | |||||
* | Android: Moved Android stuff to the ~/trunk/Android/ folder! | faketruth | 2012-08-19 | 1 | -267/+0 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Finally a log! :D | faketruth | 2012-08-19 | 1 | -32/+44 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Showing last MCServer related logcat message | faketruth | 2012-08-19 | 1 | -13/+63 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server status | faketruth | 2012-08-18 | 1 | -9/+146 |
| | | | | | | Android: Put quite some testing code in ToJava.h and app-android.cpp ... I still can't send log messages to Java. The issue is threads, I can't use JNI stuff from threads that were not created by Java (at least not easily) git-svn-id: http://mc-server.googlecode.com/svn/trunk@752 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Pressing back button sends stop command to server | faketruth | 2012-08-18 | 1 | -9/+30 |
| | | | | | | | | Android: ToJava can call functions on Java by using JNI Android: Plugins work Android: Added android specific files to VS2008 project, but they are excluded from compiling git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | MCServer should run just fine on Android now :D | faketruth | 2012-08-16 | 1 | -3/+13 |
| | | | | | | The server is also stoppable from Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! | faketruth | 2012-08-15 | 1 | -0/+37 |
Disabled Squirrel for Android cLog now logs to Android LogCat as well Fixed Lua so it compiles on Android Removed/commented out exceptions in JsonCpp so it compiles on Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6 |