1
0
Commit Graph

5404 Commits

Author SHA1 Message Date
Tycho
189c7529e9 Add qutes to scripts 2014-05-10 13:18:40 +01:00
Tycho
6e6d7c1159 Fix spaces in bash 2014-05-10 13:17:09 +01:00
Tycho
cebbb8abd0 Make scripts executable 2014-05-10 13:14:32 +01:00
Tycho
5be9bac448 Fixed missing Dollar signs 2014-05-10 13:12:57 +01:00
Tycho
b66b1e5b10 Fixed paths 2014-05-10 13:12:01 +01:00
Tycho
604ed439a8 Fix bash ifs 2014-05-10 13:09:47 +01:00
Tycho
d478e3cfb1 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.h
2014-05-10 05:05:44 -07:00
Tycho
77395b3739 Maybe coverage working? 2014-05-10 05:03:36 -07:00
Mattes D
a38d8b6513 Merge pull request #992 from mc-server/coverity_fixes
Coverity fixes
2014-05-09 21:20:27 +02:00
Mattes D
a2e18f0e01 Fixed size_t in FireworksSerializer. 2014-05-09 20:32:27 +02:00
Mattes D
1a5a123301 Fixed message formatting. 2014-05-09 20:16:29 +02:00
Mattes D
294b7ca24a Even more size_t fixes. 2014-05-09 20:05:00 +02:00
Mattes D
d67ea97a26 More size_t fixes. 2014-05-09 19:57:59 +02:00
Mattes D
5b54dc3eac Build fixes after the last size_t batch. 2014-05-09 19:33:22 +02:00
worktycho
c4cd201f18 Range Check on schematic size
Fixes CID 55830
2014-05-09 17:39:13 +01:00
Mattes D
dd350bc1f3 World pre-generation distance is settable in world.ini. 2014-05-09 18:32:04 +02:00
Mattes D
56ad2c2124 Lighting thread disabled its chunkstays before deleting them. 2014-05-09 18:32:03 +02:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
worktycho
99af4453ef Check the height and width values read.
Fixes CID 55831
2014-05-09 17:30:47 +01:00
worktycho
17c7c31130 Initialise m_HasTeleported in both constructors 2014-05-09 16:56:29 +01:00
Mattes D
d1b719885d Merge pull request #989 from Howaner/Anvil
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
2014-05-07 22:18:53 +02:00
Mattes D
d9cdd4441e Merge pull request #853 from Howaner/Slabs
Grass now grows under up-side-down slabs
2014-05-07 22:18:23 +02:00
Howaner
c96a27f4ae Superfluous method override. 2014-05-07 21:36:26 +02:00
Howaner
df71cc931b Missing comma 2014-05-07 21:32:52 +02:00
Howaner
10e3c262db Send item back to the client when the item get damage. 2014-05-07 21:00:21 +02:00
Howaner
fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner
bc4a51781e Add lava and water check to block handlers. 2014-05-07 20:37:36 +02:00
Tiger Wang
91b15b475a Merge pull request #990 from Howaner/Entities
Fix MagmaCube save.
2014-05-07 16:43:34 +01:00
Howaner
36a2aa2f21 Rename CanChangeDirtToGrass to CanDirtGrowGrass 2014-05-07 12:59:48 +02:00
Howaner
f5fe368220 Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
Howaner
e86bf64867 Where is the problem with clang? 2014-05-07 12:45:20 +02:00
Howaner
80bcc43c7b Fix MagmaCube save. 2014-05-07 12:43:21 +02:00
Howaner
d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
Tiger Wang
e5b42b9f16 Fixed wires powering wires diagonally below them 2014-05-06 23:05:14 +01:00
Mattes D
66c5c81e02 Merge pull request #985 from Howaner/Anvil
Add anvil inventory.
2014-05-06 21:46:50 +02:00
Mattes D
e400b1acd8 Merge pull request #927 from mc-server/fixes
Small fixes
2014-05-06 21:44:55 +02:00
Tiger Wang
696a7bc52e Merge branch 'master' into fixes
Conflicts:
	src/Vector3.h
2014-05-06 20:15:19 +01:00
Tiger Wang
cca8376a01 Suggestions'd #2 2014-05-06 19:38:01 +01:00
Howaner
954b59d6f4 Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() 2014-05-06 19:38:09 +02:00
Howaner
27f95454a9 Simplified the HandleAnvilItemName() code. 2014-05-06 17:31:02 +02:00
Tiger Wang
1df7dbe7c9 Suggestions'd 2014-05-05 23:45:35 +01:00
madmaxoft
9542b0b875 Changed cPieceGenerator to support pairings.
Fixes #982.
2014-05-05 23:05:30 +02:00
madmaxoft
e4af9a21af Prefabs can specify that they don't want flooring.
Previously the flag was ignored.
2014-05-05 22:28:54 +02:00
Howaner
dca3af1f0f Change int to size_t return. 2014-05-05 22:11:48 +02:00
madmaxoft
b69a0c914e Fixed a flipped condition in cBlockArea::Merge(). 2014-05-05 20:33:50 +02:00
Howaner
a138671e0e Fix SetRepairedItemName() in SlotArea.cpp 2014-05-05 17:36:22 +02:00
Howaner
f2617d0683 Add comments to CanTakeResultItem() 2014-05-05 17:34:44 +02:00
Howaner
c162d69e7b Add doxycomments to cSlotAreaAnvil functions. 2014-05-05 17:34:41 +02:00
Howaner
8a6119437d Changed HandleAnvilItemName() length to size_t in ClientHandle.h 2014-05-05 17:34:38 +02:00
Howaner
ecc62dbb9c Add anvil shift click. 2014-05-05 17:34:35 +02:00