Commit Graph
100 Commits
Author SHA1 Message Date
Mattes D aefe3111de Ignoring MSVC2010+ build folders. 2014-01-17 08:10:43 +01:00
Mattes D 4385ab008f CMake: Fixed Lua output folder for MSVC2010+. 2014-01-17 08:09:03 +01:00
madmaxoft 4da8818291 Fixed SIGPIPE on cSocket::Send(). 2014-01-16 21:08:17 +01:00
madmaxoft a085319455 Protocol 1.7: Unknown packets are dumped to log in Debug mode. 2014-01-16 20:39:59 +01:00
madmaxoft de4ac55398 Disabled excessive entity-related logging in Debug mode. 2014-01-16 20:31:06 +01:00
madmaxoft c44ce84497 Fixed whitespace in previous commit. 2014-01-16 20:30:25 +01:00
madmaxoft 343136a2ae Finished exporting cWorld:ScheduleTask() to Lua API. 2014-01-16 19:56:08 +01:00
madmaxoft dab37db562 CMake: Fixed output paths for all MSVC versions. 2014-01-16 18:33:28 +01:00
madmaxoft e29749b35e Added packet diagnostics to 1.7 protocol.
When the packet is mis-interpreted, a log message is output about the packet type and lengths.
2014-01-16 15:26:58 +01:00
madmaxoft 6f739359e3 Yet another attempt at VarArgs. 2014-01-16 09:01:12 +01:00
madmaxoft ba49a32c3a Another VarArgs fix.
This time using va_copy() on platforms that have it and simple assignment on platforms that don't.
2014-01-16 08:34:10 +01:00
Mattes D 4974bf2832 Merge pull request #545 from mc-server/VarArgs
Var args
2014-01-15 13:41:45 -08:00
madmaxoft 3b8b558979 ProtoProxy: use CMake to generate the MSVC project files. 2014-01-15 22:41:12 +01:00
madmaxoft 7e2675a998 APIDump: Explicitly listed static cPlayer functions. 2014-01-15 19:26:01 +01:00
madmaxoft f436f87464 Fixed ProtoProxy compilation. 2014-01-15 19:10:03 +01:00
madmaxoft dd6c5779ec Using a 2nd argument instead of va_copy().
This seems to be the only reasonable C++03-only solution.
2014-01-15 18:28:51 +01:00
madmaxoft 3fd19df9fd Fixed varargs modification.
Ref.: #541.
2014-01-15 17:46:29 +01:00
Mattes D 0571b1a7e6 Merge pull request #543 from mc-server/Furnace_Minecarts
Furnace minecarts
2014-01-15 06:45:34 -08:00
Mattes D 5bef7d85ce Update COMPILING.md
Added instructions for Windows compiling, including CMake.
2014-01-15 14:42:22 +01:00
madmaxoft d67cd8dafc CMake: MSVC release builds use LTCG. 2014-01-15 13:54:06 +01:00
madmaxoft d23e743303 CMake: Removed SCL warnings from Lua and ZLib. 2014-01-15 12:01:03 +01:00
madmaxoft 20209750aa CMake: MSVC builds use static CRT.
We don't want to be dependent on the VC runtime.
2014-01-15 11:49:26 +01:00
Mattes D eb89de4c88 Merge pull request #542 from worktycho/schedular
added cWorld::ScheduleTask Function
2014-01-15 02:45:25 -08:00
Mattes D 457e93f1ed Merge pull request #538 from mc-server/minecarts
Minecarts
2014-01-15 02:42:24 -08:00
madmaxoft f31043a5e7 CMake: Release profile build inherits from Release, not Debug. 2014-01-14 11:05:57 +01:00
madmaxoft e3117d797e Moved profiling scripts into the MCServer folder.
Also they default to the 2010 version of the tools, which is Win7-compatible, and should be 64-bit-compatible, too.
2014-01-14 11:05:27 +01:00
madmaxoft b263d55a2d CMake: Added postfix for profiled exe 2014-01-14 09:32:43 +01:00
madmaxoft f7c691caaa APIDump: Wrapped example code so that it displays well on small screens.
The listing was pushing the resulting webpage too wide on my 19" screen, causing various distortions.
2014-01-13 21:39:21 +01:00
madmaxoft bc24cd8c70 Renamed unused source files from zlib.
These files are included in zlib, but they should not be compiled into the actual library. Since they contain example code on how to use the lib, I decided to keep them, renamed to .txt.
2014-01-13 21:28:27 +01:00
madmaxoft 8828ac75a2 The VS2008 nightbuild uses CMake. 2014-01-13 21:20:06 +01:00
madmaxoft 5407cec41c Removed shutdown() from socket closing.
It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite.
Fixes #537.
2014-01-13 20:54:58 +01:00
madmaxoft ada54b79d7 Added handshake processing to protocol 1.7.
This fixes #495
2014-01-13 20:32:15 +01:00
madmaxoft 9af16c3f28 ProtoProxy: Fixed login kick packet direction. 2014-01-13 20:31:08 +01:00
madmaxoft 7e59296157 Generating the bindings outputs a message at the end. 2014-01-13 19:57:19 +01:00
madmaxoft 74ddd03a9f APIDump: Added OnPluginMessage.lua file to Decoda project. 2014-01-13 19:48:07 +01:00
madmaxoft 448ac3ef14 APIDump: Added missing bits of documentation.
The recent changes didn't document some of the new API functions.
2014-01-13 19:45:15 +01:00
madmaxoft 55e92f056d APIDump: Documented the plugin messaging hook and function. 2014-01-13 19:21:57 +01:00
Mattes D 252def339d Merge pull request #536 from worktycho/nativearch
Added -march=native to linux targets
2014-01-13 10:19:59 -08:00
madmaxoft 332c1c59eb cCreeper is no longer available in API.
Has been replaced by cMonster.
2014-01-13 17:25:16 +01:00
madmaxoft 0a3fae7c35 CMake: Removed leftover debugging output. 2014-01-13 17:22:01 +01:00
madmaxoft 89e641071e CMake: Added resources to windows projects. 2014-01-13 17:15:34 +01:00
madmaxoft b9eb38a17f Added a generic .user file for MSVC.
This brings in the default debugging settings for the MSVC project, when generated by CMake.
2014-01-13 16:49:49 +01:00
madmaxoft caea934d37 CMake: Lua DLL is built in the correct folder.
Also removed SCL warnings from MSVC builds.
2014-01-13 10:59:37 +01:00
madmaxoft 118b7a121b Moved the win resources into a separate subfolder.
This will allow us to use them in CMake builds.
2014-01-12 17:57:29 +01:00
madmaxoft 2ca06cc213 CMake generates Bindings when not existant (win) 2014-01-12 17:20:29 +01:00
Mattes D 83bdbafaa3 Merge pull request #533 from mc-server/CmakeMultiConfig
Cmake multi config
2014-01-12 01:14:24 -08:00
madmaxoft 50956d55ae Ignore Win32 .idb files. 2014-01-12 10:10:20 +01:00
madmaxoft 180b9b9099 Merge branch master into CmakeMultiConfig. 2014-01-12 10:04:16 +01:00
madmaxoft 328b2db252 Disabled a useless MSVC warning in Bindings.cpp. 2014-01-12 08:43:13 +01:00
Mattes D 751c53ecc6 Merge pull request #532 from mc-server/LuaStateErrorHandler
Lua state error handler
2014-01-11 23:33:29 -08:00
Mattes D 1ec9eb564c Merge pull request #526 from mc-server/IniFileFix
Fixed cIniFile's SetValue().
2014-01-11 23:32:54 -08:00
madmaxoft 023ba17688 Lua errors display stack trace.
Fixes #418.
2014-01-11 23:10:40 +01:00
madmaxoft b2b7e45757 Removed internal methods from public cLuaState interface.
PushFunction(), CallFunction() and GetReturn() are not to be called independently, but rather only by using the Call() templated overrides.
Push() needs to be left in the public part, it is used for pushing results in the ManualBindings.

