madmaxoft
7bfb0b05d0
CheckBasicStyle: multi-level indent change.
2014-08-04 13:20:29 +02:00
STRWarrior
dd9a19e395
VillageGen: Fixed a typo in comment
2014-08-03 15:31:59 +02:00
STRWarrior
a44fbf2338
Added proper trees and height for SwamplandM biome
2014-08-02 21:44:16 +02:00
STRWarrior
7821326370
Suggestions
2014-07-30 22:43:59 +02:00
STRWarrior
6e0a8d393b
Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage
2014-07-30 21:56:33 +02:00
STRWarrior
f232ef5cd6
Fixed doxy comment
2014-07-30 21:50:02 +02:00
STRWarrior
fd2d338a25
Fixed comment at the end of a for-loop
2014-07-30 21:42:48 +02:00
STRWarrior
17b679f355
Fixed compiling using Clang
2014-07-30 17:09:00 +02:00
STRWarrior
5249f574bd
Added RoofedForest trees.
...
Could still be improved allot.
2014-07-30 15:55:50 +02:00
STRWarrior
75b7c37755
PreSimulator: Added configurations.
...
You can now choose if it should pregenerate something or not
2014-07-30 13:06:48 +02: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
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
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
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
STRWarrior
d61f1d0f4a
NetherClumpGenerator: Fixed generating stuff on halfslabs and fences
2014-07-27 20:48:39 +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
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
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
STRWarrior
a39e19e94a
Tweaks to NetherClumpFoliage
...
Simplefied the way NetherClupFoliage creates the X and Z coordinate.
2014-07-25 21:01:40 +02:00
STRWarrior
0f298c8b84
Speed up the NetherClumpFoliage finisher.
...
Using IntNoiseXX instead of CubicNoiseXX.
2014-07-25 14:23:36 +02:00
archshift
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
STRWarrior
7e38c123fc
TallGrass: Less grass on mountains.
2014-07-23 11:23:35 +02:00
STRWarrior
9080f14dc2
Fixed possible crash in the NetherClumpFoliage finisher.
2014-07-23 11:02:42 +02:00
archshift
f78bf254e3
Merge pull request #1234 from mc-server/GeneratorTweaks
...
ExtremeHillsPlus and ExtremeHills spawn with grass only
2014-07-22 14:20:06 -07:00
STRWarrior
5b148c30f7
Extreme Hills M variant only spawn with grass and stone
...
Removed gravel.
2014-07-22 14:44:26 +02:00
Tiger Wang
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft
31b22e14b7
Updated prefabs to current Gallery content.
2014-07-22 10:04:53 +02:00
STRWarrior
bea574bf54
ExtremeHillsPlus and ExtremeHills spawn with grass only
...
Turns out only the M variants have stone and gravel in them.
2014-07-21 18:53:56 +02:00
madmaxoft
7672418ca8
Merged branch 'origin/Foliage'.
2014-07-21 18:18:54 +02:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
STRWarrior
39623251c4
Fixed a missing enter.
2014-07-21 16:34:35 +02:00
STRWarrior
ce956bcdf2
Removed y for-loop.
...
Only the top block now gets long grass.
2014-07-21 16:01:16 +02:00
STRWarrior
0c816dd697
Fixed indentation
2014-07-21 10:58:13 +02:00
STRWarrior
a4470da876
Changed CubicNoiseXX to IntNoiseXX
...
Added some comments
2014-07-20 22:43:31 +02:00
STRWarrior
76b79b51ad
Renamed cFinishGenFoliage to cFinishGenTallGrass
...
Better grass density
Added double tall grass.
2014-07-20 19:22:41 +02:00
STRWarrior
51ad6cd1b2
Fixed warnings
2014-07-20 16:31:28 +02:00
STRWarrior
7bf9da7441
First attempt for a new foliage finisher
2014-07-20 16:23:45 +02:00
madmaxoft
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
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