flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,465 Commits 1 Branch 0 Tags 92 MiB
9a4d80fc3b
Commit Graph

264 Commits

Author SHA1 Message Date
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
Tycho
fec17409d2 Merge branch 'master' into GeneratingBenchmark2 
Conflicts:
	src/World.h
 2014-01-31 15:31:05 -08:00
madmaxoft
66427d754b Added cChunkDest::UpdateHeightmap() 
This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator.
 2014-01-31 16:01:15 +01:00
Tycho
bed2ee22e8 Merge branch 'master' into GeneratingBenchmark2 
Conflicts:
	src/Blocks/BlockRail.h
	src/World.h
 2014-01-26 06:28:51 -08:00
Mattes D
f78a62a5e3 Merge pull request #575 from worktycho/GeneratingBenchmark 
More Interfaces to decouple Generator from the rest of the code
 2014-01-25 13:55:33 -08:00
Tycho
03b08456b6 dded dependecy on Blocks to Generator 2014-01-25 10:23:18 -08:00
Tiger Wang
314fc3cdac Mob bugfixes 
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
 2014-01-25 14:42:26 +00:00
Tiger Wang
1112f5adc6 Fixed a generator bug 2014-01-24 23:56:19 +00:00
Tycho
16375f6aad Merge branch 'master' into GeneratingBenchmark 
this merge is necessary,
 2014-01-20 09:21:47 -08:00
Tycho
bd4278aca1 Added Inifile and OSSupport Linking 2014-01-19 12:51:23 -08:00
madmaxoft
e68521deac Alpha-sorted the finishers. 2014-01-18 17:03:43 +01:00
madmaxoft
896f1a26ec Merged branch 'NetherFinish'. 2014-01-18 17:03:31 +01:00
STRWarrior
188cb1f6bc Fixed errors. 2014-01-18 14:17:26 +01:00
STRWarrior
ca27f87272 Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's 2014-01-18 14:16:07 +01:00
STRWarrior
dd7c02bba9 Some tweaks. 
Everything generates more often.
Fire can only spawn on ForeverBurning blocks.
 2014-01-18 13:45:41 +01:00
STRWarrior
087d650aed Fixed bug where only brown mushrooms would spawn. 2014-01-18 00:37:21 +01:00
STRWarrior
9f17c9799b It now actualy works. 2014-01-18 00:27:13 +01:00
STRWarrior
7c787de261 First attempt at creating a clumb version NetherFinisher. 2014-01-17 22:58:01 +01:00
madmaxoft
cea997426b Decoupled cChunkGenerator from cWorld and cRoot. 
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
 2014-01-10 22:22:54 +01:00
madmaxoft
712e6e0bb2 Fixed generator adding values to ini file. 2014-01-10 16:34:09 +01:00
STRWarrior
82a06725bd Added cFinishGenNetherSprinkleFoliage. 2014-01-10 16:31:45 +01:00
Mattes D
6943a4df74 Merge pull request #520 from mc-server/SoulSand 
NetherGen: Now generates SoulSand.
 2014-01-10 07:14:19 -08:00
STRWarrior
36c100a53e Fixed recurring pattern. 2014-01-10 16:12:45 +01:00
STRWarrior
6c75cbc8d7 Fixed chunk borders. 2014-01-09 13:30:04 +01:00
madmaxoft
bd17662412 Composition generator creating moved to a separate function. 
Also it forces the defaults into the INI file.
 2014-01-09 10:35:51 +01:00
madmaxoft
1ef20e858f Height generator creating moved info HeiGen.cpp. 
The generator also explicitly sets the default back into the INI file.
 2014-01-09 10:21:26 +01:00
STRWarrior
d462085108 Speed-up. I got about 40 extra ch/s 2014-01-08 22:23:26 +01:00
STRWarrior
5aa34cf77d WormNestCaves now remove soul sand. 2014-01-08 15:34:49 +01:00
STRWarrior
ca8421fe26 NetherGen: Now generates SoulSand. 2014-01-08 15:26:43 +01:00
madmaxoft
39a1bcdea0 More MSVC warning fixes. 2014-01-07 17:07:49 +01:00
madmaxoft
934b90c121 Fixed a few MSVC warnings. 2014-01-07 14:24:25 +01:00
Mike Hunsinger
b93b4c4825 Added function to create Tall Birch tree in BirchTreeForest biomes 2013-12-28 23:49:51 -07:00
STRWarrior
6884d4235e Simplefied Extreme Hills M pattern select. 2013-12-26 14:37:48 +01:00
STRWarrior
b767fd784c Extreme Hills M biomes now generate gravel, stone and grass patterns. 2013-12-25 23:18:33 +01:00
STRWarrior
e282eb73c8 Changed tbGravel. Vanilla has 3 layers of gravel and then stone. 2013-12-25 23:05:22 +01:00
STRWarrior
caf3b6d70c Normal extreme hills (plus) now generate a stone/grass pattern. 2013-12-25 22:43:26 +01:00
STRWarrior
2f59a93f2a Re-added empty line. 2013-12-25 22:10:27 +01:00
STRWarrior
59b80c84fa This generates gravel in Extreme Hills M biomes. 2013-12-25 22:08:41 +01:00
Tycho Bickerstaff
32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00: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
d59e4e6a45 moved generating to globs 2013-12-10 23:22:34 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Tycho Bickerstaff
4c2490ed17 moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 2013-12-08 00:13:31 +00:00
Tycho Bickerstaff
2942e57f93 reordered initalisation order at src/Generating/Cave.h line 73 2013-12-08 00:08:25 +00: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
044fd237b6 Moved bindings-related to a Bindings subfolder. 
Ref.: #407
 2013-12-08 12:17:54 +01:00
madmaxoft
754d991b4f Added floor pattern for MegaTaiga biomes. 2013-11-30 13:34:52 +01:00
madmaxoft
78f0195d26 Implemented mesa biomes in DistortedHeightmap CompoGen. 2013-11-29 21:47:09 +01:00
madmaxoft
cbe8d1aa6d Fixed CheckerboardBiomeGen in negative coords. 2013-11-29 21:45:20 +01:00
madmaxoft
9b881a15ef DistortedHeightmap: Improved speed, prepared for mesa biomes. 
This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
 2013-11-29 18:42:56 +01:00
madmaxoft
f6df5cea87 Trees will generate in the new biomes. 
Only the generic trees, the special variants haven't yet been implemented.
 2013-11-28 22:08:42 +01:00
madmaxoft
057821d9b7 Added new biomes to old composition generator. 
Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
 2013-11-28 21:51:18 +01:00
madmaxoft
95ab73e4ed Added new biomes to old height generators. 
Now Biomal and DistortedHeight generators will work with new biomes.
 2013-11-28 21:15:50 +01:00
madmaxoft
c0a6c2b533 Moved BiomeGen creation from INI file data to BioGen.cpp. 
This way it can be shared between MCServer and BiomeVisualiser.
 2013-11-28 20:15:52 +01:00
madmaxoft
bdd86d7934 BiomeVisualiser: Added the TwoLevel biome generator. 2013-11-28 20:00:30 +01:00
madmaxoft
bec27617a2 Voronoi-related biomegens use the new cVoronoiMap class. 2013-11-27 21:42:34 +01:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Tiger Wang
32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00