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