Alexander Harkness
|
a4932bbd8b
|
CheckBasicStyle'd
|
2014-10-27 21:34:02 +00:00 |
|
Alexander Harkness
|
7de8757ac9
|
Fixed more warnings.
It's ugly though.
|
2014-10-27 20:05:34 +00:00 |
|
Alexander Harkness
|
59ca542c28
|
Another switch.
|
2014-10-27 19:53:16 +00:00 |
|
Alexander Harkness
|
0cdf262053
|
Fix missing biomes in enum.
|
2014-10-27 19:52:04 +00:00 |
|
Alexander Harkness
|
6e21897bc6
|
Fixed remaining warnings.
|
2014-10-27 19:49:52 +00:00 |
|
Alexander Harkness
|
c0a9a83abf
|
Actually fixed the warning.
|
2014-10-27 18:09:34 +00:00 |
|
Alexander Harkness
|
8a443c028f
|
Test warning fix.
|
2014-10-27 17:11:31 +00:00 |
|
Mattes D
|
a068ebf3e0
|
cIntGen: Added a virtual destructor.
|
2014-10-27 09:48:57 +01:00 |
|
Mattes D
|
7d08d34693
|
Removed too advanced C++11 features.
We need to keep gcc 4.6 compatibility; these features were not implemented in that version yet.
|
2014-10-27 09:35:21 +01:00 |
|
Mattes D
|
7d6db6f33d
|
IntGen: Attempt at fixing Linux compilation.
|
2014-10-26 22:59:59 +01:00 |
|
Mattes D
|
74df4618de
|
BioGenGrown: Smaller biomes, add land to map center.
|
2014-10-26 22:56:02 +01:00 |
|
Mattes D
|
dcbe1717cc
|
Fixed a copypasta error in cIntGenAddToOcean.
|
2014-10-26 21:35:24 +01:00 |
|
Mattes D
|
dcad6d3626
|
Added a missing header to CMakeLists.
|
2014-10-26 20:12:29 +01:00 |
|
Mattes D
|
7e1d603080
|
Added new biomegen: Grown
|
2014-10-26 19:58:16 +01:00 |
|
Mattes D
|
765bf006ad
|
Merged branch 'master' into c++11.
|
2014-10-24 10:19:13 +02:00 |
|
Mattes D
|
1235ccb1e2
|
Removed iniFile library from linux dependencies.
|
2014-10-23 15:26:43 +02:00 |
|
Mattes D
|
449d08cb3d
|
Merged IniFile into main MCS sources.
|
2014-10-23 15:15:10 +02:00 |
|
Mattes D
|
f8c54f4243
|
Merged branch 'master' into c++11.
|
2014-10-23 08:40:39 +02:00 |
|
Tiger Wang
|
a26541a7c3
|
En masse NULL -> nullptr replace
|
2014-10-22 20:12:49 -07:00 |
|
Mattes D
|
2ac3a807b7
|
ComposableGenerator: Removed nullptr initializers.
|
2014-10-22 22:58:36 +02:00 |
|
Tiger Wang
|
987f79afdd
|
En masse NULL -> nullptr replace
|
2014-10-20 21:55:07 +01:00 |
|
Tiger Wang
|
2334c8dd9d
|
Merge branch 'master' of https://github.com/mc-server/MCServer
|
2014-10-20 19:01:53 +01:00 |
|
Julian Laubstein
|
48470c858b
|
Fixed #1550
|
2014-10-20 19:36:16 +02:00 |
|
Mattes D
|
262e6d06aa
|
TwoLevel BioGen: fixed swapped inside and outside biomes.
|
2014-10-19 16:07:29 +02:00 |
|
Tiger Wang
|
aa19a3afb0
|
Migrated random generators to std::random
|
2014-10-19 14:10:18 +01:00 |
|
Mattes D
|
3ee47df118
|
Mountain height gen: Added ditches.
|
2014-10-19 14:35:49 +02:00 |
|
Mattes D
|
e0cfbc4d85
|
Generator: Rewritten to use SharedPtrs.
|
2014-10-19 14:01:59 +02:00 |
|
STRWarrior
|
132a92226b
|
Merge branch 'master' into DungeonLoot
Conflicts:
src/ItemGrid.cpp
|
2014-10-16 11:43:59 +02:00 |
|
Mattes D
|
799ae87d3f
|
BioGen: Fixed a compiler warning.
|
2014-10-16 11:00:30 +02:00 |
|
STRWarrior
|
5ed6d280ce
|
Reversed wrong fix for #1517.
|
2014-10-16 10:26:17 +02:00 |
|
STRWarrior
|
3f0d4fe250
|
Reversed the order of the loot
For some reason the rare items weren't generating at all.
Added forgotten Golden Apple
|
2014-10-15 22:10:14 +02:00 |
|
STRWarrior
|
08676128b0
|
Added loot to dungeons.
|
2014-10-15 21:15:12 +02:00 |
|
Mattes D
|
f91aa6f1d3
|
DistortedHeightmap: Fixed crash on number rounding.
Fixes #1521.
|
2014-10-09 12:33:42 +02:00 |
|
STRWarrior
|
e95ee55974
|
Added comments to the GetAcaciaTreeImage function
|
2014-10-08 21:32:09 +02:00 |
|
STRWarrior
|
36fa1c5c73
|
Using array with possible directions.
|
2014-10-08 21:25:59 +02:00 |
|
STRWarrior
|
68a54c90c9
|
Added AcaciaTrees for the savanna biomes
|
2014-10-08 20:31:16 +02:00 |
|
win32re
|
f8c1da4a71
|
Fixes #1503 - No gravel is being generated
|
2014-10-04 14:02:40 +02:00 |
|
STRWarrior
|
7c18681e09
|
Fixed compilation
|
2014-09-28 22:10:03 +02:00 |
|
STRWarrior
|
76e0c592ef
|
Added Granite, Diorite and Andesite to the NaturalPatches generator.
|
2014-09-28 19:27:08 +02:00 |
|
madmaxoft
|
113b54aefd
|
BioGen: TwoLevel is now fully settable in INI.
|
2014-09-27 22:01:47 +02:00 |
|
worktycho
|
411c69b420
|
Merge pull request #1419 from mc-server/redstoneTests
Added test mocking to IncrementalRedstoneSimulator
|
2014-09-26 16:04:26 +01:00 |
|
madmaxoft
|
e5293706de
|
TwoLevel BioGen: reads params from INI file.
|
2014-09-25 20:47:29 +02:00 |
|
Tycho
|
9c459cbe50
|
Merge branch 'master' into redstoneTests
Conflicts:
src/Mobs/Monster.h
|
2014-09-25 15:22:08 +01:00 |
|
Chris Darnell
|
195b646aa4
|
Made it compile with clang
|
2014-09-22 03:22:36 -04:00 |
|
madmaxoft
|
6f5aa487ed
|
Voronoi biomegen: Added JitterSize and OddRowOffset.
|
2014-09-17 23:24:22 +02:00 |
|
Tycho
|
6e7c0e33b5
|
Added first test to show the object can be created
|
2014-09-17 18:40:10 +01:00 |
|
Mattes D
|
103fa8812d
|
WorldStorage no longer queues chunks into generator.
|
2014-09-05 23:26:00 +02:00 |
|
Mattes D
|
137b021d26
|
Rewritten chunk status to specify whether the chunk is in queue.
This fixes #1370.
|
2014-09-05 22:16:48 +02:00 |
|
Mattes D
|
e15b8600a6
|
BiomeMultiCache is not used for simple generators.
|
2014-09-05 22:08:00 +02:00 |
|
Mattes D
|
60e235362c
|
Fixed style.
|
2014-09-05 22:07:13 +02:00 |
|
Mattes D
|
b590eed42f
|
Merge pull request #1371 from DayBr3ak/master
issue381, multicache for cBioGen
|
2014-09-04 14:09:54 +02:00 |
|
madmaxoft
|
bae928fd27
|
ChunkGenerator: Log world seed when creating a new one.
|
2014-09-03 23:02:00 +02:00 |
|
DayBr3ak
|
d2bacc34f6
|
change to linear calculation
|
2014-09-03 18:48:47 +02:00 |
|
DayBr3ak
|
5a608dc279
|
adapting format
|
2014-09-03 02:53:21 +02:00 |
|
LO1ZB
|
554f585017
|
re-add the missing "s" too cChunkCoordsWithBoolList
|
2014-09-03 00:28:08 +02:00 |
|
LO1ZB
|
a600e3bdfe
|
hopefully the last commit for removing y-coord from chunks. :)
|
2014-09-03 00:14:51 +02:00 |
|
DayBr3ak
|
b8636ee53a
|
forgot this one
|
2014-09-02 18:18:43 +02:00 |
|
DayBr3ak
|
82911f3662
|
opting for size_t
|
2014-09-02 18:13:24 +02:00 |
|
DayBr3ak
|
29811c4f21
|
fixing memory leak
|
2014-09-02 18:05:53 +02:00 |
|
DayBr3ak
|
ac4ec5117d
|
changing implem, using vectors
|
2014-09-02 10:54:26 +02:00 |
|
DayBr3ak
|
d9afe6dd65
|
adding config file entry #381
|
2014-09-02 01:19:52 +02:00 |
|
DayBr3ak
|
77409d47eb
|
adding the multicache behavior
|
2014-09-02 01:13:19 +02:00 |
|
DayBr3ak
|
7695471ff9
|
added multicache class definition
|
2014-09-01 21:37:36 +02:00 |
|
LO1ZB
|
4c9abab2d1
|
fix possibility of a twice generated chunk
|
2014-09-01 15:01:56 +02:00 |
|
LO1ZB
|
75e1316386
|
fix chunk regenerating
|
2014-08-29 20:19:45 +02:00 |
|
LO1ZB
|
3c1c073714
|
remove y-coord from chunks
|
2014-08-28 11:36:35 +02:00 |
|
Mattes D
|
e54c78923e
|
DungeonRooms: Fixed an off-by-one error.
|
2014-08-27 20:55:28 +03:00 |
|
Mattes D
|
e54a7dc6c4
|
More basic style fixes.
|
2014-08-27 15:21:20 +03:00 |
|
Mattes D
|
62e1c45ca5
|
DungeonRooms: Added a height probability distribution function.
|
2014-08-27 13:25:27 +03:00 |
|
Mattes D
|
c6beb9760b
|
DungeonRooms: Added the spawner in the center of the room.
|
2014-08-27 08:12:26 +03:00 |
|
Mattes D
|
0c3c136c72
|
DungeonRooms: Chests are never placed next to each other.
|
2014-08-26 17:46:14 +03:00 |
|
Mattes D
|
a40f358064
|
DungeonRooms: Random pattern for floors.
|
2014-08-26 17:25:38 +03:00 |
|
Mattes D
|
2d569ce6dd
|
DungeonRooms: Replaced explicit switch with CanBeTerraformed().
|
2014-08-26 17:13:46 +03:00 |
|
Mattes D
|
ac4d3a30ed
|
Added initial dungeon rooms finisher.
|
2014-08-26 15:16:33 +03:00 |
|
Mattes D
|
64fec204c4
|
Added initializers for class members.
As reported by Coverity, these weren't initialized.
|
2014-08-21 22:39:53 +02:00 |
|
STRWarrior
|
9522bd842e
|
SwamplandM: Fixed sometimes having no mountains.
|
2014-08-18 12:53:36 +02:00 |
|
STRWarrior
|
d95768d01a
|
Bunch of tweaks:
Renamed Quarts to Quartz
Using const_iterator instead of iterator
Used CheckBasicStyle script to find style errors
|
2014-08-10 22:36:02 +02:00 |
|
STRWarrior
|
e529401dbb
|
Added NaturalPatches generator
It generates gravel and dirt.
|
2014-08-10 11:57:05 +02:00 |
|
STRWarrior
|
0ac3c67a21
|
Added NetherOreNests.
It generates Nether Quarts.
|
2014-08-10 11:48:05 +02:00 |
|
STRWarrior
|
ecfae28606
|
Changed cStructGenOreNests to take a list of ores + the block to replace.
|
2014-08-10 11:40:33 +02:00 |
|
STRWarrior
|
5eb5411f1e
|
Removed an old and outdated comment.
|
2014-08-10 11:06:04 +02:00 |
|
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 |
|