madmaxoft
2672b14c03
More cFile warning fixes.
2014-04-01 16:00:20 +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
7aa6a3b866
LOG() API reads the LogLevel from the cCompositeChat's MessageType.
2014-04-01 09:32:14 +02:00
Tiger Wang
ef48b30baa
Final realisation of suggestions
2014-03-31 22:37:05 +01:00
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
c4e07631c8
Added new merge strategy "msDifference"
2014-03-31 19:47:18 +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
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
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
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
Howaner
efc89b2c43
Add tall flower handler.
2014-03-28 22:22:29 +01:00
madmaxoft
0f1087b7d5
Added Prefabs to *nix builds.
2014-03-28 22:04:59 +01:00
madmaxoft
18dad36189
Merge branch 'master' into NetherFortGen
2014-03-28 21:37:31 +01:00
madmaxoft
773ce7fde6
Fixed non-virtual destructors warnings.
2014-03-28 21:35:45 +01:00
madmaxoft
8557549cfa
Implemented the msSpongePrint merge strategy.
...
Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
2014-03-28 18:03:37 +01:00
madmaxoft
113343d336
NetherFort: Added BalconyTee2 prefab.
2014-03-28 17:35:05 +01:00
madmaxoft
3c84a995a9
Fixed a memory leak in NetherFortGen.
2014-03-28 17:09:47 +01:00
madmaxoft
ae0954f1d4
Sponged the netherfort balcony prefab.
...
This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks.
2014-03-28 17:05:43 +01:00
madmaxoft
d032f7ac1a
Merge branch 'master' into NetherFortGen
2014-03-28 16:46:10 +01:00
madmaxoft
1802234b4a
Fixed compilation after last PR merge.
2014-03-28 16:44:12 +01:00
madmaxoft
5b7215ec24
Initial NetherFortGen import.
...
Simple fortresses of 2 different rooms will generate.
2014-03-28 16:42:32 +01:00
madmaxoft
173fd0dd92
Merge branch 'howaner/GlobalFixes'.
2014-03-28 16:39:32 +01:00
madmaxoft
910e770a18
Fixed Prefab's rotations.
2014-03-28 16:36:33 +01:00
Howaner
a2c4def518
Add missing ChunkDesc import.
2014-03-28 14:59:40 +01:00
Howaner
8301f479bb
Fix merge conflicts
2014-03-27 23:21:04 +01:00
Howaner
9c46112486
Change SpreadSource prefix to ss
2014-03-27 23:20:28 +01:00
Howaner
09794e65bb
Wrong if in BlockLeaves
2014-03-27 23:20:28 +01:00
Howaner
3774b1be64
Add SpreadSource
2014-03-27 23:20:28 +01:00
Howaner
c4a8336e84
Add HOOK_BLOCK_SPREAD
2014-03-27 23:20:28 +01:00
Howaner
7089c5e267
Add new leaves to all classes.
2014-03-27 23:20:28 +01:00
madmaxoft
7b585290fc
cPrefab can draw itself into a cChunkDesc.
2014-03-27 23:03:57 +01:00
madmaxoft
bbebb3a2cd
Fixed chunk neighbor-getting for long distances.
...
This fixes a server hang when teleporting to coords too far away.
2014-03-27 18:13:52 +01:00
madmaxoft
8c2c4f2463
Prefabs support connectors, rotations and merge strategy.
2014-03-26 22:01:01 +01:00
narroo
6553c8ff44
Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet.
2014-03-26 13:25:10 -04:00
narroo
90415ff798
Fixed Minor typos.
2014-03-26 08:54:17 -04:00
madmaxoft
9032ff96c7
Removed unused constants.
...
DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
2014-03-25 23:35:50 +01:00
narroo
d5c7fc6bd6
Added a comment about the behavior of doors under mirros. Simply put, the current implementation of MetaMirror causes glitchy behavior. The door class itself needs to be edited. (I've got an idea on that....)
2014-03-25 17:35:48 -04:00
narroo
3df4f8609d
Fixed spelling; Rotater to Rotator.
2014-03-25 17:26:13 -04:00
narroo
e1285eb84f
Changed Rotater to Rotator. Added partial sign post rotation support.
2014-03-25 17:17:05 -04:00
madmaxoft
37778e5f82
Added a basic cPrefab class.
...
Can be defined in the source by GalExport's cpp output.
2014-03-25 22:10:53 +01:00
madmaxoft
87de596078
BlockArea: Create() can take the size as Vector3i, too.
2014-03-25 22:05:45 +01:00
madmaxoft
87e0bd54b4
BlockArea: Switched internal coords to Vector3i.
2014-03-25 21:59:41 +01:00
madmaxoft
0984cf9deb
Added Vector3::Move(const Vector3 &).
2014-03-25 21:59:41 +01:00
Mattes D
cac5149974
Merge pull request #833 from mc-server/EnderCrystal
...
Ender crystals
2014-03-25 21:02:23 +01:00
andrew
2e28c09770
Ender crystals
2014-03-25 20:59:33 +02:00
Samuel Barney
eb3cc729d4
More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.
...
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
2014-03-25 11:15:05 -06:00
Samuel Barney
71e9133e49
Added one more missing newline.
2014-03-25 10:34:31 -06:00
Samuel Barney
d77a6417f6
Added newlines. Without them, the files would not compile.
2014-03-25 10:33:52 -06:00
andrew
c8445cd934
Fixed clang compilation
2014-03-25 11:40:54 +02:00
andrew
ba42166411
Fixed wither summoning
2014-03-25 11:13:27 +02:00
andrew
0fe1e50ffc
Protocol: Wither metadata
2014-03-25 10:32:58 +02:00
Mattes D
c6186acf58
Merge pull request #828 from mc-server/Wither
...
Wither invulnerability
2014-03-25 08:54:13 +01:00
andrew
4f3377bbbf
Minor fixes
2014-03-25 09:10:55 +02:00
Mattes D
9226b8480e
Merge pull request #829 from Howaner/Cake
...
Add log pickups.
2014-03-24 22:13:25 +01:00
Howaner
a6414d3348
Add log pickups.
2014-03-24 19:52:35 +01:00
andrew
6b77dc74ad
Wither invulnerability
2014-03-24 12:29:19 +02:00
narroo
2343b0dfbe
Added MetaRotate/Mirror Support for a number of classes.
2014-03-23 22:11:01 -04:00
Tiger Wang
f622f4317c
Implemented lilypad placement
2014-03-23 22:32:45 +00:00
madmaxoft
fd8e5bf551
Updated the ToLua windows executable.
2014-03-23 20:54:37 +01:00
Tycho
5653997bcc
Added override specifier to functions declared in cWorld
2014-03-22 08:43:54 -07:00
madmaxoft
c9163d39f7
Implemented faster upscaling using templates.
...
Fixes #819 .
2014-03-21 22:53:46 +01:00
madmaxoft
20fc7d6aea
Updated the tolua++ executable for Win builds.
2014-03-20 22:41:12 +01:00