1
0
Commit Graph

153 Commits

Author SHA1 Message Date
madmaxoft
efcae77828 Added second kind of desert village (FlatRoof). 2014-05-21 23:16:43 +02:00
madmaxoft
e69a11012f Merged branch 'master' into VillageGen. 2014-05-18 23:10:23 +02:00
madmaxoft
ec50c0f9e1 Updated SandVillage prefabs to latest Gallery content.
This fixes sand village generation.
2014-05-18 23:09:39 +02:00
madmaxoft
a7e52e51dc Village roads are drawn properly. 2014-05-17 22:26:09 +02:00
madmaxoft
7004043c61 Village houses are height-adjusted onto the terrain. 2014-05-17 21:54:04 +02:00
madmaxoft
fc5c3abcba Updated PlainsVillage prefabs to the latest Gallery contents. 2014-05-17 02:26:44 +02:00
madmaxoft
70b0547499 Fixed a NULL ptr failure in GridStructGen.
When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead.
2014-05-15 16:03:45 +02:00
madmaxoft
56f7ad2cd9 Changed village generator defaults to more reasonable values. 2014-05-15 10:44:08 +02:00
madmaxoft
34e5f0c164 Changed village road generation to use multiple prefabs. 2014-05-15 10:43:54 +02:00
madmaxoft
f5fdbdaf29 VillageGen rewritten using BFSPieceGenerator.
Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
2014-05-15 00:14:06 +02:00
madmaxoft
3660ce6834 cPrefab can be constructed in code. 2014-05-15 00:12:01 +02:00
madmaxoft
9c8e8ef7ae VillageGen: Added well placement and the general algorithm description. 2014-05-12 22:43:59 +02:00
archshift
3a5e04d118 More switch warnings. 2014-05-11 16:54:42 -07:00
archshift
3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07:00
madmaxoft
c0727c4265 Initial VillageGen implementation.
WIP, doesn't generate anything yet.
Ref.: 740.
2014-05-11 22:35:41 +02:00
Mattes D
a936736acd Removed unused constants from MineShafts and Ravines. 2014-05-09 20:13:20 +02:00
Mattes D
0fc60edaeb Removed an unused NetherFortGen variable. 2014-05-09 19:53:57 +02:00
Mattes D
b997fbaf45 Removed an unused macro. 2014-05-09 19:35:35 +02:00
Mattes D
ea593dcaad Ravines rewritten using cGridStructGen.
Ref.: #987.
2014-05-09 18:30:39 +02:00
Mattes D
95ead1128f cWormNestCaves rewritten using cGridStructGen.
Ref.: #987.
2014-05-09 11:16:13 +02:00
Mattes D
14543aa3fc Mineshafts generator rewritten to use GridStructGen. 2014-05-09 10:59:33 +02:00
Mattes D
ee680990ba Fixed cGridStructGen.
Now cNetherFortGen works with the new architecture.
2014-05-08 21:10:55 +02:00
Mattes D
ccf44f18d1 Merge branch 'master' into GridStructGen 2014-05-08 20:17:31 +02:00
Mattes D
c4ea25e136 Fixed MSVC 64-bit build warnings. 2014-05-08 20:16:35 +02:00
madmaxoft
564261cfd9 cNetherFortGen uses cGridStructGen.
WIP, this doesn't work properly yet.
2014-05-07 22:34:06 +02:00
madmaxoft
da5db2ddf9 Initial cPrefabPiecePool refactoring.
Ref.: #986.
2014-05-07 11:01:30 +02:00
madmaxoft
8f262d8a9d Initial cGridStructGen refactoring.
Ref.: #987.
2014-05-06 16:41:55 +02:00
madmaxoft
9542b0b875 Changed cPieceGenerator to support pairings.
Fixes #982.
2014-05-05 23:05:30 +02:00
madmaxoft
e4af9a21af Prefabs can specify that they don't want flooring.
Previously the flag was ignored.
2014-05-05 22:28:54 +02:00
Tycho
25d933883a Removed unneeded assert
Fixed CID 43610
2014-04-27 13:07:21 -07:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
madmaxoft
6d7da6b15d Updated NetherFort prefabs to latest Gallery content. 2014-04-23 23:03:09 +02:00
madmaxoft
2533842ca4 Updated NetherFort prefabs from the Gallery server. 2014-04-22 22:26:01 +02:00
Mattes D
6492aa000b Merge pull request #909 from jfhumann/fixes
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
2014-04-22 13:34:32 +02:00
madmaxoft
e3ec857264 Added prefab hitboxes.
The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish.
2014-04-21 10:31:30 +02:00
jfhumann
fde1555352 Small style changes 2014-04-18 22:20:24 +02:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
madmaxoft
6d3bde5221 Added performance test of the nether fort generator. 2014-04-18 14:35:33 +02:00
madmaxoft
6779010242 Added area flooring.
Fixes #743.
2014-04-17 22:03:30 +02:00
madmaxoft
afb20132fe Added Prefab initializers to SELFTEST code. 2014-04-17 17:50:52 +02:00
madmaxoft
be091800f8 Prefabs can have per-piece per-placement weights.
Fixes #753.
Also upgraded NetherFortPrefabs to lates Gallery contents.
2014-04-17 17:32:08 +02:00
madmaxoft
b5ea5fbf90 Added support for per-piece per-placement weights in cPieceGenerator.
Ref.: #753.
2014-04-15 12:57:52 +02:00
madmaxoft
146824cb68 NetherFortPrefabs: Fixed a connector in MidStaircase. 2014-04-15 12:57:52 +02:00
madmaxoft
83b25d085c Updated the NetherFort prefabs to current Gallery contents.
Code exported from the Gallery server by the GalExport plugin.
2014-04-12 19:36:50 +02: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
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