Tycho
1635c696de
Merge branch 'master' into unreachable
2014-03-19 12:13:05 -07:00
Tycho
363c92ed53
Added unreachable lines backit prtected by preprocessor guards
2014-03-19 12:06:12 -07:00
madmaxoft
4a67114f56
LuaChunkStay: Removed a debugging output.
2014-03-19 13:57:06 +01:00
madmaxoft
91f64da2a6
Fixed chunkmap tree block replacing.
2014-03-18 15:45:16 +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
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
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
ef50e73a9c
Added common eMessageType aliases.
2014-03-16 21:37:33 +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
04f1d58561
Fixed unessicary return
2014-03-15 07:08:09 -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
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
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
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
Mattes D
adf5a60746
Merge pull request #805 from worktycho/undef
...
Fixed a couple of missing defs
2014-03-14 15:37:01 +01:00
Tycho
2f81c1d7fb
Added NORETURN macro
2014-03-14 07:33:47 -07:00
Tycho
b829c9b14e
Fixed a few unneeded breaks
2014-03-14 07:12:00 -07:00
Tycho
58fa8b40bf
Removed missiterperatable malfunctioning error handling code
2014-03-14 07:02:57 -07:00
Tycho
e61810e1bf
Removed invalid block face handling code
...
The code for handling invalid block faces is removed by gcc and clang as it is undefined behavior for a enum
to contain a value that is not part of the enum. Since the only way that the line can be executed is through
undefined behavior clang and gcc remove it so the function fits in the caches better.
2014-03-14 06:52:49 -07:00
Tycho
8b83c1a653
Merge branch 'master' into warnings
2014-03-14 06:46:20 -07:00
Tycho
22cdbe99b4
Fixed a couple of missing defs
2014-03-14 06:44:04 -07:00
madmaxoft
9b63156447
cPlugin:BindConsoleCommand can be called statically.
...
This has been documented before it was written.
2014-03-14 14:37:39 +01:00
madmaxoft
35fe96b07d
Fixed a warning.
2014-03-14 14:36:44 +01:00
Tycho
cd6ab5617c
Fixed xofts issues
2014-03-14 06:11:49 -07:00
Tycho
692cf5bb70
Merge branch 'master' into warnings
2014-03-14 06:01:45 -07:00
Mattes D
1259844084
Merge pull request #793 from xdot/master
...
Unified Vector classes
2014-03-14 11:52:15 +01:00
madmaxoft
bba090ebdd
cPluginManager:Bind[Console]Command returns true on success.
...
Fixes #801 .
2014-03-14 11:18:14 +01:00
Tycho
9a28d1bbe1
Fixed comma
2014-03-12 11:56:24 -07:00
Tycho
862e219443
Added additional macros to support the MSVC size_t format and changed all formats to use the macros
2014-03-12 10:34:50 -07:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
a584b7b3bc
Fixed printf format compatabilty
2014-03-12 10:09:08 -07:00
Tycho
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
