flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,221 Commits 1 Branch 0 Tags 92 MiB
2fb3eb3532
Commit Graph

320 Commits

Author SHA1 Message Date
Mattes D
4293db5eae Merge pull request #1214 from mc-server/anti-glob 
CMake - Explicitly lists all source files
 2014-07-19 14:29:22 +02:00
archshift
f86eefa2ae Trees.cpp: removed unused "debug" fields 2014-07-19 02:54:44 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
de48688fdb Generating/Prefabs/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
06bef093bf Generating/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
madmaxoft
2df5e26d3b Fixed spaces before commas. 2014-07-18 09:57:34 +02:00
archshift
32b25ec7f7 Generator: removed rnd definitions that are never read 2014-07-17 18:34:47 -07:00
madmaxoft
b2716c720e Fixed code style in Trees.cpp. 
The src folder now has zero BasicStyle violations.
 2014-07-17 23:25:21 +02:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02:00
madmaxoft
7195c7dfe2 Added missing member initialization to cGridStructGen. 
Fixes CID 68228.
 2014-07-15 08:28:31 +02:00
Mattes D
69eaa55b55 Merge pull request #1172 from mc-server/coverity_fixes 
Coverity fixes
 2014-07-13 17:10:57 +02:00
worktycho
132b367316 CopyPaste Error 
Fixes CID 70460.
 2014-07-13 15:32:44 +01:00
worktycho
64697f0cab Another COpyPaste Error 
Fixes CID 70461
 2014-07-13 15:29:43 +01:00
worktycho
bfc485bfe2 Fix CopyPaste error that ment a_MaxRelX wasdn't checked 
Fixes CID 70464
 2014-07-13 15:05:54 +01:00
madmaxoft
a6d30a7254 Removed lilypad from plains village prefabs. 2014-07-10 12:27:08 +02:00
madmaxoft
f2419afac5 Updated generator prefabs to current Gallery contents. 2014-07-08 23:11:06 +02:00
worktycho
25a0264cc4 Check GridSize for 0 
Fixes CID 68226 and CID 66437
 2014-06-26 19:04:56 +01:00
Tiger Wang
bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
madmaxoft
82dcc0b4db Prefabs don't draw into chunk if they don't intersect. 2014-06-23 00:15:55 +02:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
madmaxoft
0a95d04ab3 Added a TestRails generator. 
This is for debugging purposes only.
 2014-06-21 20:19:44 +02:00
madmaxoft
9a57c590cd Fixed a caching bug in GridStructGen. 
The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use.
 2014-06-21 20:17:17 +02:00
madmaxoft
0e8c4ca5ab Updated prefabs to the latest Gallery content. 2014-06-21 15:02:40 +02:00
madmaxoft
b4ba86d758 Updated all prefabs to current Gallery content. 2014-06-20 22:45:08 +02:00
madmaxoft
9db9445e9f Optimized Voronoi calculation. 
Fixes #818.
 2014-06-20 17:10:18 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Tycho
ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
Tiger Wang
7188a1f670 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/World.h
 2014-06-14 09:57:07 +01:00
STRWarrior
7cf544079f Roads in villages are made out of wooden planks if they generate on water. 2014-06-11 19:12:29 +02:00
madmaxoft
7e4abcfe2d Revert "Initial Mesa Bryce implementation." 
This reverts commit 1ff1a93866.
 2014-06-11 14:15:18 +02:00
madmaxoft
1ff1a93866 Initial Mesa Bryce implementation. 2014-06-10 22:59:45 +02:00
Tiger Wang
bfa8aaf41b Merge branch 'master' into portals 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
 2014-06-10 20:51:22 +01:00
madmaxoft
9ff0ef87d4 Added an experimental height generator, Mountains. 2014-06-09 23:40:51 +02:00
madmaxoft
0544b96f80 docs/Generator: Added the easy Finishers. 2014-06-07 13:59:51 +02:00
madmaxoft
ec40c7c83a Added RainbowRoads finisher generator. 2014-06-07 13:59:50 +02:00
Tiger Wang
156c9851b8 Suggestions 2014-06-05 17:58:29 +01:00
Tiger Wang
7d3d9e92e8 Fixed a NetherFinisher bug 2014-06-04 20:01:05 +01:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Mattes D
60786cb06d Merge pull request #1052 from mc-server/UnderwaterBaseGen 
Underwater base gen
 2014-06-02 21:49:47 +02:00
