1
0
Commit Graph

3632 Commits

Author SHA1 Message Date
Bill Derouin
af89794d76 Globals.h needs to be first include 2014-01-10 15:50:52 -06:00
Bill Derouin
fe48f62575 Include Biome enum in ChunkDef
Can't forward declare an enum
2014-01-10 10:30:56 -06:00
Bill Derouin
ee74411024 Added newlines at ends of files 2014-01-10 10:10:24 -06:00
Bill Derouin
0a72390587 Added files to VC2013 project file 2014-01-10 09:33:48 -06:00
Bill Derouin
1c2004dfbb Fixed missing externals
Turns out you actually have to include the .cpp in the project file
2014-01-10 09:23:53 -06:00
Bill Derouin
cee76f1ace Move biome definition to separate files 2014-01-09 15:21:46 -06: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
Bill Derouin
154d6b989a A couple touchups 2014-01-08 13:45:16 -06: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
Tiger Wang
6c65b050ca Updated Core 2014-01-07 21:29:01 +00:00
Tiger Wang
f578dbfc54 Graceful shutdown on SIGTERM 2014-01-07 21:23:26 +00:00
Bill Derouin
e0d94e0f06 Add missing plugin error
Previously, if a plugin was included but the folder had no lua files,
the error given was ambiguous. Now, it explicitly describes lack of lua
files.

See issue #512

P.S. This probably isn't the best way, but this is where the fix can be
made.
2014-01-07 13:47:15 -06:00
Alexander Harkness
6c469ec1f5 Removed bitdeli badge - we have GitHub analytics now. 2014-01-07 18:51:16 +00:00
Tiger Wang
524aecc106 Updated submodules 2014-01-07 17:25:20 +00:00
Alexander Harkness
01fcf2fecb Merge pull request #516 from mc-server/favicon
Fixed favicons
2014-01-07 09:09:57 -08:00
Tiger Wang
1d96a615b5 Fixed favicons 2014-01-07 16:53:40 +00: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
Bill Derouin
5012b81578 Avoid making copies of favicon string 2014-01-07 10:26:56 -06: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
Bill Derouin
1c2eb4a1c0 A few more touch ups 2014-01-07 09:49:52 -06: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
Bill Derouin
ede6757f67 A few touch ups 2014-01-07 09:40:59 -06:00
Bill Derouin
5fd62f9cd7 Removed unused line 2014-01-07 09:38:51 -06:00
Bill Derouin
913841f501 Implement favicon for 1.7.2
Favicon data is a png encoded in base64 which is stored in the server
and sent in the server response packet
2014-01-07 09:31:06 -06:00
Tiger Wang
a43f819bba Regenerated VS2013 files 2014-01-07 14:09:03 +00:00
madmaxoft
934b90c121 Fixed a few MSVC warnings. 2014-01-07 14:24:25 +01:00
Tycho
623146996a Fixed FreeBSD compilition 2014-01-07 05:08:58 -08:00
Tycho
0b79ad0d5d Merge branch 'master' of github.com:mc-server/MCServer 2014-01-07 04:57:34 -08: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
Diusrex
ed9a500d6b Undid the changes to cryptlib.cpp.
Instead, altered the VC2008 cryptopp project settings.

Someone else will probably need to do the same thing for the 2013 version, since I don't have access to VC2013.
2014-01-06 10:12:40 -07:00
madmaxoft
0d5a5cc990 Exported cWorld::BroadcastBlockAction().
As requested in #508; no guarantees about it.
2014-01-06 16:01:20 +01:00