1
0
Commit Graph

4706 Commits

Author SHA1 Message Date
Tycho
0ad835d1cf Merge branch 'master' into globals
Conflicts:
	SetFlags.cmake
2014-03-14 07:45:24 -07:00
Mattes D
adf5a60746 Merge pull request #805 from worktycho/undef
Fixed a couple of missing defs
2014-03-14 15:37:01 +01:00
worktycho
b8cffe569f Merge pull request #798 from worktycho/warnings
Fixed Format string warnings
2014-03-14 14:34:29 +00:00
Tycho
cd7ef264be Disable global constructors and exit-time destructors warnings 2014-03-14 07:16:55 -07:00
Tycho
8b83c1a653 Merge branch 'master' into warnings 2014-03-14 06:46:20 -07:00
Tycho
22cdbe99b4 Fixed a couple of missing defs 2014-03-14 06:44:04 -07:00
madmaxoft
9b63156447 cPlugin:BindConsoleCommand can be called statically.
This has been documented before it was written.
2014-03-14 14:37:39 +01:00
madmaxoft
35fe96b07d Fixed a warning. 2014-03-14 14:36:44 +01:00
Tycho
cd6ab5617c Fixed xofts issues 2014-03-14 06:11:49 -07:00
Tycho
692cf5bb70 Merge branch 'master' into warnings 2014-03-14 06:01:45 -07:00
Mattes D
1259844084 Merge pull request #793 from xdot/master
Unified Vector classes
2014-03-14 11:52:15 +01:00
madmaxoft
bba090ebdd cPluginManager:Bind[Console]Command returns true on success.
Fixes #801.
2014-03-14 11:18:14 +01:00
Tycho
9a28d1bbe1 Fixed comma 2014-03-12 11:56:24 -07:00
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
andrew
4a883be428 Vector3: More casts 2014-03-12 16:30:57 +02: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
3d15319e3c Added macros support to tools 2014-03-11 15:55:37 -07:00
Tycho
9c6ca5a3ed made format-nonliteral an error 2014-03-11 14:43:56 -07: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
bb4b35e438 Rollback submodule change 2014-03-11 12:54:46 -07:00
Tycho
80cc824c0c Fixed Chunkdef warnings 2014-03-11 12:41:18 -07:00
Tycho
0fc4a1ee06 Move comment 2014-03-11 12:36:51 -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
04dcd850d6 APIDump: Removed old documentation, documented some new functions. 2014-03-11 08:31:27 +01:00
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