summaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Trees will generate in the new biomes.madmaxoft2013-11-282-14/+101
| | | | Only the generic trees, the special variants haven't yet been implemented.
* Added new biomes to old composition generator.madmaxoft2013-11-284-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.madmaxoft2013-11-284-39/+179
| | | | Now Biomal and DistortedHeight generators will work with new biomes.
* Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-283-48/+74
| | | | This way it can be shared between MCServer and BiomeVisualiser.
* Moved json includes to where they are really needed.madmaxoft2013-11-283-1/+2
|
* BiomeVisualiser: Added the TwoLevel biome generator.madmaxoft2013-11-282-0/+229
|
* Fixed a bug with TNT waking simulatorsTiger Wang2013-11-281-2/+2
|
* Improved TNT pickup randomisationTiger Wang2013-11-281-1/+1
|
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-272-3/+3
|
* Merged master into redstonefixesTiger Wang2013-11-27465-0/+138834
|\
| * Voronoi-related biomegens use the new cVoronoiMap class.madmaxoft2013-11-273-54/+29
| |
| * Fixed a load of issues, clang autodetection works now.Alexander Harkness2013-11-271-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.madmaxoft2013-11-272-0/+140
| |
| * Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-2712-12/+12
| |
| * Fixed the remaining derpsAlexander Harkness2013-11-2726-30/+30
| |
| * Fixed some of tiger's derpyness.Alexander Harkness2013-11-279-11/+11
| |
| * ANOTHER compile fixTiger Wang2013-11-261-1/+1
| | | | | | | | This one was broken by bear. :P
| * Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-265-5/+5
| |
| * Compile fix againTiger Wang2013-11-261-1/+1
| |
| * Fixed Linux compile againTiger Wang2013-11-261-1/+1
| |
| * Fixed tolua++ filesTiger Wang2013-11-263-4/+4
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2618-6/+268
| |\ | |/ |/| | | | | Conflicts: VC2008/MCServer.vcproj
| * Merge branch 'master' into foldermove2Alexander Harkness2013-11-261-3/+0
| |\ | |/ |/|
| * Fixed loads more of them.Alexander Harkness2013-11-2611-13/+13
| |
| * AnotherAlexander Harkness2013-11-261-1/+1
| |
| * And another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another one.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed a mis-includeAlexander Harkness2013-11-261-1/+1
| |
| * Further attempts to fix compileTiger Wang2013-11-2524-27/+27
| |
| * Attempt to fix compilationTiger Wang2013-11-2448-59/+58
| |
| * Moved SQLite, LuaExpat, and MD5 to /libTiger Wang2013-11-248-148557/+0
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2466-1497/+2365
| |\ | |/ |/| | | | | Conflicts: GNUmakefile
| * Moved source to srcAlexander Harkness2013-11-24469-0/+285880
|/
* Android: Moved Android stuff to the ~/trunk/Android/ folder!faketruth2012-08-191-267/+0
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Finally a log! :Dfaketruth2012-08-191-32/+44
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Showing last MCServer related logcat messagefaketruth2012-08-191-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 statusfaketruth2012-08-181-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 serverfaketruth2012-08-181-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 :Dfaketruth2012-08-161-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!faketruth2012-08-151-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