1
0
Commit Graph

4917 Commits

Author SHA1 Message Date
madmaxoft
26c3bc4076 Fixed more virtual destructors for interfaces. 2014-04-02 16:40:27 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes'
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
2014-04-02 06:54:57 -07:00
Tycho
dcaea749ae Merge branch 'master' into globals 2014-04-02 06:05:55 -07:00
Mattes D
01c38505fd Merge pull request #831 from mc-server/Wither
Wither
2014-04-02 12:00:26 +02:00
madmaxoft
67d7ad8689 Debuggers: Added a Base64 API roundtrip test. 2014-04-02 11:58:19 +02:00
madmaxoft
bcd7f9669b Added schematic string serializer self-test. 2014-04-02 11:56:27 +02:00
madmaxoft
3301c5be1f Fixed StringCompression's GZIP handling for larger strings. 2014-04-02 11:56:10 +02:00
madmaxoft
bcf5021feb Exported the Base64 encoding and decoding functions to Lua API. 2014-04-01 22:47:39 +02:00
madmaxoft
e7e65b5005 Merged branch 'msDifference'. 2014-04-01 21:21:11 +02:00
STRWarrior
21e0607e49 APIDump: Gave msDifference it's own table. 2014-04-01 21:12:48 +02:00
madmaxoft
1229795ff0 cBlockArea: Added the msMask merge strategy. 2014-04-01 20:50:10 +02:00
madmaxoft
0d916a3e2f Removed the exit-time-destructors flag from clang.
We don't care about exit-time destructors, at least for now.
2014-04-01 16:10:08 +02:00
madmaxoft
2672b14c03 More cFile warning fixes. 2014-04-01 16:00:20 +02:00
madmaxoft
fd062f611e Merge branch 'RemoveClangFlags' 2014-04-01 15:01:14 +02:00
madmaxoft
b9a090d835 Fixed clang warnings in cGZipFile. 2014-04-01 15:00:30 +02:00
madmaxoft
42e30b6513 Fixed clang warnings in BlockHandlers. 2014-04-01 14:58:17 +02:00
madmaxoft
45150e9754 Fixed clang warnings in cFile.
We only support 32-bit filesizes (files < 2 GiB).
2014-04-01 14:58:05 +02:00
madmaxoft
aa7552309a Simplified the anvil placement code. 2014-04-01 14:23:11 +02:00
madmaxoft
7cc322332b Removed an unneeded code branch. 2014-04-01 13:38:40 +02:00
madmaxoft
e610262fb1 Attempt at disabling the useless clang warnings.
Ref.: #846, #847
2014-04-01 09:44:11 +02:00
madmaxoft
7aa6a3b866 LOG() API reads the LogLevel from the cCompositeChat's MessageType. 2014-04-01 09:32:14 +02:00
madmaxoft
58f2550321 APIDump: Documented the cCompositeChat support in logging functions. 2014-03-31 23:05:31 +02:00
madmaxoft
8126d9e66e Console logging supports cCompositeChat as its parameters. 2014-03-31 22:51:14 +02:00
STRWarrior
b19022fc7e Added extra table which should make it more clear what msDifference does. 2014-03-31 20:13:08 +02:00
STRWarrior
a8bc27f872 Fixed typo 2014-03-31 20:05:48 +02:00
STRWarrior
f7df8e133b Documented msDifference 2014-03-31 19:58:19 +02:00
STRWarrior
c4e07631c8 Added new merge strategy "msDifference" 2014-03-31 19:47:18 +02:00
madmaxoft
55d0db1606 APIDump: Added code completion support file to ZBS tutorial. 2014-03-31 18:34:27 +02:00
madmaxoft
f38a009b3c APIDump: Renamed the ZBS API dump file to mcserver_api.lua.
This is to avoid confusion with ZBS, where two "mcserver.lua" files were present.
2014-03-31 18:25:00 +02:00
madmaxoft
43844fc0f0 cCompositeChat has a MessageType param in the constructor.
This should make it easier to use.
2014-03-31 13:28:38 +02:00
madmaxoft
8288e53c0b Fixed a few Clang warnings in BlockHandlers. 2014-03-30 23:13:13 +02:00
madmaxoft
a5c0600e6c Fixed a few clang warnings. 2014-03-30 20:02:30 +02:00
madmaxoft
1bda9b0424 Merge branch 'NetherFortGen'. 2014-03-30 19:17:33 +02:00
madmaxoft
b64a1daf6c APIDump: Added article: Setting up ZeroBrane Studio.
Fixes #824.
2014-03-30 18:48:11 +02:00
Alexander Harkness
dc1d620c90 Merge pull request #845 from mc-server/License
License
2014-03-30 17:34:33 +01:00
andrew
451a3e97c3 Apache license 2014-03-30 19:25:17 +03:00
Mattes D
e474f40ac9 Merge pull request #834 from narroo/issue503
Issue503 pull Request
2014-03-30 16:58:42 +02:00
worktycho
5260146f3c Merge pull request #838 from mc-server/lilypads
Lilypads
2014-03-30 15:17:35 +01:00
Tiger Wang
a87bd5788f Another curly 2014-03-30 13:07:28 +01:00
madmaxoft
ceabb372f0 Added all current NetherFort prefabs. 2014-03-30 00:33:59 +01:00
madmaxoft
3eb531a8c8 Added asserts for critical data in cPrefab. 2014-03-30 00:20:28 +01:00
madmaxoft
6b29edc158 Re-fixed nether fort piece count check. 2014-03-30 00:20:06 +01:00
madmaxoft
475fc4b1ab Fixed chest rotator. 2014-03-30 00:12:54 +01:00
madmaxoft
597bdd9f80 NetherForts have a minimum number of pieces.
The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces.
2014-03-30 00:12:19 +01:00
madmaxoft
47a427d3dc Merge branch 'master' into NetherFortGen 2014-03-29 23:05:17 +01:00
madmaxoft
d64d9145d1 cPrefab now uses a struct for block type definition in CharMap.
As suggested by worktycho in 7b585290fc, instead of packing the two values into a single int, they're packed into a struct.
Also added a test code for the prefab parsing in SELF_TEST.
2014-03-29 22:56:48 +01:00
Mattes D
37812813d3 Merge pull request #842 from mc-server/ProjectileHooks
Projectile hooks
2014-03-29 22:32:50 +01:00
madmaxoft
782c111b81 Renamed lua dll for tolua++.exe.
Fixes #843.
2014-03-29 22:29:34 +01:00
STRWarrior
98a12127ce Fixed the OnProjectileHitBlock hook not stopping projectiles. 2014-03-29 17:05:24 +01:00
STRWarrior
379d403443 Documented both hooks. 2014-03-29 16:08:39 +01:00