Matti Hänninen
b20294604c
Fix old style casts and implicit conversions
2015-08-12 16:51:38 +03:00
Mattes D
6e4122e551
Unified the doxy-comment format.
2015-07-31 16:49:10 +02:00
Samuel Barney
804805d35a
Silenced and fixed many warning messages across multiple files.
2015-07-29 09:49:30 -06:00
Samuel Barney
9fde99aca2
Added documentation for GetLargeTreeAdjustment
2015-07-17 15:26:21 -06:00
Julian Laubstein
01f90ef97d
Merge pull request #2350 from SamJBarney/PeonySnowFix
...
Fixed Tall Grass placement
2015-07-15 19:31:41 +02:00
Samuel Barney
4235feb7fd
Fixed tall grass trying to be placed in cold biomes.
2015-07-15 11:04:09 -06:00
Julian Laubstein
e92335b669
Merge pull request #2346 from SamJBarney/TreeGrowthUpdate
...
Sapling Growth Update
2015-07-14 16:36:53 +02:00
Samuel Barney
d017fe5e39
Sapling Growth Update
...
* Growth has been slowed down
* Saplings do not grow if they do not have enough space to grow
* Saplings do not grow unless the light level is 9 or above
* Dark Oak doesn't grow unless it is in a 2x2
Jungle Trees now will grow into a large tree when 2x2 saplings are used.
2015-07-13 15:24:38 -06:00
Samuel Barney
051787dbc2
Switched from using std::max(std::min()) to using Clamp
2015-07-13 14:17:43 -06:00
Samuel Barney
db3642de89
Fixed misplaced parens
2015-07-09 14:41:14 -06:00
Samuel Barney
aa94a275c6
Fixes compilation failures on MacOSX 10.10
...
* Replace old c-style casts with c++ casts
* Added `-Wno-error=old-style-cast` to Protocol18x.cpp
2015-07-09 11:15:37 -06:00
Mattes D
bebd4de144
Fixed warnings generated by 64-bit MSVC.
2015-07-07 11:50:06 +02:00
Mattes D
6cd71a1e73
Generate biomes when pregenerating heights through CompositedHeiGen.
...
Fixes #2283 .
2015-06-23 14:45:35 +02:00
Mattes D
e06dd8f20e
Added basic support for loading village prefabs from files.
2015-06-20 15:37:41 +02:00
Mattes D
8df31067d4
Externalized cPrefabPiecePool self-test.
2015-06-19 16:15:59 +02:00
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
Mattes D
780a9ae9d1
Added Steppy height generator.
2015-03-01 12:13:39 +01:00
STRWarrior
0394acfc0c
Made the minimum vine level configurable
2015-02-28 22:40:13 +01:00
STRWarrior
19d7ec51a0
Implemented a vines finisher that creates vines in jungle biomes
2015-02-28 22:37:33 +01:00
STRWarrior
ac2c88b451
Ice finisher uses GetSnowStartHeight instead of specific biomes
2015-02-25 19:22:44 +01:00
STRWarrior
ba3eaf9223
Snow finisher uses GetSnowStartHeight instead of specific biomes
2015-02-25 19:12:53 +01:00
Mattes D
6ec5e8caa7
Replaced atoi() with StringToInteger().
2015-01-27 14:53:32 +01:00
Kirill Kirilenko
ce2d3280ca
Fixed defect #43665 in Coverity list.
2015-01-23 19:06:27 +03:00
Kirill Kirilenko
0288e90e0b
Fixed defect #73101 in Coverity list.
2015-01-23 19:06:26 +03:00
Kirill Kirilenko
2557eab957
Fixed defect #43671 in Coverity list.
2015-01-23 19:06:25 +03:00
Mattes D
ccdf03daaf
Refactored all player block placing to go through hooks.
...
Fixes #1618 .
2014-12-24 07:20:17 +01:00
Mattes D
fe00c99c95
cEndGen: Fixed unitialized member variables.
...
Fixes CID 43671.
2014-12-21 21:59:44 +01:00
Mattes D
c9697083e5
cNoise3DComposable: Fixed unitialized member variables.
...
Fixes CID 43665.
2014-12-21 21:56:34 +01:00
STRWarrior
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
Mattes D
781b3303a5
Merge pull request #1657 from mc-server/PrepareChunk
...
Prepare chunk
2014-12-11 17:06:18 +01:00
Mattes D
09453619e6
Fixed DungeonRooms edges not generating sometimes.
2014-12-11 11:16:11 +01:00
Mattes D
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
Mattes D
d00ebd7ee7
Merge pull request #1555 from mc-server/c++11
...
C++11
2014-12-07 15:01:36 +01:00
STRWarrior
ba99107591
Reduced river height
...
Rivers would exceed the water height quite often
2014-12-07 12:03:52 +01:00
STRWarrior
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
Tiger Wang
3acdf25b05
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
Mattes D
c5dc5ac45f
FinishGenPassiveMobs: Cosmetic changes.
2014-12-05 22:46:46 +01:00
p-mcgowan
b25fcb0972
formatting and default spawn percentage
2014-12-05 11:31:01 -08:00
p-mcgowan
a8bbd5efe4
Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher
...
update
2014-12-05 11:24:09 -08:00
Mattes D
e2a04f580a
BasicStyle: Added missing braces to control statements.
2014-12-05 16:59:11 +01:00
p-mcgowan
750b4a3eaa
reformat
2014-12-05 01:01:10 -08:00
p-mcgowan
c655d97c9d
restructure, with logic this time
2014-12-05 00:57:40 -08:00
p-mcgowan
bd8c1850da
restructured random animals, added check for desert (update as per wiki)
2014-12-04 17:20:19 -08:00
p-mcgowan
78f0aebaf4
handle non-vanilla dimensions
2014-12-04 17:01:34 -08:00
p-mcgowan
538991c973
handle non-vanilla dimensions
2014-12-04 16:59:45 -08:00
p-mcgowan
53a33595b7
formatting fixes
2014-12-04 16:44:18 -08:00
p-mcgowan
8557ab18d0
conflict resolution
2014-12-04 13:31:58 -08:00
p-mcgowan
99a5b38e27
format blocks and randomizing
2014-12-04 13:28:27 -08:00
Mattes D
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
p-mcgowan
b7c4ef05ac
last doxy fix
2014-12-04 01:18:55 -08:00
p-mcgowan
83d4bec369
awful comment fixing, randomizer fix
2014-12-04 01:08:17 -08:00