1
0
Commit Graph

725 Commits

Author SHA1 Message Date
faketruth
e086b931ea Chat history limit on the WebAdmin chat
Did some refactoring on the JavaScript side of the WebAdmin chat
Got rid of cRoot::sRootState
Fixed a crash on the WebAdmin when a page is loaded before a world exists

git-svn-id: http://mc-server.googlecode.com/svn/trunk@775 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 11:22:26 +00:00
faketruth
492cbe87ee Now the web server supports %20 spaces in URLs
git-svn-id: http://mc-server.googlecode.com/svn/trunk@774 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 10:16:57 +00:00
faketruth
b5c4994475 Web chat for the WebAdmin :D
git-svn-id: http://mc-server.googlecode.com/svn/trunk@773 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 00:35:06 +00:00
faketruth
46904e1820 Now it's possible to only show the plugin's WebAdmin content without the template around it by going to /~webadmin/ instead of /webadmin/
git-svn-id: http://mc-server.googlecode.com/svn/trunk@772 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-21 22:17:59 +00:00
madmaxoft@gmail.com
39ff5b0985 Fixed nightbuild script after files move.
Also moved licenses and Install-related files to Install folder.
The 7z archives are now built inside the Install folder, instead of the root

git-svn-id: http://mc-server.googlecode.com/svn/trunk@771 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-21 15:25:17 +00:00
faketruth
b20e94d48d Can add/remove worlds from WebAdmin
git-svn-id: http://mc-server.googlecode.com/svn/trunk@770 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-21 14:24:23 +00:00
faketruth
9aa41dde2f Using multi line strings for Core's WebAdmin interface
git-svn-id: http://mc-server.googlecode.com/svn/trunk@769 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-21 13:18:23 +00:00
faketruth
e940b2d05d Fixed server settings on FireFox
git-svn-id: http://mc-server.googlecode.com/svn/trunk@768 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-21 11:10:54 +00:00
faketruth
9a08f3dc59 Can change monster settings in WebAdmin too
git-svn-id: http://mc-server.googlecode.com/svn/trunk@767 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-20 19:10:19 +00:00
faketruth
af8c915461 Can now edit some generic server settings through the WebAdmin (port, description, etc)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@766 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-20 16:36:40 +00:00
faketruth
1bfdab379a Updated clean.bat for cleaning MCServer files
Removed accidentally added "ini editor" from Core

git-svn-id: http://mc-server.googlecode.com/svn/trunk@765 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-20 12:34:07 +00:00
faketruth
fa8ae973c4 Updated GNUmakefile to output to MCServer directory
Moved Lua-LICENSE.txt to Install dir (dont know what happened to the other license files :P )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@764 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-20 12:29:51 +00:00
faketruth
12906c026d Moved files used by MCServer to a special MCServer folder
git-svn-id: http://mc-server.googlecode.com/svn/trunk@763 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-20 12:20:20 +00:00
madmaxoft@gmail.com
674fe1e955 Window, Chest, Furnace and Pawn are not using cPackets at all
git-svn-id: http://mc-server.googlecode.com/svn/trunk@762 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 21:14:45 +00:00
madmaxoft@gmail.com
427e582d5f Almost all packets' handling is now rewritten not to use cPacket descendants elsewhere than in cClientHandle.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@761 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 19:42:32 +00:00
faketruth
5b36aa1567 Android: Do not create an input thread for Android
git-svn-id: http://mc-server.googlecode.com/svn/trunk@760 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 16:57:22 +00:00
faketruth
8560ceeef5 Android: Welcome back gen folder :P
git-svn-id: http://mc-server.googlecode.com/svn/trunk@759 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 16:50:31 +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
81a9bc51d9 Android: Go away gen folder! You're nothing but trouble (for now)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@757 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 16:42:46 +00:00
madmaxoft@gmail.com
eb3ed1aec1 Another handful of packets rewritten.
Also changed cItem::m_ItemID into m_ItemType of type short. Easier handling. m_ItemID kept for compatibility reasons (Lua-interface etc.)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@756 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 11:51:17 +00:00
lapayo94@gmail.com
f6ae6002c3 Fixed Bug #236
Workbench, Chest and Furnace are usable again

git-svn-id: http://mc-server.googlecode.com/svn/trunk@755 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 10:44:19 +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
madmaxoft@gmail.com
1b5eaa92b5 Chat packet handled in the new way; fixed missing packet sending for inventory slot.
Again, API change! cPlugin:OnChat() has had its parameters swapped, to match all the other callbacks - Player first, Message second

