1
0
Fork 0
Commit Graph

2724 Commits

Author SHA1 Message Date
Howaner 89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
madmaxoft f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
archshift 1d68469718 Fixed "Dependency" typos 2014-07-29 22:43:25 -07:00
Mattes D b41c8b5de7 Merge pull request #1262 from mc-server/CanBeTerraformed
Added cBlockInfo::CanBeTerraformed and made finishers use it
2014-07-30 07:09:33 +02:00
madmaxoft 7022ae7988 Fixed FinishGen.h types. 2014-07-30 07:08:29 +02:00
archshift 487c572429 Entity.h: Moved constants out of some unnamed enum 2014-07-29 19:14:56 -07:00
Howaner 438e4088d6 Changed size_t to 'unsigned long' 2014-07-30 01:22:51 +02:00
Howaner 9a4d80fc3b Fixed compile error with clang. 2014-07-30 00:45:03 +02:00
STRWarrior 931443ac67 Added soulsand to the terraformed list. 2014-07-29 22:40:40 +02:00
STRWarrior adae2b70b1 Added cBlockInfo::CanBeTerraformed and made finishers use it
I might have forgotten some of them though
2014-07-29 22:31:31 +02:00
Tiger Wang 4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Mattes D 30e64ed4d8 Merge pull request #1061 from mc-server/portals
Portals and others
2014-07-29 17:48:56 +02:00
Mattes D d715eb7f5e Merge pull request #1254 from mc-server/SingleTopBlockFinisher
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
2014-07-29 17:47:40 +02:00
Mattes D 8287f2d933 Merge pull request #1252 from mc-server/RoughRavinesGen
Rough ravines gen
2014-07-29 17:46:57 +02:00
Tiger Wang cb77b39dc6 Detrailed whitespace 2014-07-29 16:36:24 +01:00
STRWarrior 4ccf14f3b3 Some finishing touches
Removed whitespace
fixed dead bush comment
2014-07-29 17:01:15 +02:00
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
STRWarrior c8c01b055d Fixed comment above cFinishGenSingleTopBlock 2014-07-29 15:24:11 +02:00
STRWarrior 57bb03148a SingleTopBlock: All blocktypes and biometypes get initialized properly 2014-07-29 13:13:23 +02:00
STRWarrior e74984675c Using suggestions 2014-07-28 16:53:01 +02:00
STRWarrior 579f850506 Forgot Mesa Plateau biome. 2014-07-28 14:28:16 +02:00
STRWarrior bf1aa79932 Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
Now accepts a vector of biomes and a vector of allowed blocks.
2014-07-28 14:23:29 +02:00
STRWarrior 5b69b2ce4f DistortedHeightmap: Now generates gravel in deep ocean. 2014-07-28 12:30:16 +02:00
madmaxoft fd4ee20b2a Hotfixed compilation problems. 2014-07-27 23:15:51 +02:00
Howaner 2bdc2701f4 Change Group->SetColor() again. 2014-07-27 21:58:00 +02:00
Mattes D 0814a977f8 Merge pull request #1236 from Howaner/Inventory2
Fix item durability.
2014-07-27 21:39:39 +02:00
Howaner 3d73040327 Use AString(1, Color[0]) 2014-07-27 21:14:45 +02:00
STRWarrior d61f1d0f4a NetherClumpGenerator: Fixed generating stuff on halfslabs and fences 2014-07-27 20:48:39 +02:00
Howaner 9be92fa71d Use Color[0]. 2014-07-27 20:44:00 +02:00
madmaxoft 579b80fd3a Added a missing include for abs(float). 2014-07-27 20:08:33 +02:00
madmaxoft 003f0e69a9 Updated NetherForts' weights. 2014-07-27 20:04:55 +02:00
madmaxoft 30893e7ee2 RoughRavines: Made floor and ceiling settings-adjustable.
The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges.
2014-07-27 19:57:47 +02:00
madmaxoft 960ab982b9 RoughRavines: Added per-height radius modifier. Ledges! 2014-07-27 16:05:45 +02:00
STRWarrior 3addd4890c Removed forgotten comment 2014-07-27 14:04:34 +02:00
STRWarrior bfad1be567 Made nether ceiling smooth. 2014-07-27 14:03:23 +02:00
madmaxoft 472f70a676 RoughRavines: More settings - size, width, roughness 2014-07-27 13:54:27 +02:00
Howaner 7f9f46c911 Fixed group color's. 2014-07-27 13:47:21 +02:00
STRWarrior fe7018bd00 Added a ceiling to disguise the bedrock above it. 2014-07-27 13:12:45 +02:00
STRWarrior 50fc1a5469 NetherClumpFoliage: Fixed assert 2014-07-27 11:59:54 +02:00
Howaner a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
madmaxoft ce54936f01 Updated NetherFort prefabs to latest Gallery content. 2014-07-27 00:08:25 +02:00
madmaxoft 77f4297c6e RoughRavines: Initial generator implementation.
This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values.
2014-07-27 00:03:26 +02:00
Howaner f79e682664 Fixed plugin count and fixed plugin loading, when settings.ini was regenerated. 2014-07-27 00:03:00 +02:00
Howaner c2a2aea9f8 Derp. 2014-07-26 17:09:59 +02:00
Mattes D 56f4174943 Merge pull request #1232 from mc-server/splash-entity
Moved potion static functions to EntityEffect to create splash potions through the world
2014-07-26 16:47:11 +02:00
Howaner 6e2025d125 Change comment. 2014-07-26 13:29:25 +02:00
Howaner ef4d68adfd Merge branch 'master' into Inventory 2014-07-26 13:27:27 +02:00
Howaner 4de8f5ca29 Rename function. 2014-07-26 13:26:14 +02:00
Howaner ba36e79bc5 Merge branch 'master' into Inventory2
Conflicts:
	src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
archshift 16e0beb5b6 SplashPotionEntity: Use `const cItem &` instead of a cItem 2014-07-26 03:55:40 -07:00