1
0
Commit Graph

1270 Commits

Author SHA1 Message Date
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
d904e89712 Merge branch 'Werror' into warnings
Conflicts:
	src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
a584b7b3bc Fixed printf format compatabilty 2014-03-12 10:09:08 -07:00
Tycho
3caa4a38b9 Merge branch 'master' into Werror
Conflicts:
	src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
Tycho
ef58b0eb54 Fixed comments an assert 2014-03-12 09:49:37 -07:00
madmaxoft
d545be9614 Fixed missing comment terminator. 2014-03-12 15:33:28 +01:00
madmaxoft
ec23e2591e Merge remote-tracking branch 'xdot/master' 2014-03-12 15:20:33 +01:00
andrew
6f2bb0ad44 M_PI MSVC Fix 2014-03-12 16:13:03 +02:00
madmaxoft
f2df33f746 Merge remote-tracking branch 'xdot/master' 2014-03-12 14:42:04 +01:00
andrew
a3a94436dc Vector3: Length() should always return a float 2014-03-12 15:13:19 +02:00
madmaxoft
5d7df54e35 Fixed Lua string return values.
Fixes #773.
2014-03-12 14:11:28 +01:00
madmaxoft
0c15fdf7b0 Moved Lua API registering into a separate function.
This will allow us to use Lua as lite-config files as well, should we want to.
2014-03-12 13:05:28 +01:00
madmaxoft
392fb7923b Merge remote-tracking branch 'origin/SnowBall' 2014-03-12 08:41:33 +01:00
Tycho
7e6ee7ef81 Fixed more Format issues 2014-03-11 14:43:14 -07:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
Tycho
a19f5fc484 Move Format issues 2014-03-11 13:51:56 -07:00
Tycho
f64f879027 Fixed format errors in protocol 2014-03-11 13:46:32 -07:00
Tycho
53faac10c5 Added macros to follow format string checking through wrappers 2014-03-11 13:41:15 -07:00
andrew
abf4effaaf Matrix4: Removed enum 2014-03-11 21:58:50 +02:00
Tycho
80cc824c0c Fixed Chunkdef warnings 2014-03-11 12:41:18 -07:00
Tycho
728870ed9d Fixed Warnings in PieceGenerator 2014-03-11 12:35:44 -07:00
Tycho
80d7c88e00 Merge branch 'master' into Werror
Conflicts:
	src/ChunkDef.h
2014-03-11 12:33:26 -07:00
andrew
9810d57a39 Unified Matrix4 code 2014-03-11 18:33:31 +02:00
andrew
d64db443c2 LineCoeff Doc 2014-03-11 18:10:15 +02:00
STRWarrior
ef3c5a97a4 TakeDamage now has the cThrownSnowballEntity instead of the creator's object. 2014-03-11 16:24:05 +01:00
STRWarrior
deafec874d Snowballs now actualy hurt other entities.
3 damage for blazes and 1 for the ender dragon. Otherwise 0
2014-03-11 15:14:47 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
STRWarrior
541175d8a0 Using ``const Vector3i &`` 2014-03-11 14:44:21 +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
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