worktycho
|
833d328435
|
Added MSVC guard
|
2014-06-27 11:07:03 +01:00 |
|
worktycho
|
9e1829e4e6
|
Update SetFlags.cmake
|
2014-06-27 10:45:43 +01:00 |
|
worktycho
|
62669f64de
|
Update SetFlags.cmake
|
2014-06-27 10:27:02 +01:00 |
madmaxoft
|
78442edf1d
|
CMake: Added log message for coverage.
|
2014-06-27 11:02:28 +02:00 |
|
madmaxoft
|
f68dc6210f
|
Moved CodeCoverage into a separate cmake condition.
|
2014-06-27 09:24:11 +02:00 |
|
Mattes D
|
e60b73ce69
|
Merged branch 'howaner/Bow'.
Removed the pickup collection broadcast due to bad code.
|
2014-06-26 18:42:28 +02:00 |
|
Mattes D
|
4826990ea0
|
Merged branch 'howaner/Pickups'.
|
2014-06-26 18:35:38 +02:00 |
|
Mattes D
|
0df644c9f7
|
FurnaceRecipe parsing: Fixed whitespace removing.
|
2014-06-26 18:28:10 +02:00 |
|
Mattes D
|
ec1015112c
|
Fixed misformed trimming.
|
2014-06-26 18:20:12 +02:00 |
|
Mattes D
|
55bbdfa5d4
|
FurnaceRecipe: Moved the parsing into separate functions for clarity.
|
2014-06-26 18:18:41 +02:00 |
|
Mattes D
|
67e3c645d3
|
FurnaceRecipe parser: Made the parser more forgiving.
Errors don't cause a stop in the parsing, but rather just skip the offending line.
|
2014-06-26 17:52:37 +02:00 |
|
Mattes D
|
b90b0a1dff
|
FurnaceRecipe parser: Added an else branch, changed to a switch.
|
2014-06-26 17:51:19 +02:00 |
Howaner
|
bf3229867b
|
Add comment.
|
2014-06-26 17:26:47 +02:00 |
|
Howaner
|
cba273dc7e
|
Fixed a comment and changed CombineCount to short.
|
2014-06-26 17:20:48 +02:00 |
|
Mattes D
|
3216fbabfd
|
Merge remote-tracking branch 'origin/furnaceparsing'
|
2014-06-26 17:11:40 +02:00 |
|
Mattes D
|
7102e9edb0
|
Merged branch 'tonibm19/master'.
|
2014-06-26 17:09:28 +02:00 |
|
Howaner
|
9b7f1e3db8
|
Merge branch 'master' into Pickups
|
2014-06-26 15:56:44 +02:00 |
|
Howaner
|
f96955496f
|
GameMode check
|
2014-06-26 15:56:03 +02:00 |
|
Howaner
|
eaf36766f6
|
Merge branch 'master' into Bow
|
2014-06-26 15:49:53 +02:00 |
|
Mattes D
|
af3779ab9a
|
Merge pull request #1126 from mc-server/BlockInfoInit
BlockInfo is now a proper C++ singleton.
|
2014-06-25 22:23:57 +02:00 |
|
madmaxoft
|
e9aecfdf11
|
BlockInfo is now a proper C++ singleton.
It is properly initialized before it is ever used.
|
2014-06-25 08:07:06 +02:00 |
|
Howaner
|
dbcb7f819f
|
Optimize combining.
|
2014-06-24 17:50:38 +02:00 |
|
worktycho
|
03da9ae3c4
|
Merge pull request #1125 from Howaner/Entities
Add entity health saving.
|
2014-06-24 15:23:55 +01:00 |
|
Howaner
|
2dd7a0373b
|
Better combining.
|
2014-06-24 16:19:22 +02:00 |
|
Howaner
|
d4e1277724
|
Add entity health saving.
|
2014-06-24 16:06:26 +02:00 |
|
Howaner
|
5ab01c4d42
|
Fix pickup combining over the maximum stack size.
|
2014-06-24 15:27:19 +02:00 |
|
madmaxoft
|
a1d2c114cf
|
Fixed BlockInfo initialization.
Now cBlockInfo is initialized in the getter, instead of "at any time during startup", which included "after it was already needed".
|
2014-06-24 13:49:14 +02:00 |
|
Mattes D
|
1da39568a3
|
Added asserts for cChunk::GetBlockEntity() coords.
|
2014-06-24 09:46:38 +02:00 |
|
Mattes D
|
742370497a
|
Fixed crashes in HopperEntity.
Some of the coords were off and some functions were assuming too much.
Fixes the crash reported in http://forum.mc-server.org/showthread.php?tid=1497
|
2014-06-24 09:46:04 +02:00 |
|
madmaxoft
|
4306092753
|
Debuggers: Fixed the Blaze rod query tool.
|
2014-06-24 07:05:49 +02:00 |
Tiger Wang
|
7a23692131
|
Parenthesised comparison
|
2014-06-23 17:40:51 +01:00 |
|
madmaxoft
|
59270fd44d
|
VoronoiMap: Added a missing initializer.
Fixes CID 68410.
|
2014-06-23 17:06:38 +02:00 |
|
madmaxoft
|
6a77705d4e
|
Added a (disabled) block meta mirror / rotate test code.
This will perform basic sanity checks on block metadata mirroring and rotating. cMetaRotator must disable its asserts in order for this to work.
|
2014-06-23 07:23:54 +02:00 |
|
madmaxoft
|
dd6a9f6559
|
Fixed the slab vertical mirroring.
|
2014-06-23 00:15:56 +02:00 |
|
madmaxoft
|
d61ff4da3b
|
Fixed sign and lever rotations.
|
2014-06-23 00:15:55 +02:00 |
|
madmaxoft
|
82dcc0b4db
|
Prefabs don't draw into chunk if they don't intersect.
|
2014-06-23 00:15:55 +02:00 |
|
Tiger Wang
|
dc8817feee
|
Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsing
Conflicts:
src/FurnaceRecipe.cpp
|
2014-06-22 21:51:21 +01:00 |
|
Tiger Wang
|
c476fc3cf5
|
Suggestions
|
2014-06-22 21:49:37 +01:00 |
|
Mattes D
|
fe95dfa758
|
Merge pull request #1105 from Howaner/Blocks
Added door and fence gate sounds.
|
2014-06-22 20:56:24 +02:00 |
|
Howaner
|
bebfb230da
|
Changed 0xFFFFFFFB to ~0x04
|
2014-06-22 17:29:02 +02:00 |
|
Tiger Wang
|
c13cffcd30
|
Merge branch 'master' of https://github.com/mc-server/MCServer
|
2014-06-22 15:05:02 +01:00 |
|
Tiger Wang
|
3ec8b33b76
|
Fixed another daylight sensor bug
Additionally fixed unpowering across chunks.
|
2014-06-22 15:04:23 +01:00 |
|
Tiger Wang
|
b2bf466122
|
Chests don't open if obstructed
* Fixes FS383
|
2014-06-22 14:47:05 +01:00 |
|
worktycho
|
3c0452ebef
|
Fixed missing break
Fixes CID 68409
|
2014-06-22 14:17:07 +01:00 |
|
worktycho
|
119ba562d5
|
Fixed invalid iterator
Fixes CID 60408
|
2014-06-22 14:15:41 +01:00 |
|
worktycho
|
63ce2e8b37
|
Fixed compile errors
|
2014-06-22 12:30:37 +01:00 |
|
Tiger Wang
|
4a01fba3aa
|
Suggestions
|
2014-06-22 00:06:58 +01:00 |
|
madmaxoft
|
08fed2a213
|
Added cClientHandle::IsUUIDOnline function.
Ref.: #771
|
2014-06-21 22:13:35 +02:00 |
Alexander Harkness
|
d33881d752
|
Restored style continuity.
|
2014-06-21 21:07:31 +01:00 |
|
Tiger Wang
|
537467fe25
|
Removed debugging code
|
2014-06-21 20:35:28 +01:00 |