git-svn-id: http://mc-server.googlecode.com/svn/trunk@751 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 10:38:15 +00:00
madmaxoft@gmail.com
2691e8daed Packet refactoring, phase two, partial. Rewritten a few packet handling functions not to use cPacket-descendant objects.
This breaks plugin API! Plugins need to modify their hook functions to match those used in the Core plugin

git-svn-id: http://mc-server.googlecode.com/svn/trunk@750 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 09:56:28 +00:00
madmaxoft@gmail.com
2cae4b24d8 Added Core files to the VC2008 project (so that they can be opened from the IDE there, nothing more)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@749 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 09:52:11 +00:00
madmaxoft@gmail.com
cd7ead5f6a VC2008: Removed Android-specific files from all Windows build configurations
git-svn-id: http://mc-server.googlecode.com/svn/trunk@748 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 09:50:10 +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
madmaxoft@gmail.com
1f42ef9a1e Fixed an assert in bucket placement
git-svn-id: http://mc-server.googlecode.com/svn/trunk@746 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-17 10:54:13 +00:00
madmaxoft@gmail.com
f321b311a4 Fixed the VC2010 project to compile (untested, though)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@745 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-17 10:47:07 +00:00
madmaxoft@gmail.com
70a4ca5bc1 Packets now parse themselves from a cByteBuffer object (1st part of packeting rewrite, http://forum.mc-server.org/showthread.php?tid=524 )
git-svn-id: http://mc-server.googlecode.com/svn/trunk@744 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-17 10:18:07 +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
madmaxoft@gmail.com
1c4c0b5698 Windows compilation fix after Android changes
git-svn-id: http://mc-server.googlecode.com/svn/trunk@742 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-16 06:47:09 +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
madmaxoft@gmail.com
5bc07ba743 Added temporary debug statistics of the RelEntMoveLook packet removal efficiency
git-svn-id: http://mc-server.googlecode.com/svn/trunk@740 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-15 20:37:08 +00:00
madmaxoft@gmail.com
16dda8e037 Console command "chunkstats" now lists each world and also totals
git-svn-id: http://mc-server.googlecode.com/svn/trunk@739 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-15 12:08:11 +00:00
madmaxoft@gmail.com
b687be9e44 Added a true "all chunks saved" message for the save-all console command (FS #215)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@738 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-15 11:54:13 +00:00
madmaxoft@gmail.com
d58db08c1b Fix torches broken in rev 724
git-svn-id: http://mc-server.googlecode.com/svn/trunk@737 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14 15:53:05 +00:00
madmaxoft@gmail.com
004401a70a Crafting window crafting result shift-click handling
git-svn-id: http://mc-server.googlecode.com/svn/trunk@736 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14 14:41:57 +00:00
madmaxoft@gmail.com
8f79074c42 Crafting window crafting grid shift-click handling
git-svn-id: http://mc-server.googlecode.com/svn/trunk@735 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14 14:18:24 +00:00
madmaxoft@gmail.com
da23911dbc Shift-clicking the crafting grid in curvival inventory tries placing things in inventory first, then the hotbar.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@734 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14 09:45:38 +00:00
madmaxoft@gmail.com
dfa9a1e7c4 Added a few more stackable items
git-svn-id: http://mc-server.googlecode.com/svn/trunk@733 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14 09:28:17 +00:00
madmaxoft@gmail.com
e946616772 Shift-click completed in survival inventory window
git-svn-id: http://mc-server.googlecode.com/svn/trunk@732 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14 08:33:09 +00:00
madmaxoft@gmail.com
63e68865b1 Made cobwebs transparent
git-svn-id: http://mc-server.googlecode.com/svn/trunk@731 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14 08:32:23 +00:00
madmaxoft@gmail.com
18b04ab93f Added partial shift+click handling to the survival inventory
git-svn-id: http://mc-server.googlecode.com/svn/trunk@730 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-11 19:54:57 +00:00
madmaxoft@gmail.com
9e3aadb7d0 Updated Bindings to match the new armor categories and torch metas
git-svn-id: http://mc-server.googlecode.com/svn/trunk@729 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-11 19:49:36 +00:00
madmaxoft@gmail.com
b68163582c Added some stackable items in cItemHandler::GetMaxStackSize()
git-svn-id: http://mc-server.googlecode.com/svn/trunk@728 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-11 19:45:03 +00:00
madmaxoft@gmail.com
339992ffcd Added functions for armor item categories
git-svn-id: http://mc-server.googlecode.com/svn/trunk@727 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-11 19:43:28 +00:00
madmaxoft@gmail.com
15a5031885 Added cItemHandler::GetMaxStackSize() with a very basic implementation
git-svn-id: http://mc-server.googlecode.com/svn/trunk@726 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-11 12:46:09 +00:00