1
0
Commit Graph

945 Commits

Author SHA1 Message Date
madmaxoft@gmail.com
d97ad781b4 git-svn-id: http://mc-server.googlecode.com/svn/trunk@795 0a769ca7-a7f5-676a-18bf-c427514a06d6 2012-08-26 21:01:07 +00:00
madmaxoft@gmail.com
17253d2c90 Turned a common assert into a warning log
git-svn-id: http://mc-server.googlecode.com/svn/trunk@794 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 20:50:12 +00:00
madmaxoft@gmail.com
6ad8553a3a Added basic noteblocks, finished sign storage in Anvil (patch contributed by l0udPL)
http://forum.mc-server.org/showthread.php?tid=528

git-svn-id: http://mc-server.googlecode.com/svn/trunk@793 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 17:50:42 +00:00
madmaxoft@gmail.com
c00db32b78 Removed old makefile; use GNUmakefile instead
git-svn-id: http://mc-server.googlecode.com/svn/trunk@792 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 17:42:52 +00:00
madmaxoft@gmail.com
a83420491f Fixed compilation problem on Linux (FS case sensitivity sux)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@791 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 16:20:08 +00:00
madmaxoft@gmail.com
7cf9ddaa48 cSocket doesn't use cPackets.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@790 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-25 21:59:13 +00:00
madmaxoft@gmail.com
7157ebc061 cWorld doesn't use cPackets.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@789 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-25 21:46:18 +00:00
madmaxoft@gmail.com
bb25ba4977 Removed cPackets from cChunk.
Also decoupled a possible deadlock in player login code.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@788 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-25 17:52:08 +00:00
madmaxoft@gmail.com
2c5f9350d6 Removed packet includes where they're not needed
git-svn-id: http://mc-server.googlecode.com/svn/trunk@787 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 09:50:13 +00:00
madmaxoft@gmail.com
f0fc0edd21 cPickup doesn't use cPackets.
Also, Lua API change, OnCollectItem -> OnCollectPickup; first param is cPlayer to match other callbacks.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@786 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 09:49:00 +00:00
madmaxoft@gmail.com
0c5910c4fb Ignore some runtime folders
git-svn-id: http://mc-server.googlecode.com/svn/trunk@785 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 08:05:52 +00:00
madmaxoft@gmail.com
530be5bd66 Inventory doesn't use cPackets
git-svn-id: http://mc-server.googlecode.com/svn/trunk@784 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 08:04:58 +00:00
madmaxoft@gmail.com
e92b9e7ecb Monster classes don't use cPackets. Chat messages are sent / broadcast without cPackets. BlockEntities don't use cPackets.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@783 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 07:58:26 +00:00
madmaxoft@gmail.com
263ce31bd6 Added plugin name to deprecation messages
Removed duplicate inheritance of m_Name in cPlugin_NewLua by making cWebPlugin interface-only

git-svn-id: http://mc-server.googlecode.com/svn/trunk@782 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-23 20:49:21 +00:00
lapayo94@gmail.com
a39adadd0f Fixed Bug #237
Sign placement

git-svn-id: http://mc-server.googlecode.com/svn/trunk@781 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-23 20:41:48 +00:00
faketruth
eba0437d68 Fixed WebAdmin showing tab names (thanks for pointing it out Lapayo)
Changed some std::string to AString

git-svn-id: http://mc-server.googlecode.com/svn/trunk@780 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 23:29:15 +00:00
faketruth
49a4613d94 Added a RateCompareString function to StringUtils
Created a preprocessor template (define) for DoWith* functions
Exported cWorld::FindAndDoWithPlayer(), cRoot::FindAndDoWithPlayer() and cRoot::ForEachPlayer() to Lua
Added a function FindAndDoWithPlayer to cRoot and cWorld. It takes a part of a player name and finds a single player based on that.
Fixed Core's MOTD to contain the correct URL to the MCServer site
Fixed Core /kick command
Fixed Core's WebAdmin kick

git-svn-id: http://mc-server.googlecode.com/svn/trunk@779 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 23:05:12 +00:00
lapayo94@gmail.com
886c7f5624 Added a documentation for block and item handlers
Probably fixed dependencies on cWebPlugin_Lua
Fixed VC2010 Project file

git-svn-id: http://mc-server.googlecode.com/svn/trunk@778 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 16:31:13 +00:00
faketruth
7c84349990 WebAdmin should not cause crashes anymore
Got rid of cWebPlugin_Lua
cPlugin_Lua is also a cWebPlugin now, so plugins don't need a separate cWebPlugin object
Changed some stuff to use AString instead of char*

git-svn-id: http://mc-server.googlecode.com/svn/trunk@777 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 14:22:21 +00:00
faketruth
0da4f7eaa2 Fixed cWebPlugin_Lua being not thread safe. And I don't know why, but it still crashes in Lua sometimes o_O
WebAdmin chat now supports infinite number of chat messages (only client side). The client requests only NEW chat messages from the server.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@776 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 12:24:29 +00:00
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