1
0
Commit Graph

1292 Commits

Author SHA1 Message Date
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
e213e5f9fc Renamed m_Offset to m_WEOffset 2014-03-11 18:23:21 +01:00
Mattes D
b72661681c Merge pull request #791 from mc-server/PieceGenerator
Piece generator
2014-03-10 23:13:08 +01:00
Tycho
f5f7c6b38b Merge branch 'master' into Werror 2014-03-10 13:56:16 -07: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
98e15a34a4 Fixed xofts issues 2014-03-10 13:18:53 -07:00
madmaxoft
26d7ed6612 Removed debugging output.
Kept it commented-out for later revisions, if needed.
2014-03-10 21:16:13 +01:00
Tycho
e9e2852ce1 Fixed test asserts 2014-03-10 13:12:43 -07:00
madmaxoft
4ed68916d8 Revert "Fixed some warnings"
This reverts commit 4cb0b82d1d.
2014-03-10 20:52:53 +01:00
Tycho
bb28f0d1e3 Fixed assert 2014-03-10 12:36:01 -07:00
Tycho
d6050275fb Merge branch 'master' into Werror 2014-03-10 11:58:32 -07: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
Tycho
b78c729880 Fixed Alignment issue in ByteBuffer 2014-03-10 11:56:23 -07:00
Tycho
2eca30aebc Removed Some unnessicary macros 2014-03-10 11:34:20 -07:00
Tycho
8947f80294 Use string.reserve to avoid the need to do inplace byteswap 2014-03-10 11:24:12 -07:00
Tiger Wang
b2733fad22 Fixed compile 2014-03-10 18:23:12 +00:00
Tycho
cff6631513 Removed unused macro from WSSCompact 2014-03-10 11:14:34 -07:00
Tycho
8864e7d8ca Fixed alignment issues in Fireworks Serializer 2014-03-10 11:13:07 -07:00
Tycho
7c974b27b1 Removed unused macro 2014-03-10 10:49:03 -07:00
Tycho
e2e7f2184f Fixed cast to type with different alignment in BlockingTCPLink 2014-03-10 10:48:50 -07:00
Alexander Harkness
61b68bd519 Merge pull request #788 from worktycho/warnings
Fixed some warnings
2014-03-10 17:44:08 +00:00
Tycho
8665233522 Fixed cast between types of different alignment in cSocket 2014-03-10 10:32:51 -07:00
Tycho
30353cd228 Fixed MTRand warnings 2014-03-10 10:24:44 -07:00
Tycho
0a509ab85e Merge branch 'master' into Werror 2014-03-10 10:17:28 -07: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
madmaxoft
8889d3b733 Added cCuboid::Engulf(). 2014-03-09 19:54:27 +01:00
Tycho
1bf99b5fd2 Be more parinoid about int sizes 2014-03-09 11:47:22 -07:00
madmaxoft
1fdeabcf78 cPieceGenerator: New connectors are added to the free pool. 2014-03-09 19:30:38 +01:00
Tycho
9825dbfd34 Fixed Mesannine twister to use UInt32 2014-03-09 11:21:42 -07:00
Tycho
b5e33c5424 Merge branch 'master' into Werror 2014-03-09 11:02:30 -07:00
Tycho
e5fc3c63f2 Fix IsThread destructor 2014-03-09 10:52:12 -07:00
Tiger Wang
3aff0b44bc Fixed #778 - stack overflow.com 2014-03-09 17:51:02 +00:00
Tycho
676dcfd1c7 Globals.h is now warnings free again.
Also turned off Wpadded as it is indicates potental performance issues rather than potential bugs
2014-03-09 10:32:56 -07:00
Tycho
430aba9f1d Its a const not a macro 2014-03-09 10:10:36 -07:00
Tycho
02afa78b68 Take 5 2014-03-09 10:04:07 -07: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
Tycho
167ef3b7a1 Take 4 2014-03-09 09:52:49 -07: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
Tycho
ebf163b77a Unsigned types take 3 2014-03-09 09:45:59 -07:00
Tycho
e73caf30f0 Fix gcc error attempt 2 2014-03-09 09:33:40 -07:00
Tycho
f4201e0b82 Fixed gcc error 2014-03-09 09:25:16 -07: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
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
Tycho
14c2f620d1 FIxed int in test 2014-03-09 04:43:22 -07:00
Jan-Fabian Humann
f74ee8fb51 Adjusted style of switch/case 2014-03-09 10:55:06 +01:00
Tiger Wang
ff186f9735 TNT explodes when consumed by fire
Fixed FS#406
2014-03-09 01:23:55 +00:00
Tiger Wang
8d2ebf8e19 Slight plugin messaging changes
- Clients are not allowed to register duplicate channels
- Clients are not allowed to use channels that were not registered
2014-03-09 00:36:02 +00:00
Tycho
6b530bde75 Added static 2014-03-08 11:53:37 -08:00
Tycho
a6ed75c1fb Added tons more asserts to bytebuffer 2014-03-08 11:18:51 -08:00
Tycho
27fa2b72ba Enabled self test of bytebuffer 2014-03-08 11:05:37 -08:00
Jan-Fabian Humann
72f9c8b069 Changed if-else to switch-case 2014-03-08 19:26:32 +01:00
Mattes D
3a6499b192 Merge pull request #729 from worktycho/MetaRotate
Alternitive solution to #503
2014-03-08 18:27:24 +01:00
Jan-Fabian Humann
66970fe943 Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. 2014-03-08 17:55:53 +01:00
Tycho
307fad0f25 Fixed issues with int vs size_t and a few other warnings 2014-03-08 08:33:38 -08:00
Tycho
9b47366d03 Actually Fixed ByteBuffer 2014-03-08 07:36:52 -08:00
Tycho
c3758112cc Merge branch 'master' into warnings 2014-03-08 07:13:45 -08:00
worktycho
16ebbca35b Moved returns 2014-03-08 14:23:00 +00:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
andrew
6679641b9e cBlockInfo-related changes from #723 2014-03-08 12:53:15 +02:00
Howaner
f5e374be41 Add TNT Save/Load and add Netbeans projects to .gitignore 2014-03-08 10:25:46 +01:00
Mattes D
ae84cdf242 Merge pull request #764 from xdot/master
Fixed water/lava interaction
2014-03-07 21:33:22 +01:00
madmaxoft
ffdf5f2022 Fixed cBlockArea schematic string saving signature. 2014-03-07 21:28:52 +01:00
worktycho
6b153a5014 Move env code part 1 2014-03-07 19:59:49 +00:00
Tycho
72697cfb4f Added support to overide CMake build type with env vars 2014-03-07 11:23:28 -08:00
Tycho
21e85b0745 Warnings 2014-03-07 11:15:04 -08:00
Tycho
d33d72f0dc Warnings 2014-03-07 11:04:25 -08:00
andrew
d86fc1af06 Added some comments 2014-03-07 20:49:40 +02:00
Tycho
7f389522ef Fixed warnings 2014-03-07 10:42:13 -08:00
Tycho
b480148116 Fixed warnings 2014-03-07 10:26:07 -08:00
Mattes D
f72c747b50 Merge pull request #763 from Howaner/BlockEntitys
Add Flower Pots
2014-03-07 17:54:10 +01:00
madmaxoft
fd4eda7d24 Fixed a typo. 2014-03-07 17:43:19 +01:00
Mattes D
c1977035cf Merge pull request #760 from Howaner/GlobalFixes
Add data backsending, when the Client interacts a Block and the Interact...
2014-03-07 14:45:45 +01:00
andrew
8808523942 Fixed water/lava interaction 2014-03-07 15:42:03 +02:00
Howaner
c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00