Mattes D
0d15261601
cEvent: Changed steady_clock to system_clock.
2014-11-04 15:47:55 +01:00
Mattes D
6201b3602c
Merge branch 'master' into c++11Events
2014-11-04 15:45:08 +01:00
Mattes D
7d2b2f90b6
MinMax heigen: Reduced the number of octaves.
...
They didn't affect the terrain that much anyway.
2014-11-04 08:41:18 +01:00
Mattes D
f239a28d06
Added MinMax height generator.
...
Fixes #1578 .
2014-11-04 08:40:23 +01: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
ca29683738
HeiGen: Moved construction to the end of file.
...
This will allow us to define generators in the cpp file instead of needing them in the header, thus speeding up compilation on changes.
2014-11-03 08:17:19 +01:00
Mattes D
dbed5c0726
Grown biomes: fixed Linux build.
2014-11-02 16:47:56 +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
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
Mattes D
13f0e93d69
GrownProt biomes: added alterations.
2014-10-31 12:52:07 +01:00
Howaner
d93acb841f
Fixed m_SentChunks list chunk removing.
2014-10-30 22:04:04 +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
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
Howaner
373b139ed6
Forgotten m_SendChunksMediumPriority.empty() check.
2014-10-28 21:32:01 +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
Mattes D
aff537e714
Added type to block type enum.
2014-10-26 10:13:43 +01:00
Mattes D
b9777287ca
Moved the chrono include into Globals.
2014-10-24 11:01:45 +02:00
Mattes D
4b32c00f66
Added a missing chrono include.
2014-10-24 10:22:17 +02:00
Mattes D
2940ced832
Merge branch 'master' into c++11Events
2014-10-24 10:13:54 +02:00
Mattes D
190d34e2f7
Merge pull request #1565 from mc-server/MergedIniFile
...
Merged ini file
2014-10-24 09:13:39 +02:00
Mattes D
e272637ff5
IniFile: Removed the problematic printf-like Set function.
...
It wasn't used in any client code anyway.
2014-10-24 08:49:36 +02:00
archshift
dd86c1f4a3
OSSupport/CMakeLists.txt: fixed indentation
2014-10-23 23:49:20 -07:00
worktycho
d5dfacae87
Fixed formatstring
2014-10-23 23:23:34 +01:00