madmaxoft
23b0823108 Update UnderwaterBase prefabs. 
Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights.
 2014-06-01 22:02:58 +02:00
madmaxoft
046c149797 Updated UnderwaterBase prefabs. 2014-06-01 10:07:57 +02:00
madmaxoft
75fe89b8ae Updated AlchemistVillage prefabs. 2014-06-01 09:27:54 +02:00
Tiger Wang
8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
madmaxoft
7672ca7eef Added an initial version of the underwater base generator. 2014-05-31 22:06:14 +02:00
madmaxoft
600c93bdc1 Updated PlainsVillage prefabs. 2014-05-31 10:33:29 +02:00
madmaxoft
f4e9c88dcd Fixed a memory leak in VillagGen. 2014-05-31 10:33:12 +02:00
madmaxoft
8bf7aed67c Updated PlainsVillage and AlchemistVillage. 2014-05-30 22:40:19 +02:00
madmaxoft
e5187aa645 Fixed a memory leak in cPOCPieceGenerator 2014-05-29 09:19:20 +02:00
madmaxoft
b56033d541 Merge remote-tracking branch 'origin/master' into VillageGen 2014-05-29 09:14:47 +02:00
madmaxoft
d29b242674 Fixed a memory leak in cPrefabPiecePool. 
The pool pieces weren't freed upon pool destruction.
 2014-05-28 16:33:10 +02:00
madmaxoft
dff71823d4 Merge branch 'master' into VillageGen 2014-05-27 22:09:30 +02:00
madmaxoft
6b41d1a422 Added AlchemistVillage prefabs (Thanks, KingsCraftAu). 2014-05-27 22:08:20 +02:00
madmaxoft
71256c98ed Fixed testing weights in PlainsVillages. 2014-05-27 22:06:49 +02:00
madmaxoft
ff99373237 cPieceGenerator chooses starting pieces based on weights. 
Fixes #1033.
 2014-05-27 22:05:50 +02:00
madmaxoft
6c25c356c7 Biome generators: biome lists can contain spaces. 2014-05-27 21:18:15 +02:00
madmaxoft
24137e282b Fixed prefab test initialization. 2014-05-26 10:05:51 +02:00
madmaxoft
1a742a2b52 Added support for Miners' Village. 
The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors.
Fixes #1027.
 2014-05-25 23:50:16 +02:00
madmaxoft
96a22cd82c Added Japanese village prefabs. 2014-05-24 15:03:39 +02:00
Mattes D
97865bff7c Fixed Mineshaft system size. 2014-05-23 13:01:50 +02:00
Mattes D
a4c964c888 Auto-enlargement for cGridStructGen cache. 2014-05-23 13:01:06 +02:00
madmaxoft
da843a1881 Updated plains village prefabs. 
Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects.
 2014-05-22 22:19:44 +02:00
madmaxoft
6aa7df367f Villages have min and max density setting. 
Also made roads use 3+9 scheme, instead of 3+5, for the house connectors.

Fixes #1020.
 2014-05-22 21:47:56 +02:00
madmaxoft
ebb1ef237a Updated plains village prefabs. 
The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes.
 2014-05-22 08:57:57 +02:00
madmaxoft
85fc0dbd97 Changed desert village roads to gravel. 2014-05-21 23:17:09 +02:00
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
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
madmaxoft
b9190fc04e PieceGenerator can connect two connectors of the same type. 
Also added extensive debugging output and a test.
 2014-03-09 15:24:12 +01:00
madmaxoft
e6305d29a5 Added the first skeleton code for PieceGenerator. 
This is a WIP and won't work / isn't used at all.
 2014-03-09 15:24:11 +01:00
Tycho
21e85b0745 Warnings 2014-03-07 11:15:04 -08:00
Mattes D
b17d04737d Merge pull request #738 from xdot/master 
Refactored global block property arrays
 2014-03-02 16:13:43 +01:00
madmaxoft
2325a1a162 ChunkDesc warns about StructureGen's deprecation. 2014-03-01 20:59:41 +01:00
madmaxoft
2f85c9648b Unified StructureGens and FinisherGens. 
Now they are all Finishers. Fixes #398.
 2014-03-01 20:59:41 +01:00