1
0
Commit Graph

4918 Commits

Author SHA1 Message Date
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
madmaxoft
91f64da2a6 Fixed chunkmap tree block replacing. 2014-03-18 15:45:16 +01:00
madmaxoft
38aad32a8b Debuggers: Using binary file mode for .schematics. 2014-03-18 13:54:32 +01:00
madmaxoft
4dc5650023 Fixed cGZipFile::ReadRestOfFile returning incorrect value. 2014-03-18 13:54:17 +01:00
madmaxoft
9447cd20f3 Fixed a crash in firework rockets.
Fixes #816.
2014-03-17 22:12:02 +01:00
Tycho
0a505576e5 Fixed =~ bug 2014-03-17 10:28:04 -07:00
Tycho
90ab055eab Merge branch 'master' into unreachable 2014-03-17 09:44:34 -07:00
madmaxoft
89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
madmaxoft
260d13c7a4 Added override specifier where appropriate in cWorld. 2014-03-16 21:56:27 +01:00
Mattes D
728bfd155e Merge pull request #811 from mc-server/DumpInfo
Created a small plugin for InfoDump
2014-03-16 21:53:11 +01:00
STRWarrior
5a9f17060d Only check for "Info.lua" with capital I 2014-03-16 21:52:28 +01:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
Mattes D
dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
c5740c27a9 Wrong if in BlockLeaves 2014-03-16 21:39:01 +01:00
Howaner
b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
madmaxoft
4227066f6d Fixed InfoReg.lua's handling of multi-level commands. 2014-03-16 21:37:33 +01:00
madmaxoft
5ac863f7fa Removed the @EnableMobDebug.lua file.
It is not needed anymore, ZeroBrane Studio now has direct support for invoking the debugger in MCS plugins.
2014-03-16 21:37:33 +01:00
madmaxoft
ef50e73a9c Added common eMessageType aliases. 2014-03-16 21:37:33 +01:00
Mattes D
62629825ce Merge pull request #814 from Howaner/Cake
Add cake
2014-03-16 21:33:51 +01:00
Howaner
96d80f981e Change if-clause in BlockCake.h 2014-03-16 20:57:23 +01:00
Howaner
4ec5a95a7a Add cake 2014-03-16 20:26:13 +01:00
Howaner
568038ab52 Fix anvil pickups. 2014-03-16 19:25:00 +01:00
Howaner
4e0edc9fa7 Add anvil direction. 2014-03-16 17:42:23 +01:00
Tycho
3e0dfbc7a1 Made buffers static const 2014-03-16 07:59:58 -07:00
STRWarrior
db73e37e2d Created a small plugin for InfoDump
It allows you to dump the info of a plugin by pressing a button in the webadmin.
2014-03-15 20:33:34 +01:00
Tycho
7f84c8d60b Patched tolua to understand size_t 2014-03-15 10:42:35 -07:00
Tycho
a427f004b8 Fix indentation 2014-03-15 07:15:02 -07:00
Tycho
04f1d58561 Fixed unessicary return 2014-03-15 07:08:09 -07:00
Tycho
683e2f4840 Merge branch 'master' into globals
Conflicts:
	SetFlags.cmake
2014-03-15 06:53:07 -07:00
Tycho
fbd4d53dac Merge branch 'master' into unreachable
Conflicts:
	SetFlags.cmake
2014-03-15 06:47:56 -07:00
Tycho
2e9fe777e4 Patched tolua to emit range checks for enums 2014-03-15 06:45:26 -07:00
Howaner
d6edd5f24e Remove old debug messages. 2014-03-15 11:53:55 +01:00
madmaxoft
4a5bea159f Debuggers: Added a test for WE selection API.
This tests mc-server/WorldEdit#34.
2014-03-15 08:38:15 +01:00
madmaxoft
d364c7befc APIDump: Documented a forgotten cCuboid constructor. 2014-03-15 08:38:14 +01:00
Mattes D
50b53ff3e8 Merge pull request #800 from mc-server/EntireCommandError
The entire unknown command is echoed back to the user on error.
2014-03-15 07:52:37 +01:00
madmaxoft
62ed305f07 APIDump: Fixed missing return statement. 2014-03-15 07:51:33 +01:00
madmaxoft
0442c41c87 Added cCuboid:Assign(OtherCuboid) API function. 2014-03-15 07:50:39 +01:00
Howaner
8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner
cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00
Howaner
28898f710b Add ExpOrb saving. 2014-03-15 00:32:49 +01:00
Howaner
ccc29c7c6c Add fireball interact 2014-03-14 23:52:51 +01:00
madmaxoft
dc1049da3c Ignoring all config and SQLite files in the output folder. 2014-03-14 16:18:31 +01:00
madmaxoft
a982b9b5ac APIDump: Trigger the dump manually.
Fixes #715. The dump can be triggerred by issuing an "api" console command, or in the webadmin.
2014-03-14 16:18:31 +01:00
Mattes D
763ea2840b Merge pull request #808 from worktycho/noreturn
Noreturn
2014-03-14 16:16:33 +01:00
Tycho
e3646fc877 Fixed a couple of unneeded returns in ProtoProxy 2014-03-14 08:05:35 -07:00
Tycho
693e59c6a4 Merge branch 'master' into noreturn
Conflicts:
	SetFlags.cmake
2014-03-14 08:04:48 -07:00
Tycho
8e11c270fc Added Noreturn attribtes to a couple of functions and made a missing noreturn an error 2014-03-14 07:59:25 -07:00
Tycho
c51a9b5fc2 Merge branch 'master' into unreachable
Conflicts:
	SetFlags.cmake
2014-03-14 07:46:33 -07:00