flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
3,619 Commits 1 Branch 0 Tags
91d70b87e53b1cfb73e17bdce18e059486c979df
Commit Graph
3619 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
madmaxoft c9c71fe5a7 Fixed wrong enqueueing. 
Fixes #505.
 2014-01-06 10:09:00 +01:00
Diusrex 487c1a24de Added fake functions into cCriticalSection because of the change to ASSERT 2014-01-05 15:08:30 -07:00
Diusrex 1acbf07445 Changed the release version of ASSERT. 
This was so a variable only used in ASSERT statements will not give a warning about not being used.
 2014-01-05 15:07:46 -07:00
Diusrex 2dbe5033ca Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h 
I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings.

So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function.
 2014-01-05 15:06:17 -07:00
Diusrex 0d5b581fcd Making all of the useful level 4 warnings be active. 2014-01-05 14:42:22 -07:00
madmaxoft 84bf32f857 Fixed cPluginManager:AddHook() binding. 
Fixes #401. Old formats are still accepted, for compatibility reasons.
 2014-01-05 15:46:45 +01:00
madmaxoft 0a712931b1 Fixed a race condition in the cQueue class. 
Fixes #505.
 2014-01-05 15:15:59 +01:00
madmaxoft 44cf86dcf9 InfoDump: Removed an unneeded function. 2014-01-05 15:15:59 +01:00
Alexander Harkness f576b71809 Fix #506 2014-01-05 08:27:59 +00:00
madmaxoft 20da685002 InfoDump: All reasonable strings are forumized. 2014-01-04 22:11:19 +01:00
madmaxoft b2ac227064 Added forum output for commands' DetailedHelp array. 
Also added some coloring to simulate syntax highlighting.
 2014-01-04 20:42:31 +01:00