1
0
Fork 0
Commit Graph

5769 Commits

Author SHA1 Message Date
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