ec4bd42dd8
Updated prefabs from the Gallery server.
2015-06-13 18:14:09 +02:00
d390214929
SelfTests are registered and executed after logging framework init.
...
Fixes #2228 .
2015-06-11 22:20:04 +02:00
48c153bf53
Fixed warnings in MSVC.
...
It complained about undefined return values or using uninitialized variables.
2015-06-02 12:51:43 +02:00
bca13d9187
Fixed minor cast warning
2015-05-30 12:31:05 +01:00
ee34e7131a
Fix FreeBSD/clang errors caused by -Werror
...
With FreeBSD/clang, -Werror combined with the configured warning flags yields
some fatal errors, specifically related to signed conversion, 64 to 32 bit
conversion, and tautological compares.
CONTRIBUTORS
Add myself to the contributor list
src/Generating/FinishGen.cpp
In cFinishGenPassiveMobs::GetRandomMob(), change the type of RandMob
from size_t to the difference_type of the ListOfSpawnables iterator
MobIter. Using size_t triggers a 64 bit to 32 bit conversion if the
difference_type of the iterator class is 64 bit
Also explicitly cast the noise expression to unsigned long so we don't
get a signed conversion warning from the modulo against
ListOfSpawnables.size()
src/OSSupport/StackTrace.cpp
FreeBSD 10 and above includes a non glibc implementation of benchmark()
for which size_t, not int, is the return type. To account for this and
prevent a signed conversion warning, abstract the type for numItems with
a macro btsize
src/StringUtils.h
In StringToInteger(), correct a tautological compare warning for
unsigned types with the template. If T is unsigned, comparing
std::numeric_limits<T>::min() to the unsigned result is always
false. That control can enter this branch in an evaluated template with
an unsigned type T may also permit a signed number to be parsed and
erroneously stripped of its signedness at runtime. To guard against this
and avoid the warning in the case that the number parsed from the string
is non-positive, return false and don't try to parse if T is unsigned
and control enters the non-positive branch
2015-05-30 02:23:57 -06:00
b2fa71a32a
Fix comments
2015-05-28 12:54:04 +01:00
a6ccee5948
Merge branch 'master' into PreventNewWarnings
2015-05-24 17:27:05 +01:00
76a3165f09
Fix comments
2015-05-24 14:58:24 +01:00
dae9e5792a
Made -Weverything an error.
2015-05-24 12:56:56 +01:00
45012b72e7
Wolves don't spawn in rivers.
2015-05-24 07:28:17 +01:00
042c08d7e3
Merge pull request #2107 from mc-server/cow-waterspawn
...
Cows no longer spawn over water.
2015-05-23 22:11:34 +03:00
81c0116cf1
Merge branch 'master' into PreventNewWarnings
2015-05-23 07:33:52 -07:00
e30b2ed487
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
2015-05-23 16:28:37 +02:00
a5624debcb
Fix tests
2015-05-23 13:21:02 +01:00
abf6ac3148
Cows and rabbits no longer spawn over water.
...
Fixes #2080
2015-05-23 10:38:57 +01:00
813c95d4b0
Merge branch 'master' into PreventNewWarnings
2015-05-19 19:40:39 +01:00
77f1f58c0a
Make -Werror disabling file only
...
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
2bb25b8afa
Fixed some more warnings
2015-05-19 15:21:29 +01:00
03c75943ea
More fixed warnings
2015-05-19 13:34:52 +01:00
fa4fb75e03
Fixed compile and a few more warnings
2015-05-19 12:28:31 +01:00
f2689c4887
Fixed a lot of warnings
2015-05-19 11:50:59 +01:00
a75106aea7
Fix the health of animals
2015-05-18 06:36:52 +02:00
846d16315a
CheckBasicStyle: checks spaces around * and &.
2015-05-09 12:58:55 +02:00
c13b1931ff
More style checking.
...
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
0ff7514351
Merge pull request #1879 from mc-server/DynamicThreshold
...
Changed Nether composition to change the threshold from a cubic noise
2015-04-21 23:09:27 +02:00
c5189aaf9c
Changed default MaxThreshold value
...
There is now really a difference between open and dense parts
2015-04-21 16:30:18 +02:00
cc67a8bde9
Calculate threshold for each column in a chunk instead for the whole chunk
2015-04-21 16:01:27 +02:00
3b74107bf3
Changed Nether composition to change the threshold from a cubic noise
2015-04-20 18:03:25 +02:00
423bbbdbe1
Fixed typo in NetherForts initialization
...
The S in NetherForts was missing
2015-04-19 20:53:25 +02:00
f17f0fa3bd
GlowStone: Changed order of initialization of member variables
2015-04-19 20:08:51 +02:00
f1558c6015
Fixed style
2015-04-19 19:59:27 +02:00
e7542f676d
Added GlowStone finisher
2015-04-19 19:45:18 +02:00
f1ef7f57ff
Merge pull request #1775 from tommysanterre/terrainheightfix
...
Correct all world height validations.
2015-03-23 12:25:22 +01:00
d02c908670
Merge pull request #1786 from mc-server/pipelineSyntax
...
Added pipelining syntax for generators
2015-03-21 21:08:33 +00:00
7089b68030
Style fixes
2015-03-21 19:45:01 +00:00
3f6d823aa4
Correct world height validations.
...
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
2015-03-19 20:32:17 -04:00
430cbb8c83
Changed pipeline character from >> to |
2015-03-11 10:42:45 +00:00
8646e95b6f
Fixed style and removed false positives
...
Relaxed the rules for < followed by an && and removed rule for < following an &&
2015-03-11 10:39:49 +00:00
ff785188f9
Fixed Sequence Generator for IntGen
2015-03-10 22:19:03 +00:00
d19f2a472b
Added parenthesis around the comparisons
2015-03-08 15:22:01 +01:00
2bbfd0341f
Added proper trees to Mesa biomes
...
Mesa only has small apple trees.
2015-03-08 13:30:21 +01:00
134246fb15
Added grass/course dirt layer on MesaPlateauF(M)
2015-03-08 13:29:49 +01:00
3d81b0093e
Merge pull request #1784 from mc-server/SteppyHeiGen
...
Added Steppy height generator.
2015-03-06 11:53:12 +00:00
db2a406c13
Removed trailing whitespace
2015-03-01 20:09:44 +01:00
3d3735a378
Replaced IntNoiseXX with IntNoiseXXInt
2015-03-01 20:08:05 +01:00
e63f9bdc1a
Replaced cFinishGenPtr with std::make_shared
2015-03-01 20:06:44 +01:00
bdea6c92b3
Fixed Style
...
Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates
2015-03-01 14:51:07 +00:00
3f61255fe1
Added pipelining syntax for generators
2015-03-01 14:27:01 +00:00
d2e1ed3a3b
Steppy HeiGen: Fixed Linux compilation.
2015-03-01 12:40:53 +01:00
780a9ae9d1
Added Steppy height generator.
2015-03-01 12:13:39 +01:00
0394acfc0c
Made the minimum vine level configurable
2015-02-28 22:40:13 +01:00
19d7ec51a0
Implemented a vines finisher that creates vines in jungle biomes
2015-02-28 22:37:33 +01:00
ac2c88b451
Ice finisher uses GetSnowStartHeight instead of specific biomes
2015-02-25 19:22:44 +01:00
ba3eaf9223
Snow finisher uses GetSnowStartHeight instead of specific biomes
2015-02-25 19:12:53 +01:00
6ec5e8caa7
Replaced atoi() with StringToInteger().
2015-01-27 14:53:32 +01:00
ce2d3280ca
Fixed defect #43665 in Coverity list.
2015-01-23 19:06:27 +03:00
0288e90e0b
Fixed defect #73101 in Coverity list.
2015-01-23 19:06:26 +03:00
2557eab957
Fixed defect #43671 in Coverity list.
2015-01-23 19:06:25 +03:00
ccdf03daaf
Refactored all player block placing to go through hooks.
...
Fixes #1618 .
2014-12-24 07:20:17 +01:00
fe00c99c95
cEndGen: Fixed unitialized member variables.
...
Fixes CID 43671.
2014-12-21 21:59:44 +01:00
c9697083e5
cNoise3DComposable: Fixed unitialized member variables.
...
Fixes CID 43665.
2014-12-21 21:56:34 +01:00
00bee25b4b
WormNestCaves occasionally generates sandstone around the cave
...
Only when the block around the cave is sand.
2014-12-13 15:38:37 +01:00
781b3303a5
Merge pull request #1657 from mc-server/PrepareChunk
...
Prepare chunk
2014-12-11 17:06:18 +01:00
09453619e6
Fixed DungeonRooms edges not generating sometimes.
2014-12-11 11:16:11 +01:00
fcd3d1bfed
Added a cWorld:PrepareChunk function.
...
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
2014-12-10 22:35:16 +01:00
d00ebd7ee7
Merge pull request #1555 from mc-server/c++11
...
C++11
2014-12-07 15:01:36 +01:00
ba99107591
Reduced river height
...
Rivers would exceed the water height quite often
2014-12-07 12:03:52 +01:00
95c83abcdb
Fixed error message in cFinishGenPassiveMobs
...
It would send an error message when trying to spawn mobs in a desert
2014-12-07 12:00:36 +01:00
3acdf25b05
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
c5dc5ac45f
FinishGenPassiveMobs: Cosmetic changes.
2014-12-05 22:46:46 +01:00
b25fcb0972
formatting and default spawn percentage
2014-12-05 11:31:01 -08:00
a8bbd5efe4
Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher
...
update
2014-12-05 11:24:09 -08:00
e2a04f580a
BasicStyle: Added missing braces to control statements.
2014-12-05 16:59:11 +01:00
750b4a3eaa
reformat
2014-12-05 01:01:10 -08:00
c655d97c9d
restructure, with logic this time
2014-12-05 00:57:40 -08:00
bd8c1850da
restructured random animals, added check for desert (update as per wiki)
2014-12-04 17:20:19 -08:00
78f0aebaf4
handle non-vanilla dimensions
2014-12-04 17:01:34 -08:00
538991c973
handle non-vanilla dimensions
2014-12-04 16:59:45 -08:00
53a33595b7
formatting fixes
2014-12-04 16:44:18 -08:00
8557ab18d0
conflict resolution
2014-12-04 13:31:58 -08:00
99a5b38e27
format blocks and randomizing
2014-12-04 13:28:27 -08:00
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
b7c4ef05ac
last doxy fix
2014-12-04 01:18:55 -08:00
83d4bec369
awful comment fixing, randomizer fix
2014-12-04 01:08:17 -08:00
27185dd374
clearing CheckBasicStyle.lua messages
2014-12-03 00:26:15 -08:00
8c3b9ae15b
class description and doxy-commenting
2014-12-03 00:12:32 -08:00
d348433406
doxy-commenting
2014-12-02 22:35:34 -08:00
2ea8a36df6
forgot initializer
2014-12-02 15:55:09 -08:00
6803df129f
typos and oversights for lua and CI
2014-12-02 11:32:53 -08:00
8d7c2d4b13
fastRandom unused
2014-12-02 11:26:37 -08:00
585662e63f
indentation, repeatable random, small corrections
2014-12-02 11:21:51 -08:00
bc8937d315
Merge pull request #1634 from mc-server/DungeonSpawners
...
Dungeons spawners now spawn mobs
2014-12-02 11:15:20 +01:00
978c9967ad
fix comments after replacing spaces with tabs
2014-12-02 02:03:29 -08:00
2d93274a90
animal terrain finisher
2014-12-02 01:58:30 -08:00
9831220a1c
animal terrain finisher
2014-12-02 01:37:17 -08:00
f1177984f1
Fixed forgotten semicolon
2014-12-02 10:20:20 +01:00
a466986f53
Using IntNoise3DInt instead of IntNoise3D
2014-12-02 09:55:25 +01:00
5db3ceb333
Suggestions by xoft
...
Using IntNoise3D to prevent needless floating point math
2014-12-02 09:42:49 +01:00
bb5a7d8f15
reformat for lua and CI
2014-12-01 17:47:36 -08:00
3bf111c69e
formatting and commenting fixes
2014-12-01 17:28:46 -08:00
cb584a87bd
cacti no longer spawn outside of desert variants
2014-12-01 11:44:20 -08:00
7586069829
Using static cast for Dungeon spawners
2014-12-01 19:07:54 +01:00
ca728da9b6
Using static cast for MineShaft spawners
2014-12-01 19:05:44 +01:00
25e3869485
Mineshaft spawners now spawn cave spiders
2014-12-01 18:47:39 +01:00
c0b08a6c1e
Dungeons spawners now spawn mobs
...
25% for a spider, 25% for a skeleton and 50% for a zombie spawner.
2014-12-01 17:51:20 +01:00
1bf0827a2f
Simplefied SoulsandRims
...
Replaced two for loops with a single if
2014-12-01 17:29:35 +01:00
fa4a85c915
Added better soulsand rims
...
As a finisher called SoulsandRims
2014-12-01 16:36:48 +01:00
cc313c91ab
DistortedHeightmap: Added missing initialization.
...
This was probably the original cause for the "empty chunks".
Fixes #1433 .
2014-12-01 00:14:27 +01:00
f0ad6221c3
Noise3D: Fixed missing initialization.
...
This should fix terrain being at Y=0 or Y=255 for the spawn chunk.
Fixes #1433 .
2014-12-01 00:09:58 +01:00
e972c52e54
Hopefully fixed random build fails
2014-11-30 18:44:44 +01:00
65dc452923
Fixed nether ceiling
2014-11-30 16:34:41 +01:00
61ce09e4d0
CompoGenBiomal: Fixed signed vs unsigned comparison.
2014-11-27 21:24:03 +01:00
e3e13f552f
Fixed BlockStringToType return value.
...
-1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
2014-11-27 21:19:52 +01:00
187bdab4fa
Merge remote-tracking branch 'origin-master' into c++11
2014-11-25 23:03:33 +00:00
478bbad5ed
Added TwoHeights shape generator.
...
This is a faster shape generator that can generate overhangs and has biome awareness.
2014-11-23 18:16:20 +01:00
2ae4d2a96a
Removed unnecessary #includes
2014-11-23 17:13:40 +00:00
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
9f4342434b
Noise3D generator: Enlarged averaging to avoid steep beach slopes.
2014-11-23 15:10:55 +01:00
e9797c6a2a
Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor
2014-11-23 12:33:04 +01:00
1ed32b825e
BiomalNoise3D generator: finished all biomes.
2014-11-20 22:48:14 +01:00
b7dd2dddf9
CompoGenBiomal: Fixed sealevel offset.
2014-11-20 22:45:50 +01:00
f3e9fa74d2
Merge pull request #1594 from mc-server/LargeOakTree
...
Large Oak Tree
2014-11-20 21:30:50 +01:00
1e887d1381
CompoGenBiomal: Fixed sealevel not generating properly.
2014-11-20 18:05:30 +01:00
76058e8183
Generators: Unified SeaLevel into a single variable.
...
It is shared between shape generators and composition generators and there's no sense in having two different values for those.
2014-11-20 15:31:03 +01:00
5325885ef4
Noise3D generators: Changed noise generator to InterpolNoise.
2014-11-20 14:45:20 +01:00
288cbf12cb
Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor
2014-11-20 10:13:10 +01:00
fef4133f6d
cInterpolNoise: Implemented optimized 2D generating.
2014-11-19 16:58:27 +01:00
c048f2bd95
Added a cInterpolNoise template for faster noise generator.
...
Used an instance of it in the Noise3D generator.
2014-11-18 23:21:57 +01:00
2467d29a4e
Moved all Noise-related files into a separate folder.
2014-11-18 12:07:08 +01:00
f9cfc36643
Added cImprovedNoise implementation.
2014-11-17 16:50:28 +01:00
ff036c9cef
Changed comment
...
Suggestion by xoft
2014-11-16 19:50:57 +01:00
95e59056a1
BiomalNoise3D: Added more biomes.
2014-11-16 19:03:00 +01:00
564b9ad337
Generator: Fixed crash with trees too high.
2014-11-15 21:45:24 +01:00
b0bcd75732
Snow generator: Fixed failure at top of the world.
2014-11-15 20:24:15 +01:00
889aa7404d
ChunkDesc: Fixed comment about indexing.
2014-11-15 20:23:47 +01:00
30fa6a642c
DungeonRooms: Changed to work with the new shape generators.
2014-11-15 11:17:05 +01:00
644240a0e5
Noise3D: Added jungles.
2014-11-14 22:17:11 +01:00
2789fafeb7
Noise3D: Added oceans.
2014-11-13 21:47:39 +01:00
7a3b3aeb3c
Gen refactor: Implemented CompositedHeiGen.
...
This fixes crashes in the Village generator due to the missing generator.
2014-11-13 21:28:50 +01:00
5584144be2
First implementation for the LargeOakTree
2014-11-13 10:44:36 +01:00
5fb2526e07
Generator: Shape initial refactoring.
...
The code compiles, but several structure generators are broken, crash on start.
2014-11-12 21:24:26 +01:00
b525eee8e0
BiomalNoise3D: Added a few biomes.
2014-11-10 22:08:29 +01:00
9a50a1fe0c
TallGrassGenerator: Fixed crash when too high
2014-11-10 21:55:13 +01:00
4b95f7c69a
Added BiomalNoise3D shape generator.
2014-11-10 17:00:14 +01:00
5993c06bd7
Noise3d Generator: Fixed unused function error.
2014-11-09 15:33:01 +01:00
c43391fd8c
Noise3D generator: rewritten from scratch.
...
Now it uses three 3D and one 2D perlin noises to generate the terrain, and is highly parametrizable.
2014-11-09 14:34:10 +01:00
136d6b5c30
Noise3D CompoGen: Fixed missing initialization.
2014-11-06 19:25:42 +01:00
7d2b2f90b6
MinMax heigen: Reduced the number of octaves.
...
They didn't affect the terrain that much anyway.
2014-11-04 08:41:18 +01:00
f239a28d06
Added MinMax height generator.
...
Fixes #1578 .
2014-11-04 08:40:23 +01:00
c5f3663bea
Fixed a missing endline.
2014-11-03 11:48:03 +01:00
Mattes D
tycho
linnemannr
Alexander Harkness
Safwat Halaby
Lukas Pioch
STRWarrior
Tommy Santerre
tycho
Tycho
Tiger Wang
Kirill Kirilenko
p-mcgowan