1
0
Commit Graph

4832 Commits

Author SHA1 Message Date
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
madmaxoft
7cc44d4d8b Debuggers: Deactivated the chunk generator callback. 2014-03-28 13:34:32 +01:00
Howaner
8301f479bb Fix merge conflicts 2014-03-27 23:21:04 +01:00
Howaner
327b70e769 Change documentation text 2014-03-27 23:20:28 +01:00
Howaner
9ac3e3405a Change SpreadSource documentation 2014-03-27 23:20:28 +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
54d55b31ef Add documentation for new Block spread 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
madmaxoft
1b00b62a4b Ignoring the default GalExports folder. 2014-03-25 23:49:58 +01: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
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
madmaxoft
f67ad36965 InfoReg updated for multi-verb console commands. 2014-03-25 21:59:40 +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
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
Tiger Wang
83d0c6d6a7 Fixed bad cmake document interpretation
Docs say:

"If nothing is found, the result will be <VAR>-NOTFOUND"
2014-03-23 20:37:23 +00:00
madmaxoft
fd8e5bf551 Updated the ToLua windows executable. 2014-03-23 20:54:37 +01:00
Mattes D
b3a22acb2c Merge pull request #826 from worktycho/xxd_check
Added better check for xxd existance
2014-03-23 20:21:12 +01:00
Tycho
0cfb12f0d1 Added Additonal check for xxd existance 2014-03-22 08:30:49 -07:00
Mattes D
4497f1166b Merge pull request #810 from worktycho/size_t_lua
gave tolua awareness of size_t
2014-03-22 16:28:49 +01:00
Tycho
2266c2150d Merge branch 'master' into size_t_lua
Conflicts:
	lib/tolua++/src/bin/basic_lua.h
2014-03-22 07:48:16 -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
madmaxoft
62f84d968a Merge branch 'unreachable' 2014-03-20 22:36:24 +01:00
Tycho
a69a1ef032 Fixed enum checking functions not being called in generated code 2014-03-20 13:23:15 -07:00
madmaxoft
b370cacf0c Plugins can set flying speed. 2014-03-20 16:14:40 +01:00
madmaxoft
9fae50f447 APIDump: Fixed wrong escaped strings. 2014-03-20 16:05:22 +01:00
madmaxoft
64d9390069 Rewritten player speeds to be relative unit-less.
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +01:00