1
0
Commit Graph

5004 Commits

Author SHA1 Message Date
madmaxoft
8126d9e66e Console logging supports cCompositeChat as its parameters. 2014-03-31 22:51:14 +02:00
Tiger Wang
fc940b6da4 Realised suggestions 2014-03-31 21:36:19 +01:00
Tiger Wang
ee07b7ae3e Simplified and fixed slabs, fixes #835 2014-03-31 20:34:11 +01:00
Tiger Wang
0836fe9a84 Fixed a few Y too high/low asserts 2014-03-31 20:33:33 +01: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
STRWarrior
ec4638a228 Added HOOK_PROJECTILE_HIT_BLOCK. 2014-03-29 16:00:45 +01:00
STRWarrior
a6ef40cb6e Fixed error when the hook gets called. 2014-03-29 15:43:03 +01:00
STRWarrior
339d555111 Added HOOK_PROJECTILE_HIT_ENTITY 2014-03-29 15:26:41 +01:00
narroo
4492bd58f1 Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler. 2014-03-29 10:00:44 -04:00
Tiger Wang
515e4bdb13 Compare for inequality in FACE_NONE checks 2014-03-29 13:18:26 +00:00
Howaner
736c7950a2 Add "a_RelY < cChunkDef::Height" to BlockBigFlower 2014-03-29 13:11:49 +01:00
STRWarrior
0f6688fe9e Updated the android files 2014-03-29 12:24:26 +01:00
Tiger Wang
aefabfcafa Removed leftover clienthandle code 2014-03-29 10:25:40 +00:00
Tiger Wang
fb16554322 Fixed players not updating after world change
Addendum to 6dea7993f2
2014-03-29 01:21:56 +00:00
Tiger Wang
519bd0b989 Curly brackets 2014-03-28 23:51:52 +00:00
Tiger Wang
6dea7993f2 Fixed #721 and FS439 2014-03-28 23:25:11 +00:00
Tiger Wang
6eacf1aa92 Fixed a minor ini key duplication bug 2014-03-28 23:07:50 +00:00
Tiger Wang
79aa082b04 Fixed infinite minecart items 2014-03-28 22:52:23 +00:00
Tiger Wang
aee1f8f9d1 Fixed block interaction rate check 2014-03-28 22:52:04 +00:00
Tiger Wang
8ece214920 Fixed a potential crash 2014-03-28 22:51:39 +00:00
Tiger Wang
283a66bcae Some fixes to lilypads
* Fixed placement on lava
* Fixed placement on side of blocks
* Fixed placement through blocks
+ Added washing-away of pads
+ Added ice as a block that fully occupies its voxel
2014-03-28 22:51:30 +00:00
madmaxoft
76f0d167b1 NetherFortGen: Added several more prefabs.
Also extended the defauls MaxDepth value to 12.
2014-03-28 23:39:40 +01:00
Howaner
a78bacac3c Add tallgrass drop to big flowers.
Add tallgrass drop, when a players break a tallgrass with the shear.
2014-03-28 23:14:58 +01:00
Howaner
f2f6096ee5 door -> flower 2014-03-28 22:24:54 +01:00