flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,586 Commits 1 Branch 0 Tags 92 MiB
c5f3663bea
Commit Graph

3541 Commits

Author SHA1 Message Date
madmaxoft
f6df5cea87 Trees will generate in the new biomes. 
Only the generic trees, the special variants haven't yet been implemented.
 2013-11-28 22:08:42 +01:00
madmaxoft
057821d9b7 Added new biomes to old composition generator. 
Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
 2013-11-28 21:51:18 +01:00
madmaxoft
95ab73e4ed Added new biomes to old height generators. 
Now Biomal and DistortedHeight generators will work with new biomes.
 2013-11-28 21:15:50 +01:00
madmaxoft
c0a6c2b533 Moved BiomeGen creation from INI file data to BioGen.cpp. 
This way it can be shared between MCServer and BiomeVisualiser.
 2013-11-28 20:15:52 +01:00
madmaxoft
012840360e Moved json includes to where they are really needed. 2013-11-28 20:14:34 +01:00
madmaxoft
bdd86d7934 BiomeVisualiser: Added the TwoLevel biome generator. 2013-11-28 20:00:30 +01:00
Tiger Wang
96759637e9 Fixed a bug with TNT waking simulators 2013-11-28 18:24:25 +00:00
Tiger Wang
f9e1be0d57 Improved TNT pickup randomisation 2013-11-28 18:22:13 +00:00
Tiger Wang
994e1d7335 Made TNT pickups spawning chance 25% 2013-11-27 22:03:04 +00:00
Tiger Wang
a6630d3239 Merged master into redstonefixes 2013-11-27 21:35:13 +00:00
madmaxoft
bec27617a2 Voronoi-related biomegens use the new cVoronoiMap class. 2013-11-27 21:42:34 +01:00
Alexander Harkness
596963743e Fixed a load of issues, clang autodetection works now. 
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?
 2013-11-27 17:18:40 +00:00
madmaxoft
ac793df2ab Added missing files for Voronoi map generation. 2013-11-27 14:26:28 +01:00
madmaxoft
2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Tiger Wang
e1f3cb1879 ANOTHER compile fix 
This one was broken by bear. :P
 2013-11-26 22:56:35 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Tiger Wang
3e3e63d946 Compile fix again 2013-11-26 22:45:08 +00:00
Tiger Wang
f87bb1619e Fixed Linux compile again 2013-11-26 22:43:22 +00:00
Tiger Wang
1c526ed52b Fixed tolua++ files 2013-11-26 22:11:40 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	VC2008/MCServer.vcproj
 2013-11-26 17:21:06 +00:00
Alexander Harkness
139bd34690 Merge branch 'master' into foldermove2 2013-11-26 17:15:39 +00:00
Alexander Harkness
770ef8c60b Fixed loads more of them. 2013-11-26 17:14:46 +00:00
Alexander Harkness
0b153f62f0 Another 2013-11-26 17:09:04 +00:00
Alexander Harkness
a6b67e9cc1 And another. 2013-11-26 17:06:58 +00:00
Alexander Harkness
c775011c98 Fixed another. 2013-11-26 17:06:26 +00:00
Alexander Harkness
66482c9db7 Fixed another one. 2013-11-26 17:06:00 +00:00
Alexander Harkness
f792117ce5 Fixed a mis-include 2013-11-26 17:04:07 +00:00
Tiger Wang
32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Tiger Wang
16435995a5 Moved SQLite, LuaExpat, and MD5 to /lib 2013-11-24 17:33:47 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00
faketruth
01a4ab7726 Android: Moved Android stuff to the ~/trunk/Android/ folder! 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 16:43:47 +00:00
faketruth
e5bef782fc Android: Finally a log! :D 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 00:35:19 +00:00
faketruth
cc13cbbe3d Android: Showing last MCServer related logcat message 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-18 23:42:27 +00:00
faketruth
b6138129e6 Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server status 
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
 2012-08-18 21:00:51 +00:00
faketruth
c40af4c4ab Android: Pressing back button sends stop command to server 
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
 2012-08-17 22:20:35 +00:00
faketruth
33ca4d5003 MCServer should run just fine on Android now :D 
The server is also stoppable from Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-16 20:28:14 +00:00
faketruth
d21e4dacf7 Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! 
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
 2012-08-15 21:24:11 +00:00