Howaner
78fb789631
Fixed a security problem with signs.
2014-11-15 15:16:52 +01:00
Howaner
8c3c11d6b3
Renamed GetSettedViewDistance() to GetRequestedViewDistance()
2014-11-15 14:27:50 +01:00
Mattes D
30fa6a642c
DungeonRooms: Changed to work with the new shape generators.
2014-11-15 11:17:05 +01:00
Howaner
83d3f3347b
Use m_UsedViewDistance and m_SetViewDistance.
2014-11-14 22:53:12 +01:00
Howaner
a0e1e43fc1
Merge branch 'master' into ViewDistance
2014-11-14 22:33:54 +01:00
Mattes D
644240a0e5
Noise3D: Added jungles.
2014-11-14 22:17:11 +01:00
Mattes D
2789fafeb7
Noise3D: Added oceans.
2014-11-13 21:47:39 +01:00
Mattes D
7a3b3aeb3c
Gen refactor: Implemented CompositedHeiGen.
...
This fixes crashes in the Village generator due to the missing generator.
2014-11-13 21:28:50 +01:00
STRWarrior
5584144be2
First implementation for the LargeOakTree
2014-11-13 10:44:36 +01:00
Mattes D
c9a3cb4d3f
Fixed trailing whitespace.
2014-11-12 21:59:42 +01:00
Mattes D
5fb2526e07
Generator: Shape initial refactoring.
...
The code compiles, but several structure generators are broken, crash on start.
2014-11-12 21:24:26 +01:00
Mattes D
b525eee8e0
BiomalNoise3D: Added a few biomes.
2014-11-10 22:08:29 +01:00
STRWarrior
9a50a1fe0c
TallGrassGenerator: Fixed crash when too high
2014-11-10 21:55:13 +01:00
Mattes D
4b95f7c69a
Added BiomalNoise3D shape generator.
2014-11-10 17:00:14 +01:00
Mattes D
5993c06bd7
Noise3d Generator: Fixed unused function error.
2014-11-09 15:33:01 +01:00
Mattes D
c43391fd8c
Noise3D generator: rewritten from scratch.
...
Now it uses three 3D and one 2D perlin noises to generate the terrain, and is highly parametrizable.
2014-11-09 14:34:10 +01:00
Mattes D
136d6b5c30
Noise3D CompoGen: Fixed missing initialization.
2014-11-06 19:25:42 +01:00
Mattes D
58fe37814b
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-11-06 08:55:33 +01:00
Lukas Pioch
13b20d6fe2
renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump
2014-11-05 21:57:38 +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
Lukas Pioch
269d76a208
Simplified FindAndDoWithUUID, formatted line
2014-11-02 21:38:17 +01:00
Lukas Pioch
9f71a4e7ae
Added FindAndDoWithUUID
2014-11-02 21:01:23 +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
Howaner
415c0e128e
... in this world
2014-10-30 21:38:32 +01:00
Howaner
9c7661f50f
Added a MaxViewDistance option.
2014-10-30 21:24:10 +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
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
archshift
8ccb729504
Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE.
2014-10-23 15:03:54 -07:00
archshift
6bcc2c187a
Fix linking on OS X, which does not have librt.
2014-10-23 14:58:42 -07:00
Howaner
9af58a81d6
Use 3 priorities.
2014-10-23 21:19:43 +02:00
Mattes D
32cab75e43
IniFile: Removed an unused macro.
2014-10-23 16:07:43 +02:00
Mattes D
1235ccb1e2
Removed iniFile library from linux dependencies.
2014-10-23 15:26:43 +02:00
Mattes D
449d08cb3d
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
Howaner
72bb299a4a
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
2014-10-23 14:59:42 +02:00
Mattes D
07bbfd5894
Fixed a crash in redstone simulator.
2014-10-23 12:51:59 +02:00
Mattes D
154c329a25
Removed the "conditional expression is constant" warning.
...
MSVC spits out many of these on its own std libraries.
2014-10-23 10:58:41 +02:00
Alexander Harkness
57f822cd0e
Signs can be placed on wallsigns.
...
Fixes #1438
2014-10-23 08:07:20 +01:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Mattes D
2ac3a807b7
ComposableGenerator: Removed nullptr initializers.
2014-10-22 22:58:36 +02:00
Mattes D
7ed27c6b80
LuaState: Projectiles are pushed using their full class.
2014-10-22 16:06:32 +02:00
Mattes D
b979cad893
cItemFrame: Fixed a forgotten rename.
2014-10-21 22:32:17 +02:00
Mattes D
814e4404bb
Merge pull request #1515 from mc-server/BlockFixes
...
Block fixes
2014-10-21 22:04:51 +02:00
Mattes D
a42fa071bc
Properly exported cItemFrame and cHangingEntity to Lua.
2014-10-21 22:02:30 +02:00
Mattes D
881bc66233
Fixed trailing whitespace.
2014-10-21 22:00:31 +02:00
Mattes D
0c0c762412
Exported individual projectile classes to Lua API.
...
They used to be exported, but then they were moved to separate files and those werent' added to the ToLua processing list.
2014-10-21 21:25:52 +02:00
Howaner
6f99615ceb
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/World.h
2014-10-21 21:16:04 +02:00
Howaner
4fe41839cc
Reverted hook move.
2014-10-21 21:13:35 +02:00
Howaner
2d63967551
style.
2014-10-21 18:32:02 +02:00
Mattes D
bcb839d07b
Merged branch 'master' of git://github.com/sriehl/MCServer
2014-10-21 18:12:40 +02:00
Howaner
f800f3c998
Moved tall grass pickups handle.
2014-10-21 18:06:44 +02:00
Howaner
283eda3c4e
Merge branch 'master' into BlockFixes
2014-10-21 17:37:03 +02:00
Howaner
b0988e65aa
Use two lists and 2 chunk send prioritys.
2014-10-21 17:35:23 +02:00
Howaner
a07456d712
New c++11 stuff.
2014-10-21 17:00:41 +02:00
Howaner
44514e53fc
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Mattes D
dc4185fb86
cLuaState: cEntity is pushed with specific type.
2014-10-21 12:43:06 +02:00
Julian Laubstein
48470c858b
Fixed #1550
2014-10-20 19:36:16 +02:00
Mattes D
b78078a3a6
Fixed a potential crash in cEntity bindings.
2014-10-20 17:32:09 +02:00
Julian Laubstein
4a58ce1df6
Found it!
2014-10-20 16:00:33 +02:00
Julian Laubstein
d2cc1e0cd3
Fix for fix #1552
2014-10-20 15:58:08 +02:00
