1
0
Commit Graph

4619 Commits

Author SHA1 Message Date
Mattes D
79d6e7c4a4 Merge pull request #786 from mc-server/cBlockArea_Offset
Added WE Offset to cBlockArea
2014-03-12 07:54:10 +01:00
madmaxoft
15c70a1f68 APIDump: Updated WEOffset-related docs. 2014-03-12 07:53:25 +01:00
madmaxoft
950614da7e Renamed cBlockArea Offset to WEOffset.
Even in getters / setters.
2014-03-12 07:46:14 +01:00
madmaxoft
3e9f265a36 Merge branch 'master' into cBlockArea_Offset 2014-03-12 07:39:39 +01:00
STRWarrior
7d1e32a28b Fixed APIDump 2014-03-11 19:45:16 +01:00
STRWarrior
fa4ff28bc0 Documented the functions. 2014-03-11 19:38:56 +01:00
STRWarrior
e213e5f9fc Renamed m_Offset to m_WEOffset 2014-03-11 18:23:21 +01:00
STRWarrior
541175d8a0 Using ``const Vector3i &`` 2014-03-11 14:44:21 +01:00
Mattes D
b72661681c Merge pull request #791 from mc-server/PieceGenerator
Piece generator
2014-03-10 23:13:08 +01:00
Mattes D
b3d0e878b3 Merge pull request #767 from worktycho/envmatrix
Added support to control build type with env vars
2014-03-10 21:54:17 +01:00
Tycho
e4c7aac1cc Prepended Travis to env vars 2014-03-10 13:52:13 -07:00
madmaxoft
26d7ed6612 Removed debugging output.
Kept it commented-out for later revisions, if needed.
2014-03-10 21:16:13 +01:00
madmaxoft
4ed68916d8 Revert "Fixed some warnings"
This reverts commit 4cb0b82d1d.
2014-03-10 20:52:53 +01:00
Alexander Harkness
411c4ddd79 Merge pull request #779 from mc-server/tntburnexplode
TNT explodes when consumed by fire
2014-03-10 18:57:12 +00:00
Tiger Wang
b2733fad22 Fixed compile 2014-03-10 18:23:12 +00:00
Alexander Harkness
61b68bd519 Merge pull request #788 from worktycho/warnings
Fixed some warnings
2014-03-10 17:44:08 +00:00
STRWarrior
0cce0478d8 This allows a blockarea to have an Offset. 2014-03-10 17:07:46 +01:00
madmaxoft
6c48075561 POCPieces: Added height.
Now the pieces connect in different heights, too, creating a true 3D maze.
2014-03-10 08:38:40 +01:00
madmaxoft
0b9763fc5a Fixed MSVC2008 compilation. 2014-03-10 07:55:47 +01:00
Tiger Wang
0f412a0a02 Removed uneeded meta obtain 2014-03-09 21:48:18 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
1985a9c33e Merge pull request #731 from mc-server/ballisticmissiles
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
madmaxoft
0e985293b5 A working POCPiece generator. 2014-03-09 22:04:29 +01:00
madmaxoft
dacb6cef1d Hardened cCuboid with asserts for its assumptions. 2014-03-09 22:02:08 +01:00
madmaxoft
81bf846e64 ChunkDef: Replaced enums with static const ints.
This makes them easier to use in std::min et al.
2014-03-09 21:58:12 +01:00
worktycho
2eaae82a2a Mentiod that we use some c++11 exstensions
Eg override, abstract, va_copy, long long.
2014-03-09 18:57:43 +00:00
madmaxoft
8889d3b733 Added cCuboid::Engulf(). 2014-03-09 19:54:27 +01:00
madmaxoft
1fdeabcf78 cPieceGenerator: New connectors are added to the free pool. 2014-03-09 19:30:38 +01:00
Tiger Wang
3aff0b44bc Fixed #778 - stack overflow.com 2014-03-09 17:51:02 +00:00
madmaxoft
e214bd7666 Merge branch 'master' into PieceGenerator 2014-03-09 17:58:38 +01:00
madmaxoft
5c4c147e48 Silenced useless MSVC warnings in cMetaRotater. 2014-03-09 17:58:01 +01:00
madmaxoft
dd39a677c7 Merge branch 'master' into PieceGenerator 2014-03-09 17:50:05 +01:00
madmaxoft
b8cd0b0897 Hotfix for MSVC compilation. 2014-03-09 17:48:17 +01:00
Tiger Wang
77787fb719 != FACE_NONE 2014-03-09 14:55:47 +00:00
madmaxoft
b9190fc04e PieceGenerator can connect two connectors of the same type.
Also added extensive debugging output and a test.
2014-03-09 15:24:12 +01:00
madmaxoft
5be983e775 Added BlockFaceToString() translation function. 2014-03-09 15:24:11 +01:00
madmaxoft
93f0de521a Added Vector3i::Move(). 2014-03-09 15:24:11 +01:00
madmaxoft
e6305d29a5 Added the first skeleton code for PieceGenerator.
This is a WIP and won't work / isn't used at all.
2014-03-09 15:24:11 +01:00
Mattes D
d3c38c40e4 Merge pull request #777 from jfhumann/issue317
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
2014-03-09 15:13:27 +01:00
Mattes D
8a715db41f Merge pull request #775 from worktycho/warnings
Fixed a few warnings
2014-03-09 15:04:12 +01:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
76bf7ad813 Hexified colours 2014-03-09 12:49:00 +00:00
Tiger Wang
a2fb28dd08 Fixed data length issues 2014-03-09 12:48:59 +00:00
Tiger Wang
124fc8bc66 Demonstrated issues with GetDataLength() 2014-03-09 12:48:58 +00:00
Tiger Wang
d5180ef230 Added extra dye rules to crafting.txt 2014-03-09 12:48:56 +00:00
Tiger Wang
8f134adb6d Improved formatting of username tabcomplete 2014-03-09 12:48:55 +00:00
Tiger Wang
217aaca699 Moved firework handler to separate function
* Also simplified and improved readability of code
2014-03-09 12:48:53 +00:00
Tiger Wang
c05a1db88d CheckBlockInteractionsRate() fixed & enabled 2014-03-09 12:48:52 +00:00
Tiger Wang
e2cbebe522 Fix Linux compile 2014-03-09 12:48:49 +00:00
Tycho
4cb0b82d1d Fixed some warnings 2014-03-09 05:05:37 -07:00