1
0
Commit Graph

7572 Commits

Author SHA1 Message Date
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
0dd804a591 Merge branch 'master' into GrownBiomes 2014-10-31 19:27:35 +01:00
Mattes D
2b7f34515a cLuaState: Fixed errors on non-existent callbacks.
This mostly affected table-based callbacks, such as the cLineBlockTracer. If a callback didn't exist, the code would still push its arguments on the stack, breaking the next callback.
2014-10-31 19:25:45 +01:00
Mattes D
e2ffd5429c Fixed missing CS lock in cChunkMap::WakeUpSimulatorsInArea(). 2014-10-31 19:25:44 +01:00
Alexander Harkness
ce2439fd1b Update README.md 2014-10-31 13:43:15 +00:00
Mattes D
13f0e93d69 GrownProt biomes: added alterations. 2014-10-31 12:52:07 +01:00
Mattes D
c6e8da893e QtBiomeVisualiser: Fixed default zoom selection. 2014-10-31 12:26:12 +01:00
Howaner
d93acb841f Fixed m_SentChunks list chunk removing. 2014-10-30 22:04:04 +01:00
Mattes D
f25e268ca0 QtBiomeVisualiser: Set start zoom to 25%, just like AMIDST. 2014-10-30 16:54:23 +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
93f33b7d4e Merge remote-tracking branch 'origin/master' into GrownBiomes 2014-10-30 12:50:55 +01:00
Mattes D
30db6d9852 Merge pull request #1576 from mc-server/QtBiomeVisualiserThreadedGen
QtBiomeVisualiser: Generator uses all machine threads.
2014-10-30 12:22:15 +01:00
Mattes D
4e0cef0ff6 QtBiomeVisualiser: Generator uses all machine threads.
The previous limit of 1 thread was lifted, now the generator source runs on all CPU threads available.
2014-10-29 23:04:59 +01:00
Mattes D
d898fb904b Merge pull request #1575 from mc-server/1.8-Item
Fixed 1.8 world item format reading.
2014-10-29 22:35:16 +01:00
Howaner
165533c27e Fixed 1.8 world item format reading. 2014-10-29 15:47:43 +01:00
Mattes D
f34b1291be Grown biomes: made biomes smaller, made beaches smaller. 2014-10-29 15:28:27 +01:00
Mattes D
791f891212 Merged branch 'master' into GrownBiomes. 2014-10-28 22:29:46 +01:00
Mattes D
48ac3acc84 QtBiomeVisualiser: Added quick shutdown to region loaders.
Now the app shuts down immediately even if regions are queued for loading.
2014-10-28 22:19:24 +01:00
Mattes D
3168a95404 QtBiomeVisualiser: Fixed mouse zoom vs menu zoom. 2014-10-28 22:15:42 +01:00
Mattes D
2f0abb73c9 Merge pull request #1574 from mc-server/QtBiomeVisualiserRegions
QtBiomeVisualiser: Switched caching to entire regions.
2014-10-28 22:07:09 +01:00
Howaner
373b139ed6 Forgotten m_SendChunksMediumPriority.empty() check. 2014-10-28 21:32:01 +01:00
Mattes D
bea2edb2a9 QtBiomeVisualiser: Reduced memory usage. 2014-10-28 20:52:04 +01:00
Mattes D
3f3a2a6755 QtBiomeVisualiser: Fixed random regions not rendered. 2014-10-28 20:49:29 +01:00
Mattes D
6a1a76e73d Merged remote-tracking branch 'origin/master'. 2014-10-28 19:42:35 +01:00
Mattes D
d6c663cbc5 QtBiomeVisualiser: Fixed compilation on Linux. 2014-10-28 15:44:58 +01:00
Mattes D
53ff5c527c QtBiomeVisualiser: Attempt at fixing Linux compilation. 2014-10-28 11:23:54 +01:00
Mattes D
2d7cbfe620 Merge pull request #1573 from mc-server/warningfixes
Fixed some more warnings.
2014-10-28 00:44:48 +01:00
Mattes D
c53b7e5d38 QtBiomeVisualiser: Switched caching to entire regions.
This speeds up the rendering preparation for small zooms.
2014-10-27 23:58:09 +01:00
Alexander Harkness
232343065f Fixed compile (typos). 2014-10-27 22:03:11 +00:00
Alexander Harkness
dbe7c8b170 Comment alignment. 2014-10-27 21:38:00 +00:00
Alexander Harkness
a4932bbd8b CheckBasicStyle'd 2014-10-27 21:34:02 +00:00
Alexander Harkness
b67eb2169e Another one.# 2014-10-27 20:16:51 +00:00
Alexander Harkness
7de8757ac9 Fixed more warnings.
It's ugly though.
2014-10-27 20:05:34 +00:00
Alexander Harkness
59ca542c28 Another switch. 2014-10-27 19:53:16 +00:00
Alexander Harkness
0cdf262053 Fix missing biomes in enum. 2014-10-27 19:52:04 +00:00
Alexander Harkness
6e21897bc6 Fixed remaining warnings. 2014-10-27 19:49:52 +00:00
Alexander Harkness
c0a9a83abf Actually fixed the warning. 2014-10-27 18:09:34 +00:00
Alexander Harkness
8a443c028f Test warning fix. 2014-10-27 17:11:31 +00:00
Alexander Harkness
cbb637187e Fixed typo. 2014-10-27 16:46:30 +00:00
Alexander Harkness
11a80b5d09 Pocess? 2014-10-27 16:46:17 +00:00
Mattes D
a068ebf3e0 cIntGen: Added a virtual destructor. 2014-10-27 09:48:57 +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
7d6db6f33d IntGen: Attempt at fixing Linux compilation. 2014-10-26 22:59:59 +01:00
Mattes D
74df4618de BioGenGrown: Smaller biomes, add land to map center. 2014-10-26 22:56:02 +01:00
Mattes D
dcbe1717cc Fixed a copypasta error in cIntGenAddToOcean. 2014-10-26 21:35:24 +01:00
Mattes D
dcad6d3626 Added a missing header to CMakeLists. 2014-10-26 20:12:29 +01:00
Mattes D
7e1d603080 Added new biomegen: Grown 2014-10-26 19:58:16 +01:00
Mattes D
ec8c050666 Added IsBiomeVeryCold() and IsBiomeCold() functions. 2014-10-26 18:17:04 +01:00