Preparation for #418.
2014-01-11 22:51:10 +01:00
madmaxoft acfebab027 Removed an unused file. 2014-01-11 21:22:40 +01:00
Mattes D 498fb5b675 Merge pull request #527 from derouinw/biomessplit
Biomessplit
2014-01-11 12:20:41 -08:00
madmaxoft 2634261a28 Removed unused variables.
The Lua API calls had no side-effects, either.
2014-01-11 20:29:56 +01:00
madmaxoft 7fa5217aad Fixed the warning in CryptoPP.
It was getting on my nerves too much, decided to actually fix their code.
2014-01-11 20:27:07 +01:00
Mattes D 5417f7bd2d Merge pull request #530 from mc-server/GeneratorDecouple
Decoupled cChunkGenerator from cWorld and cRoot.
2014-01-11 11:26:09 -08:00
madmaxoft 7739238d3d Fixed reading the files.
Duplicate values were ignored.
2014-01-11 20:10:50 +01:00
madmaxoft 2e0fcbdcb7 Documented the cIniFile:AddValue* functions.
Now the documentation really matches the implementation.
2014-01-11 16:50:52 +01:00
madmaxoft a332a5dc73 IniFile: Split SetValue() into AddValue() and SetValue().
Each function does what one would assume - AddValue adds a new value, SetValue overwrites existing value (creates a new one if not exists, if instructed to do so).
2014-01-11 16:44:28 +01:00
Mattes D 7a55f91be2 Merge pull request #531 from xdot/master
Fixed glowstone drop count
2014-01-11 06:52:48 -08:00
madmaxoft 37025fca77 Merge branch 'master' into IniFileFix 2014-01-11 13:03:51 +01:00
madmaxoft cea997426b Decoupled cChunkGenerator from cWorld and cRoot.
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
2014-01-10 22:22:54 +01:00
Mattes D e213769216 Merge pull request #522 from mc-server/LuaDlFix
Lua dl fix
2014-01-10 08:27:43 -08:00
madmaxoft 712e6e0bb2 Fixed generator adding values to ini file. 2014-01-10 16:34:09 +01:00
madmaxoft 4c360b54e3 Fixed cIniFile's SetValue().
How did we not see this earlier? Each call to SetValue would actually ADD a value!
2014-01-10 16:23:22 +01:00
Mattes D 6943a4df74 Merge pull request #520 from mc-server/SoulSand
NetherGen: Now generates SoulSand.
2014-01-10 07:14:19 -08:00
madmaxoft 1704d0fd6b Using dlopen() on all platforms except WIN32. 2014-01-10 10:03:39 +01:00
madmaxoft 00af5d4d6e Debuggers: Test code for WECUI plugin messaging. 2014-01-09 14:26:44 +01:00
madmaxoft bb96737f45 Exported cClientHandle::SendPluginMessage() to Lua. 2014-01-09 14:25:37 +01:00
madmaxoft f3bedb3c32 Fixed wrong packet number for PluginMessage packet. 2014-01-09 14:24:57 +01:00
madmaxoft fe978f0d1e Added cClientHandle::SendPluginMessage().
It is not yet exported in the API, though.
2014-01-09 11:39:42 +01:00
madmaxoft bd17662412 Composition generator creating moved to a separate function.
Also it forces the defaults into the INI file.
2014-01-09 10:35:51 +01:00
madmaxoft 1ef20e858f Height generator creating moved info HeiGen.cpp.
The generator also explicitly sets the default back into the INI file.
2014-01-09 10:21:26 +01:00
madmaxoft 4a1b78787f Windows nightbuild updated to generate .example.ini files.
Fixes #314.
2014-01-09 09:47:16 +01:00
Mattes D 91d70b87e5 Merge pull request #517 from derouinw/master
Add missing plugin error
2014-01-08 23:51:32 -08:00
madmaxoft 18310752b8 Fixed a typo in the TestLuaRocks test plugin. 2014-01-09 08:05:34 +01:00
madmaxoft 53e2ed8473 Specified the dynamic loader Lua should use. 2014-01-09 08:05:08 +01:00
madmaxoft 71946f5671 Added a known working favicon. 2014-01-08 20:18:26 +01:00
madmaxoft 17363716a1 ProtoProxy: Fixed favicon relaying.
The buffer was too small for the favicon; now it's dynamic.
2014-01-08 17:17:37 +01:00
madmaxoft 38d0bdf00a Fixed AppendVPrintf() handling for large strings.
This caused a failure in server favicons.
2014-01-08 14:23:15 +01:00
Mattes D b952ea11c7 Merge pull request #519 from mc-server/sigterm
Graceful shutdown on SIGTERM
2014-01-07 23:36:01 -08:00
madmaxoft e353f29d4a Plugin messages are received and handed to plugins.
Note that MCS doesn't currently handle any channel registrations, this will come later on.
2014-01-07 17:47:20 +01:00
Mattes D a87daa969e Merge pull request #514 from derouinw/master
Implement favicon for 1.7.2
2014-01-07 08:41:13 -08:00
madmaxoft a33b157dc9 Disabled an unneeded MSVC warning.
Also sorted the enabled warnings by their numerical code for easier searching..
2014-01-07 17:15:08 +01:00
madmaxoft 8b9b09bf60 Removed a debugging log output in cPluginManager:AddHook(). 2014-01-07 17:07:49 +01:00
madmaxoft 39a1bcdea0 More MSVC warning fixes. 2014-01-07 17:07:49 +01:00
madmaxoft bcd41dc1aa LuaState can push strings with embedded NULs.
This also marginally improves performance, since a strlen() isn't called (inside lua_pushstring()), the string length is stored in the AString object directly.
2014-01-07 17:07:48 +01:00
Mattes D 748fd86b83 Merge pull request #513 from worktycho/FreeBSDDynamicLink
Fixed FreeBSD dynamic linker library
2014-01-07 08:07:01 -08:00
Mattes D 2a058559d4 Update CONTRIBUTING.md
Added control statement braces and end-of-file blank lines.
2014-01-07 16:43:47 +01:00
madmaxoft 934b90c121 Fixed a few MSVC warnings. 2014-01-07 14:24:25 +01:00
madmaxoft e3bb82d95a Added Base64Encode(). 2014-01-07 12:36:36 +01:00
madmaxoft 778c329ad2 Disabled the type conversion MSVC warning.
It was hitting way too many false positives.
2014-01-06 22:23:03 +01:00
madmaxoft 9c8af58b75 Fixed a few MSVC warnings. 2014-01-06 22:22:33 +01:00
Mattes D db978fc687 Merge pull request #511 from mc-server/CmakeOutput
Output dir set to $/MCServer.
2014-01-06 11:12:50 -08:00
Mattes D 6dd44e6230 Merge pull request #509 from Diusrex/master
Added #pragma for warnings in MSVC warnings
2014-01-06 09:15:41 -08:00
madmaxoft 0d5a5cc990 Exported cWorld::BroadcastBlockAction().
As requested in #508; no guarantees about it.
2014-01-06 16:01:20 +01:00
madmaxoft 8b6be58ad9 InfoDump: Removes indent and parses ParameterCombinations.
The DetailedHelp was a bad name for what it really contained, so it has been renamed to ParameterCombinations.
2014-01-06 10:25:52 +01:00
madmaxoft 4b54f3e3ea Output dir set to $/MCServer.
Ref.: #510.
2014-01-06 10:13:19 +01:00