flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,369 Commits 1 Branch 0 Tags 92 MiB
d1b719885d
Commit Graph

126 Commits

Author SHA1 Message Date
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
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
madmaxoft
76f0d167b1 NetherFortGen: Added several more prefabs. 
Also extended the defauls MaxDepth value to 12.
 2014-03-28 23:39:40 +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
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
7b585290fc cPrefab can draw itself into a cChunkDesc. 2014-03-27 23:03:57 +01:00
madmaxoft
8c2c4f2463 Prefabs support connectors, rotations and merge strategy. 2014-03-26 22:01:01 +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
87e0bd54b4 BlockArea: Switched internal coords to Vector3i. 2014-03-25 21:59:41 +01:00
madmaxoft
c9163d39f7 Implemented faster upscaling using templates. 
Fixes #819.
 2014-03-21 22:53:46 +01:00
Tycho
cd6ab5617c Fixed xofts issues 2014-03-14 06:11:49 -07:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
d904e89712 Merge branch 'Werror' into warnings 
Conflicts:
	src/Globals.h
 2014-03-12 10:12:13 -07:00
Tycho
a584b7b3bc Fixed printf format compatabilty 2014-03-12 10:09:08 -07:00
Tycho
3caa4a38b9 Merge branch 'master' into Werror 
Conflicts:
	src/Generating/PieceGenerator.cpp
 2014-03-12 09:59:10 -07:00
madmaxoft
d545be9614 Fixed missing comment terminator. 2014-03-12 15:33:28 +01:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
Tycho
728870ed9d Fixed Warnings in PieceGenerator 2014-03-11 12:35:44 -07:00
madmaxoft
26d7ed6612 Removed debugging output. 
Kept it commented-out for later revisions, if needed.
 2014-03-10 21:16:13 +01:00
madmaxoft
6c48075561 POCPieces: Added height. 
Now the pieces connect in different heights, too, creating a true 3D maze.
 2014-03-10 08:38:40 +01:00
madmaxoft
0e985293b5 A working POCPiece generator. 2014-03-09 22:04:29 +01:00
madmaxoft
1fdeabcf78 cPieceGenerator: New connectors are added to the free pool. 2014-03-09 19:30:38 +01:00