1
0
Commit Graph

57 Commits

Author SHA1 Message Date
worktycho
d02c908670 Merge pull request #1786 from mc-server/pipelineSyntax
Added pipelining syntax for generators
2015-03-21 21:08:33 +00:00
tycho
430cbb8c83 Changed pipeline character from >> to | 2015-03-11 10:42:45 +00:00
Tycho
ff785188f9 Fixed Sequence Generator for IntGen 2015-03-10 22:19:03 +00: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
780a9ae9d1 Added Steppy height generator. 2015-03-01 12:13:39 +01:00
Mattes D
6ec5e8caa7 Replaced atoi() with StringToInteger(). 2015-01-27 14:53:32 +01:00
Kirill Kirilenko
0288e90e0b Fixed defect #73101 in Coverity list. 2015-01-23 19:06:26 +03:00
Mattes D
c5f3663bea Fixed a missing endline. 2014-11-03 11:48:03 +01:00
Mattes D
f5c4a6a27d Added a (disabled) perf test for biome generators. 2014-11-03 10:36:12 +01:00
Mattes D
d5b6353493 Grown biomes: Unified with GrownProt biomes.
Also fixed a Zoom filter randomness.
2014-11-02 16:36:59 +01:00
Mattes D
d868346491 GrownProt: Added the rest of rare and M biomes. 2014-11-01 21:01:33 +01:00
Mattes D
4873890cfb GrownProt biome gen: Added biome edges. 2014-11-01 16:37:56 +01:00
Mattes D
13f0e93d69 GrownProt biomes: added alterations. 2014-10-31 12:52:07 +01:00
Mattes D
8c04abf9aa QtBiomeVisualiser: Added a prototyping int generator flavor.
This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower.
2014-10-30 16:24:35 +01:00
Mattes D
f34b1291be Grown biomes: made biomes smaller, made beaches smaller. 2014-10-29 15:28:27 +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
74df4618de BioGenGrown: Smaller biomes, add land to map center. 2014-10-26 22:56:02 +01:00
Mattes D
7e1d603080 Added new biomegen: Grown 2014-10-26 19:58:16 +01:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D
262e6d06aa TwoLevel BioGen: fixed swapped inside and outside biomes. 2014-10-19 16:07:29 +02:00
Mattes D
e0cfbc4d85 Generator: Rewritten to use SharedPtrs. 2014-10-19 14:01:59 +02:00
Mattes D
799ae87d3f BioGen: Fixed a compiler warning. 2014-10-16 11:00:30 +02:00
madmaxoft
113b54aefd BioGen: TwoLevel is now fully settable in INI. 2014-09-27 22:01:47 +02:00
madmaxoft
e5293706de TwoLevel BioGen: reads params from INI file. 2014-09-25 20:47:29 +02:00
madmaxoft
6f5aa487ed Voronoi biomegen: Added JitterSize and OddRowOffset. 2014-09-17 23:24:22 +02:00
Mattes D
60e235362c Fixed style. 2014-09-05 22:07:13 +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
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
77409d47eb adding the multicache behavior 2014-09-02 01:13:19 +02: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
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
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
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
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Tiger Wang
8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
madmaxoft
6c25c356c7 Biome generators: biome lists can contain spaces. 2014-05-27 21:18:15 +02:00
madmaxoft
c9163d39f7 Implemented faster upscaling using templates.
Fixes #819.
2014-03-21 22:53:46 +01:00
Tycho
4b19247305 Fogot to save Biogen 2014-02-03 13:07:38 -08:00
Tycho
d9fb83300c Fixed Compile errors
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03 13:01:12 -08:00
Tycho
80807eec2c Increased Type safety of Biomes
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
Tycho Bickerstaff
e32a224fe3 fixed warnings in src/Generating/BioGen.cpp
removed unused variable at src/Generating/BioGen.cpp line 379
and added default fallthrough clause to switch at
src/Generating/BioGen.cpp line 725
2013-12-07 23:56:26 +00:00
madmaxoft
cbe8d1aa6d Fixed CheckerboardBiomeGen in negative coords. 2013-11-29 21:45:20 +01:00