1
0
Commit Graph

521 Commits

Author SHA1 Message Date
Mattes D
ae16689420 PrefabPiecePool: Added loading from cubeset file. 2015-06-18 23:32:43 +02:00
Mattes D
ec4bd42dd8 Updated prefabs from the Gallery server. 2015-06-13 18:14:09 +02:00
Mattes D
d390214929 SelfTests are registered and executed after logging framework init.
Fixes #2228.
2015-06-11 22:20:04 +02:00
Mattes D
48c153bf53 Fixed warnings in MSVC.
It complained about undefined return values or using uninitialized variables.
2015-06-02 12:51:43 +02:00
tycho
bca13d9187 Fixed minor cast warning 2015-05-30 12:31:05 +01:00
linnemannr
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
tycho
b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho
a6ccee5948 Merge branch 'master' into PreventNewWarnings 2015-05-24 17:27:05 +01:00
tycho
76a3165f09 Fix comments 2015-05-24 14:58:24 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
Alexander Harkness
45012b72e7 Wolves don't spawn in rivers. 2015-05-24 07:28:17 +01:00
Safwat Halaby
042c08d7e3 Merge pull request #2107 from mc-server/cow-waterspawn
Cows no longer spawn over water.
2015-05-23 22:11:34 +03:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
Lukas Pioch
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
tycho
a5624debcb Fix tests 2015-05-23 13:21:02 +01:00
Alexander Harkness
abf6ac3148 Cows and rabbits no longer spawn over water.
Fixes #2080
2015-05-23 10:38:57 +01:00
tycho
813c95d4b0 Merge branch 'master' into PreventNewWarnings 2015-05-19 19:40:39 +01:00
tycho
77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
tycho
2bb25b8afa Fixed some more warnings 2015-05-19 15:21:29 +01:00
tycho
03c75943ea More fixed warnings 2015-05-19 13:34:52 +01:00
tycho
fa4fb75e03 Fixed compile and a few more warnings 2015-05-19 12:28:31 +01:00
tycho
f2689c4887 Fixed a lot of warnings 2015-05-19 11:50:59 +01:00
Lukas Pioch
a75106aea7 Fix the health of animals 2015-05-18 06:36:52 +02:00
Mattes D
846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D
c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
Mattes D
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
STRWarrior
c5189aaf9c Changed default MaxThreshold value
There is now really a difference between open and dense parts
2015-04-21 16:30:18 +02:00
STRWarrior
cc67a8bde9 Calculate threshold for each column in a chunk instead for the whole chunk 2015-04-21 16:01:27 +02:00
STRWarrior
3b74107bf3 Changed Nether composition to change the threshold from a cubic noise 2015-04-20 18:03:25 +02:00
STRWarrior
423bbbdbe1 Fixed typo in NetherForts initialization
The S in NetherForts was missing
2015-04-19 20:53:25 +02:00
STRWarrior
f17f0fa3bd GlowStone: Changed order of initialization of member variables 2015-04-19 20:08:51 +02:00
STRWarrior
f1558c6015 Fixed style 2015-04-19 19:59:27 +02:00
STRWarrior
e7542f676d Added GlowStone finisher 2015-04-19 19:45:18 +02:00
Mattes D
f1ef7f57ff Merge pull request #1775 from tommysanterre/terrainheightfix
Correct all world height validations.
2015-03-23 12:25:22 +01:00
worktycho
d02c908670 Merge pull request #1786 from mc-server/pipelineSyntax
Added pipelining syntax for generators
2015-03-21 21:08:33 +00:00
worktycho
7089b68030 Style fixes 2015-03-21 19:45:01 +00:00
Tommy Santerre
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
tycho
430cbb8c83 Changed pipeline character from >> to | 2015-03-11 10:42:45 +00:00
tycho
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
Tycho
ff785188f9 Fixed Sequence Generator for IntGen 2015-03-10 22:19:03 +00:00
STRWarrior
d19f2a472b Added parenthesis around the comparisons 2015-03-08 15:22:01 +01:00
STRWarrior
2bbfd0341f Added proper trees to Mesa biomes
Mesa only has small apple trees.
2015-03-08 13:30:21 +01:00
STRWarrior
134246fb15 Added grass/course dirt layer on MesaPlateauF(M) 2015-03-08 13:29:49 +01:00
Tiger Wang
3d81b0093e Merge pull request #1784 from mc-server/SteppyHeiGen
Added Steppy height generator.
2015-03-06 11:53:12 +00:00
STRWarrior
db2a406c13 Removed trailing whitespace 2015-03-01 20:09:44 +01:00
STRWarrior
3d3735a378 Replaced IntNoiseXX with IntNoiseXXInt 2015-03-01 20:08:05 +01:00
STRWarrior
e63f9bdc1a Replaced cFinishGenPtr with std::make_shared 2015-03-01 20:06:44 +01:00
Tycho
bdea6c92b3 Fixed Style
Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates
2015-03-01 14:51:07 +00:00
Tycho
3f61255fe1 Added pipelining syntax for generators 2015-03-01 14:27:01 +00:00
Mattes D
d2e1ed3a3b Steppy HeiGen: Fixed Linux compilation. 2015-03-01 12:40:53 +01:00