ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,960 Commits
1 Branch
0 Tags
70 MiB
Commit Graph

6960 Commits (130b2b8991407eb4422de558e0008376b9efbb52)

Author SHA1 Message Date
Alexander Harkness 130b2b8991 Update Zip2008.list 2014-09-09 13:27:02 +01:00
worktycho 64071aeda9 capitalisation error 2014-09-08 17:45:23 +01:00
Mattes D 9e36bbd069 Merge pull request #1397 from mc-server/saveSetting 
If server fails init, save any changed or generated settings.
 2014-09-08 16:31:44 +02:00
worktycho 4613fabd45 derp 2014-09-08 15:15:31 +01:00
worktycho 5f207c8bb7 If server fails init, save any changed or generated settings. 2014-09-08 14:57:58 +01:00
Mattes D c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D d2c1518145 Webadmin: Added default ports to auto-generated ini file. 
Fixes #1382.
 2014-09-07 19:45:15 +02:00
Mattes D a0feff2734 WebAdmin: Added HTTPS instructions when cert / key is missing. 2014-09-07 19:42:35 +02:00
Mattes D 690867c89e Fixed submodules' downgrade from the previous PR merge. 2014-09-07 09:09:10 +02:00
Masy98 a2452ff6fa Re-ordered the items.ini and added a few new names 2014-09-06 22:37:48 +02:00
Masy98 9cdb9b6262 Merge branch 'master' into blocks 
Conflicts:
	MCServer/crafting.txt
 2014-09-06 22:06:40 +02:00
Masy98 029eb3d4fa Merge remote-tracking branch 'upstream/master' 2014-09-06 22:03:35 +02:00
Mattes D c71a37012c Merge pull request #1385 from mc-server/clangWarnings 
Should now compile in clang 3.0
 2014-09-06 20:35:51 +02:00
worktycho 22b4511640 Update SetFlags.cmake 2014-09-06 18:11:42 +01:00
Mattes D 52dd5ba6dd Added missing newline. 2014-09-06 19:02:16 +02:00
Mattes D e1a9a6291b Removed chunk's unused Y coord. 
This fixes the second issue of #1313.
 2014-09-06 19:01:30 +02:00
Mattes D 0a651b9fd8 Added Y-wise asserts to signs. 
This should help detect #1313's second case.
 2014-09-06 18:59:17 +02:00
Mattes D 868723ce50 Alpha-sorted protocol 1.7 senders. 2014-09-06 18:57:57 +02:00
Tycho 562b2d1d1d Added workaround for clang version 2014-09-06 16:30:04 +01:00
Tycho 5fa206a420 bumped cmake version min and fixed clang support 2014-09-06 15:30:13 +01:00
worktycho f7d06f093e Wrong cmake var 2014-09-06 14:55:06 +01:00
worktycho 8b5ad667d9 Improve error message 2014-09-06 14:49:40 +01:00
worktycho f22b9aa5f4 Should now compile in clang 3.0 2014-09-06 14:38:47 +01:00
Mattes D 9e1f67932b Fixed player spawning in unknown world. 
This may happen if the admin removes a world.
 2014-09-06 15:26:20 +02:00
madmaxoft 29910bc3bd Win build: put third party licenses into a separate folder. 2014-09-06 13:41:23 +02:00
Mattes D 9f9302f470 Anvil: Fixed an off-by-one error in the loader. 
Fixes #1307.
 2014-09-06 13:32:16 +02:00
Mattes D dd0aa22d2e Fixed scoreboard loader type checks. 
Fixes scoreboard loading error reported on the Dropper map in #1307.
 2014-09-06 13:11:08 +02:00
Alexander Harkness f6e029253f Removed outdated message sending methods. 
Fixes #1381
 2014-09-06 10:24:33 +01:00
Mattes D b1cc1451d4 Merge pull request #1361 from mc-server/WebAdmin 
Webadmin improvements
 2014-09-06 11:12:18 +02:00
Alexander Harkness 15d4e543b1 Xoft fixes. 2014-09-06 09:56:22 +01:00
Mattes D 103fa8812d WorldStorage no longer queues chunks into generator. 2014-09-05 23:26:00 +02:00
Mattes D 4230eb3d92 Fixed loading empty chunks. 
Reported on the Dropper map in #1307.
 2014-09-05 22:55:39 +02:00
Mattes D 137b021d26 Rewritten chunk status to specify whether the chunk is in queue. 
This fixes #1370.
 2014-09-05 22:16:48 +02:00
Mattes D e15b8600a6 BiomeMultiCache is not used for simple generators. 2014-09-05 22:08:00 +02:00
Mattes D 60e235362c Fixed style. 2014-09-05 22:07:13 +02:00
Mattes D 6444bc25ba Fixed security: Player cannot spawn in a disabled world. 2014-09-05 16:55:16 +02:00
Mattes D 254c8c9154 Anvil: Fixed loading block entities with invalid Y coord. 2014-09-05 16:40:03 +03:00
Masy98 15bee41a36 Merge remote-tracking branch 'upstream/master' 2014-09-05 11:27:21 +02:00
Mattes D e9dda864ea Merge pull request #1375 from mc-server/EntitiesInBox 
Implemented ForEachEntityInBox
 2014-09-04 22:25:19 +02:00
Mattes D b590eed42f Merge pull request #1371 from DayBr3ak/master 
issue381, multicache for cBioGen
 2014-09-04 14:09:54 +02:00
madmaxoft 7ab4c078b8 Fixed compilation after chunk Y removal. 2014-09-04 14:05:42 +02:00
madmaxoft 3297a39c27 Merge remote-tracking branch 'origin/master' into EntitiesInBox 2014-09-04 14:02:18 +02:00
madmaxoft d77221c715 Anvil: Cleanly refuse to store data that is too large. 
Each chunk in MCA needs to be less than 1 MiB compressed; chunks that are larger will be refused with a log message.
 2014-09-04 14:01:06 +02:00
archshift e1206568ec Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" 
This reverts commit 472efa8174.

Apparently we don't support some of these features quite yet (darn you C++98!)
 2014-09-03 16:23:03 -07:00
archshift 19067b27de In 1.8, carrots and potatoes yield one less hunger point. 2014-09-03 16:18:58 -07:00
archshift 472efa8174 Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc 
Snow Golems must also be above 64Y to spawn snow (as of 1.8).
 2014-09-03 16:12:43 -07:00
madmaxoft 1b9edb0279 Debuggers: Reviewed and fixed the Pickups and Poof commands. 
Now they're confirmed working.
 2014-09-03 23:05:49 +02:00
madmaxoft 014a55a15a LuaState: Fixed class value-getting off the stack. 2014-09-03 23:05:22 +02:00
madmaxoft 06c66a08cd LuaState: Fixed referenced function pushing. 
The references are no longer destroyed by the call.
 2014-09-03 23:05:03 +02:00
madmaxoft bae928fd27 ChunkGenerator: Log world seed when creating a new one. 2014-09-03 23:02:00 +02:00