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
|
e4c7aac1cc
|
Prepended Travis to env vars
|
2014-03-10 13:52:13 -07:00 |
|
Tycho
|
ce5b02c312
|
Merge branch 'master' into Werror
Conflicts:
src/ChunkDef.h
|
2014-03-10 13:31:21 -07: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
|
bc556e7f00
|
Fixed Issues in ProtoProxy
|
2014-03-10 12:21:18 -07:00 |
|
Tiger Wang
|
e672988577
|
Merge remote-tracking branch 'origin/master' into awesometnt
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
|
2014-03-10 18:59:11 +00: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
|
693734bd83
|
Enable error on cast-align and unused macros
|
2014-03-10 11:57:04 -07:00 |
|
Tycho
|
b78c729880
|
Fixed Alignment issue in ByteBuffer
|
2014-03-10 11:56:23 -07:00 |
|
Tiger Wang
|
cc2d805238
|
Merge branch 'master' into awesometnt
|
2014-03-10 18:36:55 +00:00 |
|
Tiger Wang
|
462829e23d
|
Shrapnel now configurable
|
2014-03-10 18:35:02 +00: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 |
|
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 |
|
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
|
617ad0b5f8
|
Only enable -Werror in gcc because gcc doesn't let you suppress enum missmatch warnings
|
2014-03-09 10:46:39 -07:00 |
|
Tycho
|
713c59b60b
|
Treat enum missmatches as warnings for now as there is such a large number of them.
|
2014-03-09 10:41:53 -07: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 |
|