p-mcgowan
cb584a87bd
cacti no longer spawn outside of desert variants
2014-12-01 11:44:20 -08:00
STRWarrior
7586069829
Using static cast for Dungeon spawners
2014-12-01 19:07:54 +01:00
STRWarrior
ca728da9b6
Using static cast for MineShaft spawners
2014-12-01 19:05:44 +01:00
STRWarrior
25e3869485
Mineshaft spawners now spawn cave spiders
2014-12-01 18:47:39 +01:00
Howaner
8e753fa590
Added cocoa pod.
2014-12-01 18:10:37 +01:00
STRWarrior
c0b08a6c1e
Dungeons spawners now spawn mobs
...
25% for a spider, 25% for a skeleton and 50% for a zombie spawner.
2014-12-01 17:51:20 +01:00
STRWarrior
1bf0827a2f
Simplefied SoulsandRims
...
Replaced two for loops with a single if
2014-12-01 17:29:35 +01:00
STRWarrior
cd0081bb67
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-12-01 16:39:42 +01:00
STRWarrior
fa4a85c915
Added better soulsand rims
...
As a finisher called SoulsandRims
2014-12-01 16:36:48 +01:00
Howaner
bcbd73f7d8
MobSpawner fixes.
2014-12-01 14:58:13 +01:00
Howaner
677dde51bd
Merge branch 'master' into MobSpawner
...
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
2014-12-01 14:43:03 +01:00
Mattes D
36500f88b2
Merge pull request #1624 from mc-server/LuaDeprecating
...
Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead
2014-12-01 09:50:34 +01:00
Mattes D
cc313c91ab
DistortedHeightmap: Added missing initialization.
...
This was probably the original cause for the "empty chunks".
Fixes #1433 .
2014-12-01 00:14:27 +01:00
Mattes D
f0ad6221c3
Noise3D: Fixed missing initialization.
...
This should fix terrain being at Y=0 or Y=255 for the spawn chunk.
Fixes #1433 .
2014-12-01 00:09:58 +01:00
Howaner
6adf749164
Merge branch 'master' into MobSpawner
2014-11-30 19:38:52 +01:00
STRWarrior
e972c52e54
Hopefully fixed random build fails
2014-11-30 18:44:44 +01:00
Mattes D
db0f791d43
Fixed a crash in cSpawnPrepare.
2014-11-30 18:19:29 +01:00
STRWarrior
65dc452923
Fixed nether ceiling
2014-11-30 16:34:41 +01:00
Howaner
7049db5bf8
Fixed compiling on linux.
2014-11-30 14:23:51 +01:00
Mattes D
a73c800377
Improved comments for cWorld::DoWithPlayer().
2014-11-30 11:11:47 +01:00
Howaner
c173bf61ad
Removed old StringToMobType() function from Monster.cpp
2014-11-30 02:29:17 +01:00
vincentleung1
438a9b04cb
Changed Kick message
2014-11-29 16:05:22 -08:00
vincentleung1
9caa3b19c1
removed extra space and fixed some formatting in cCallback
2014-11-29 15:59:48 -08:00
Vincent
20dcceb7e6
removed GetUsernames() from World
2014-11-29 15:46:31 -08:00
Vincent
72797b14fe
Uses callback for players already in World.
2014-11-29 15:44:38 -08:00
Mattes D
e0a846d805
Removed unneeded include.
2014-11-29 23:55:15 +01:00
Mattes D
abbe18c0ab
Fixed QtBiomeVisualiser compilation.
2014-11-29 23:55:06 +01:00
Mattes D
201313a9f8
Added a basic stacktracing for assert and signal failures.
2014-11-29 23:06:10 +01:00
Vincent
a7bf2725c8
fixed naming of strings and changed from i to I
2014-11-29 11:22:03 -08:00
Howaner
c673eb590f
Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead
2014-11-29 15:40:38 +01:00
Howaner
473cb6e0b2
Removed unused imports.
2014-11-29 15:22:24 +01:00
Howaner
2478e290f9
Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.
2014-11-29 15:20:44 +01:00
Howaner
648fee1a08
Merge branch 'master' into MobSpawner
2014-11-29 12:05:35 +01:00
Vincent
61e761fdc2
issue 1253 - prevent multiple logins with same username
2014-11-29 00:36:15 -08:00
Mattes D
1480cdb944
Chunk: Fixed same-name iterators.
2014-11-27 23:15:08 +01:00
Mattes D
4545b8eed9
OctavedNoise: Another unshadowed local variable.
2014-11-27 23:13:40 +01:00
Mattes D
12ad2a07c0
Minecart.h: Fixed integral conversion warning.
2014-11-27 22:50:18 +01:00
Mattes D
2cff4e8c83
RidgedNoise: Replaced fabs with std::abs().
2014-11-27 22:48:31 +01:00
Mattes D
9f24c0c4da
OctavedNoise: Unshadowed a local variable.
2014-11-27 22:44:02 +01:00
Mattes D
a6ed5cb1d8
BlockEntities: Removed the extra semicolon.
2014-11-27 22:42:08 +01:00
Mattes D
186b2f3bd0
Replaced auto_ptr with unique_ptr.
2014-11-27 21:27:03 +01:00
Mattes D
61ce09e4d0
CompoGenBiomal: Fixed signed vs unsigned comparison.
2014-11-27 21:24:03 +01:00
Mattes D
e3e13f552f
Fixed BlockStringToType return value.
...
-1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
2014-11-27 21:19:52 +01:00
Mattes D
a971dee379
CMake: Fixed linux builds.
2014-11-26 12:45:53 +01:00
Mattes D
a9e77fe7da
cRoot: Fixed a memory leak with cRankManager.
2014-11-26 11:00:46 +01:00
Mattes D
413e5c20fe
Windows: Fixed builds with LeakFinder enabled.
2014-11-26 11:00:21 +01:00
Mattes D
0ca891da6d
WSSAnvil: Fixed bad code in arrow loading.
2014-11-26 10:14:11 +01:00
Tiger Wang
187bdab4fa
Merge remote-tracking branch 'origin-master' into c++11
2014-11-25 23:03:33 +00:00
Mattes D
c1a52dc9fb
ClientHandle: Fixed max block place distance check.
...
Fixes #1492
2014-11-25 21:24:25 +01:00
Mattes D
9f4562289e
Merge pull request #1604 from mc-server/GeneratorShapeRefactor
...
Generator shape refactor
2014-11-24 21:56:25 +01:00
Mattes D
e23bde503f
Merge pull request #1611 from mc-server/SpawnPrepare
...
cWorld: Rewritten spawn preparation.
2014-11-24 15:39:05 +01:00
Mattes D
3e068a01a8
Changed back capitalization.
2014-11-24 13:44:15 +01:00
Mattes D
478bbad5ed
Added TwoHeights shape generator.
...
This is a faster shape generator that can generate overhangs and has biome awareness.
2014-11-23 18:16:20 +01:00
Tiger Wang
2ae4d2a96a
Removed unnecessary #includes
2014-11-23 17:13:40 +00:00
Tiger Wang
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
Tiger Wang
6382989ba0
Compilation fixes
2014-11-23 14:22:05 +00:00
Mattes D
9f4342434b
Noise3D generator: Enlarged averaging to avoid steep beach slopes.
2014-11-23 15:10:55 +01:00
Mattes D
e9797c6a2a
Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor
2014-11-23 12:33:04 +01:00
p-mcgowan
7a08c05787
formatting - newline at EOF inserted: Pig.cpp
2014-11-22 15:48:05 -08:00
p-mcgowan
d1b7a965d1
pigs turn into pigmen on lightning
2014-11-22 15:33:34 -08:00
Mattes D
b520f336da
cWorld: Rewritten spawn preparation.
...
It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting).
Fixes #1597 .
2014-11-22 16:00:19 +01:00
p-mcgowan
793b1012c4
formatter error
2014-11-21 23:58:35 -08:00
p-mcgowan
635e9321c6
villagers turn into witches on lightning
2014-11-21 23:36:35 -08:00
p-mcgowan
ac2e3ede1d
villagers turn into witches when struck by lightning
2014-11-21 23:20:44 -08:00
Mattes D
a05a318cdd
cWorld: Changed generator defaults.
2014-11-20 22:51:07 +01:00
Mattes D
1ed32b825e
BiomalNoise3D generator: finished all biomes.
2014-11-20 22:48:14 +01:00
Mattes D
b7dd2dddf9
CompoGenBiomal: Fixed sealevel offset.
2014-11-20 22:45:50 +01:00
Mattes D
f3e9fa74d2
Merge pull request #1594 from mc-server/LargeOakTree
...
Large Oak Tree
2014-11-20 21:30:50 +01:00
Mattes D
1e887d1381
CompoGenBiomal: Fixed sealevel not generating properly.
2014-11-20 18:05:30 +01:00
Mattes D
76058e8183
Generators: Unified SeaLevel into a single variable.
...
It is shared between shape generators and composition generators and there's no sense in having two different values for those.
2014-11-20 15:31:03 +01:00
Mattes D
5325885ef4
Noise3D generators: Changed noise generator to InterpolNoise.
2014-11-20 14:45:20 +01:00
Mattes D
288cbf12cb
Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor
2014-11-20 10:13:10 +01:00
Mattes D
f1bddc607c
Merge pull request #1603 from mc-server/ImprovedNoise
...
Improved noise
2014-11-20 09:26:05 +01:00
Mattes D
fef4133f6d
cInterpolNoise: Implemented optimized 2D generating.
2014-11-19 16:58:27 +01:00
Mattes D
b177ff8ec5
cOctavedNoise: Removed misleading comment, fixed assert texts.
2014-11-19 16:52:56 +01:00
Mattes D
d7d4fcbdfe
cOctavedNoise: Added a forgotten comment.
2014-11-18 23:22:09 +01:00
Mattes D
c048f2bd95
Added a cInterpolNoise template for faster noise generator.
...
Used an instance of it in the Noise3D generator.
2014-11-18 23:21:57 +01:00
Howaner
8b028c5c78
Finished mob spawner implementation.
2014-11-18 15:33:41 +01:00
Howaner
42120e2ea5
Merge branch 'master' into MobSpawner
...
Conflicts:
MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Mattes D
2467d29a4e
Moved all Noise-related files into a separate folder.
2014-11-18 12:07:08 +01:00
Mattes D
f683872f54
Refactored cRidgedNoise into a separate template.
...
This allows us to make the ridges out of any noise and to combine the cRidgedNoise with cOctavedNoise.
2014-11-18 09:49:53 +01:00
Mattes D
8c54fc0f7d
OctavedNoise: linux compilation fixes.
2014-11-18 09:23:45 +01:00
Mattes D
9ece37e8f1
Merge pull request #1598 from mc-server/SignEditor
...
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
Mattes D
e9082263c9
Added cOctavedNoise template.
...
This allows us to use any noise generator in the combination of octaves.
2014-11-17 23:02:53 +01:00
Howaner
d7efece5f2
Use cLuaState's stack trace.
2014-11-17 18:01:56 +01:00
Mattes D
faf0ce3d7f
Fixed include path.
2014-11-17 17:13:42 +01:00
Mattes D
f9cfc36643
Added cImprovedNoise implementation.
2014-11-17 16:50:28 +01:00
Howaner
0e491273c1
Added UpdateSign() method to DeprecatedBindings.cpp
2014-11-17 14:57:24 +01:00
Mattes D
ae15c2f78e
Fixed a wrong assert in cClientHandle::SetViewDistance().
2014-11-17 12:34:14 +01:00
STRWarrior
ff036c9cef
Changed comment
...
Suggestion by xoft
2014-11-16 19:50:57 +01:00
Mattes D
95e59056a1
BiomalNoise3D: Added more biomes.
2014-11-16 19:03:00 +01:00
Howaner
277151582f
Use LastPlacedSign instead of LastPlacedBlock.
2014-11-15 22:36:31 +01:00
Howaner
09cea625fc
Renamed m_UsedViewDistance to m_CurrentViewDistance
2014-11-15 22:26:54 +01:00
Mattes D
1240e583d2
Mobs: Fixed crash with terrain too high.
2014-11-15 21:45:57 +01:00
Mattes D
564b9ad337
Generator: Fixed crash with trees too high.
2014-11-15 21:45:24 +01:00
Mattes D
b0bcd75732
Snow generator: Fixed failure at top of the world.
2014-11-15 20:24:15 +01:00
Mattes D
889aa7404d
ChunkDesc: Fixed comment about indexing.
2014-11-15 20:23:47 +01:00
Howaner
927d8d7702
Renamed m_SetViewDistance to m_RequestedViewDistance
2014-11-15 15:33:42 +01:00
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
5dbf601824
cEvent: Changed chrono duration resolution.
2014-11-04 15:56:27 +01:00
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
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
Tiger Wang
de46c2bcec
Improved redstone simulator
...
* Fixed style inconsistencies
* Used more C++11 features
* Improved speed perhaps
2014-10-29 16:02:59 +00: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
Tiger Wang
85c298d73e
Cleaned up simulators
2014-10-25 21:54:00 +01:00
Tiger Wang
6fbc98def2
Fixed some block checks
...
* Fixes #1330
2014-10-25 00:22:31 +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
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +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
Tiger Wang
51fa6b4090
Suggestions
2014-10-23 23:58:01 +01: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
82472d09ac
Reimplemented cEvent using C++11 primitives.
...
Fixes #1523 .
2014-10-23 11:20:25 +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
Mattes D
27687cfcd4
Added FastRandom.* back to CMakeLists.txt.
2014-10-23 08:41:57 +02:00
Mattes D
f8c54f4243
Merged branch 'master' into c++11.
2014-10-23 08:40:39 +02: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
Alexander Harkness
d0766fcea8
Missing EOL.
2014-10-21 14:21:08 +01:00
Alexander Harkness
8299b0920f
Alignment.
2014-10-21 14:19:58 +01:00
Alexander Harkness
3e0f7c2b1c
Missing space.
2014-10-21 14:17:36 +01:00
Alexander Harkness
8ddc40e44b
Missing space fix.
2014-10-21 14:17:04 +01:00
Tiger Wang
2b920f9e21
Compile fix?
2014-10-21 13:49:53 +01:00
Tiger Wang
014ebb7fe6
Windows close handlers handles more closes
2014-10-21 13:41:08 +01:00
Tiger Wang
5089f04cf6
Replace &*[0] accesses with .data()
2014-10-21 13:20:06 +01:00
Mattes D
dc4185fb86
cLuaState: cEntity is pushed with specific type.
2014-10-21 12:43:06 +02:00
Tiger Wang
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
Tiger Wang
a324333c11
Use std::recusive_mutex
2014-10-20 21:26:18 +01:00
Tiger Wang
2334c8dd9d
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-10-20 19:01:53 +01:00
Tiger Wang
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01: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
Julian Laubstein
c2560cc1be
Added error message
2014-10-20 15:08:48 +02:00
Julian Laubstein
1a46feda43
Added error handling to load <plugin> command
2014-10-20 14:46:24 +02:00
Mattes D
8fbd65e775
Merge pull request #1549 from SphinxC0re/master
...
Added mechanics placeable on halfslabs
2014-10-19 19:13:48 +02:00
Mattes D
ee23fd5b9e
Removed obsolete tr1::shared_ptr.
2014-10-19 18:52:24 +02:00
Mattes D
cf73fee7e3
Fixed minor style issues.
2014-10-19 18:45:42 +02:00
Mattes D
262e6d06aa
TwoLevel BioGen: fixed swapped inside and outside biomes.
2014-10-19 16:07:29 +02:00
Julian Laubstein
3082f0d046
Fixed error with non-const function
2014-10-19 15:11:53 +02:00
Tiger Wang
aa19a3afb0
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
Julian Laubstein
403f8581cf
Added mechanics placeable on halfslabs
2014-10-19 15:01:01 +02:00
Mattes D
3ee47df118
Mountain height gen: Added ditches.
2014-10-19 14:35:49 +02:00
Mattes D
e0cfbc4d85
Generator: Rewritten to use SharedPtrs.
2014-10-19 14:01:59 +02:00
Tiger Wang
cc600de51f
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-10-19 12:34:05 +01:00
Mattes D
d50bbf3899
cLuaState: cMonster descendants don't push their specific type.
...
The individual mob types aren't exported to Lua, so pushing them would crash the server.
2014-10-19 12:49:54 +02:00
Mattes D
b0a59927fb
cLuaState: cBlockEntity descendants are pushed with proper class type.
2014-10-19 12:46:25 +02:00
Mattes D
ebd31ff132
LuaState: Pushing a cEntity pushes the correct class name.
...
This makes Lua scripts easier, as they don't need to cast values from cEntity to the specific descendant.
2014-10-19 11:46:38 +02:00
Mattes D
fe153cc763
Bindings: Removed obsolete codegen files.
...
LuaState_Call.inc is no longer needed, it was replaced with variadic templates.
2014-10-19 11:32:17 +02:00
Tiger Wang
6d5a8892f3
Use std::thread
2014-10-19 00:29:34 +01:00
Tiger Wang
2874bf73be
Merge pull request #1502 from mc-server/furnaces
...
Improved furnaces
2014-10-18 21:33:55 +01:00
Tiger Wang
eb821ff240
Fixed failure for cRankManager to restart
2014-10-18 19:55:01 +01:00
Tiger Wang
6a22b63473
Furnaces now update their block entity type
...
Therefore improving cChunk's variable boundary checking.
2014-10-18 19:54:34 +01:00
Alexander Harkness
f280c36f9d
Simpler code.
2014-10-18 16:12:12 +01:00
Mattes D
687752241f
cMojangAPI: Don't update data if server is in offline mode.
2014-10-17 13:57:18 +02:00
Mattes D
803666d480
LuaChunkStay: Fixed a crash on unused callback.
2014-10-17 13:17:56 +02:00
Alexander Harkness
59902c28f2
Nullptr?
2014-10-16 20:21:33 +01:00
Mattes D
8c2a99711e
Merged branch 'fix_chunks'.
2014-10-16 21:12:26 +02:00
Alexander Harkness
818c7948b7
Fixed a number of stylistic issues.
2014-10-16 19:08:22 +01:00
Mattes D
5b9ca4a7b4
Merge pull request #1541 from mc-server/VariadicTemplates
...
cLuaState::Call() uses variadic templates
2014-10-16 18:47:11 +02:00
worktycho
25ebedbe45
Use universal references
2014-10-16 15:11:35 +01:00
STRWarrior
132a92226b
Merge branch 'master' into DungeonLoot
...
Conflicts:
src/ItemGrid.cpp
2014-10-16 11:43:59 +02:00
STRWarrior
07b5ce0c54
Changed i variable to j
...
The server wasn't going over all the items before.
2014-10-16 11:17:39 +02:00
Mattes D
799ae87d3f
BioGen: Fixed a compiler warning.
2014-10-16 11:00:30 +02:00
STRWarrior
5ed6d280ce
Reversed wrong fix for #1517 .
2014-10-16 10:26:17 +02:00
STRWarrior
3f0d4fe250
Reversed the order of the loot
...
For some reason the rare items weren't generating at all.
Added forgotten Golden Apple
2014-10-15 22:10:14 +02:00
STRWarrior
08676128b0
Added loot to dungeons.
2014-10-15 21:15:12 +02:00
STRWarrior
0bdd2768ff
Fixed possible crash
...
It could crash if MinAmount - MaxAmount was 0 because it would execute (Number % 0)
2014-10-15 19:46:43 +02:00
Mattes D
06b466471f
Merge pull request #1536 from mc-server/MineshaftBooks
...
Mineshaft books
2014-10-15 19:23:53 +02:00
Mattes D
f58d44ea50
cLuaState::Call() uses variadic templates.
...
(doesn't compile)
2014-10-15 19:18:23 +02:00
Mattes D
eeb580a74e
Functions in cPluginManager get references instead of pointers.
2014-10-15 19:09:09 +02:00
STRWarrior
4038e1cb42
Using C++11 loops
2014-10-15 18:11:28 +02:00
STRWarrior
fa6f8fb38e
The code now prevents conflicting enchantments.
2014-10-15 15:44:52 +02:00
STRWarrior
0cdd2b64ed
IntNoise1DInt result gets devided by 7 first
...
suggestion by xoft
2014-10-15 15:42:45 +02:00
STRWarrior
57f8d2a55e
Adding enchantments directly instead of first getting the name of it.
2014-10-15 15:31:06 +02:00
STRWarrior
e4ee71868e
Renamed the counter to 'j'
2014-10-15 15:25:48 +02:00
STRWarrior
ff5f57514e
Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to before
...
Added cEnchantment:GenerateEnchantmentFromVector that allows to get the same enchantments over and over.
2014-10-15 14:44:07 +02:00
STRWarrior
e3aa6e4857
Enchanted books generate in MineShafts chests
2014-10-15 14:08:45 +02:00
Mattes D
c6725f8d28
Usernames are lowercased before generating offline UUID.
...
This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization.
2014-10-15 13:41:23 +02:00
Mattes D
7f8118e0cb
cWorld: Fixed scheduler.
...
Fixes #1534 .
Added a test case into the Debuggers plugin.
2014-10-13 14:49:18 +02:00
Mattes D
1eae7d0ece
Fixed style.
2014-10-13 10:34:33 +02:00
Mattes D
120b347fb5
CheckBasicStyle ignores the Bindings.h generated file.
2014-10-13 10:33:08 +02:00
Mattes D
53410a9271
Merge pull request #1529 from mc-server/unique_ptr
...
Moved a few objects to unique_ptr
2014-10-12 22:08:28 +02:00
worktycho
fff9e50109
Aligned simulators
2014-10-12 12:44:59 +01:00
worktycho
daadde2077
Fix style
2014-10-12 12:18:52 +01:00
worktycho
6a448be88c
Fix spaces
2014-10-12 12:17:29 +01:00
worktycho
8dfeb6e324
Update World.cpp
2014-10-12 12:15:52 +01:00
Steven Riehl
4a25760363
fix std:min call, include algorithm and compare same type
2014-10-11 21:36:40 -06:00
Steven Riehl
dfd4e15ecb
refactor an if block to std::min
2014-10-11 21:18:57 -06:00
Steven Riehl
856764dee8
convert old style casts to fix warnings
2014-10-11 20:39:55 -06:00
Alexander Harkness
6af9d5ba01
Fixed compilation.
2014-10-11 18:39:46 +01:00
Alexander Harkness
93833069a8
Merge branch 'master' into issue850
...
Conflicts:
src/BlockID.h
2014-10-11 18:32:21 +01:00
Alexander Harkness
68762747e0
Fixed typo and removed useless right side up slab meta.
2014-10-11 16:59:13 +01:00
worktycho
1a07dc897d
Fix lambda capture
2014-10-11 14:43:06 +01:00
tycho
473c0425d3
Moved a few objects to unique_ptr
2014-10-10 15:33:19 +01:00
Mattes D
a47d9e5334
Fixed MSVC compilation.
2014-10-10 09:58:54 +02:00
archshift
76b37acb42
Float/Ciel: If it's going to use C++11, it might as well take advantage of it
2014-10-09 14:57:57 -07:00
archshift
f8d1e96ae7
Use static casts instead of C casts, add floor-cast functions
2014-10-09 14:57:40 -07:00
Mattes D
f91aa6f1d3
DistortedHeightmap: Fixed crash on number rounding.
...
Fixes #1521 .
2014-10-09 12:33:42 +02:00
STRWarrior
e95ee55974
Added comments to the GetAcaciaTreeImage function
2014-10-08 21:32:09 +02:00
STRWarrior
36fa1c5c73
Using array with possible directions.
2014-10-08 21:25:59 +02:00
STRWarrior
68a54c90c9
Added AcaciaTrees for the savanna biomes
2014-10-08 20:31:16 +02:00
Howaner
97623fc634
Added distance check.
2014-10-07 21:36:01 +02:00
Howaner
7631047bb7
Leaves are harvest-able.
2014-10-07 18:24:22 +02:00
Howaner
a5e09155c0
Corrected drops from dead bush, tall grass and cobweb.
2014-10-07 18:21:39 +02:00
Howaner
e8e428a806
Corrected IsBlockAttachable() in BlockVine.h
2014-10-07 16:48:37 +02:00
Howaner
fec509935d
Removed BlockHaybale.h from CMakeLists.txt
2014-10-07 15:39:24 +02:00
Howaner
e3a69a527d
Removed unused cBlockHayBaleHandler.
2014-10-07 15:02:51 +02:00
Mattes D
2a32dd2740
Merge pull request #1513 from mc-server/MojangAPIRefresh
...
cMojangAPI: Added periodical refreshes.
2014-10-07 11:23:49 +02:00
Howaner
b493beb3bb
Stream 4 chunks per tick. Added priority.
2014-10-06 21:27:53 +02:00
Howaner
a59f2d15fb
Merge branch 'master' into ChunkLoader
2014-10-06 17:38:42 +02:00
Howaner
5a6b86180e
Better StreamNextChunk() method
2014-10-06 17:38:17 +02:00
madmaxoft
4e82a58060
Fixed crash in ForEachEntityInBox API.
...
Fixes #1511 .
2014-10-06 13:48:44 +02:00
Mattes D
3d2d8a096b
cMojangAPI: Added periodical refreshes.
2014-10-06 10:05:02 +02:00
Mattes D
89713e23e4
Merge pull request #1510 from mc-server/TimedEvent
...
Added a cEvent::Wait() with timeout.
2014-10-06 09:24:51 +02:00
worktycho
a20bd0dbbd
Update CMakeLists.txt
2014-10-05 23:44:55 +01:00
madmaxoft
c94e82980e
Fixed a missed value.
2014-10-05 22:56:56 +02:00
madmaxoft
112fac5798
Removed obsolete cMonster::eType.
...
Has been replaced with global eMonsterType.
2014-10-05 22:12:25 +02:00
madmaxoft
77c5b410e6
Fixed eMonsterType Lua API mismatch.
2014-10-05 22:09:19 +02:00
Mattes D
a8aeceab9d
cClientHandle: Added protocol version knowledge.
2014-10-05 20:19:21 +02:00
Mattes D
ec71ffcc80
Added a cEvent::Wait() with timeout.
2014-10-05 19:04:30 +02:00
win32re
f8c1da4a71
Fixes #1503 - No gravel is being generated
2014-10-04 14:02:40 +02:00
Mattes D
db98820aa9
Merge pull request #1489 from mc-server/fixes
...
Improved torch handler
2014-10-04 10:02:10 +02:00
Tiger Wang
79e9de8d67
Comment suggestions
2014-10-03 21:38:23 +01:00
Tiger Wang
b5a2c6667a
Improved furnaces
...
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
Howaner
382e014ebc
Optimized chunk loader
2014-10-02 23:50:41 +02:00
Alexander Harkness
2f945475f2
Fix spelling of PRISMRAINE
...
Fixes #1497
2014-10-02 07:22:12 +01:00
Masy98
3591edd47e
Fixed sorting
2014-10-01 19:26:36 +02:00
Masy98
d37b047ebe
Merge branch 'master' into blocks
2014-10-01 19:23:43 +02:00
Masy98
0d2a041a69
Fixed Red Sandstone and Prismarine drops
2014-10-01 19:13:59 +02:00
Mattes D
ecef85574d
Merge pull request #1493 from Masy98/blocks
...
Added missing 1.8 blocks, E_METAs and sounds
2014-10-01 18:28:07 +02:00
Masy98
1d875d0bc8
Added Daylight Sensors to the "can't push" list
2014-10-01 18:08:31 +02:00
Masy98
0f0763303e
Fixed ":"
2014-10-01 18:00:51 +02:00
Masy98
cc9e598803
Added missing 1.8 blocks, E_METAs and sounds
2014-10-01 17:57:53 +02:00
madmaxoft
4789db5c28
cRoot: Removed useless variable from Lua API.
2014-10-01 17:28:45 +02:00
madmaxoft
fd11b574bd
cPlayer: Removed useless functions from the Lua API.
2014-10-01 17:24:02 +02:00
madmaxoft
886a7d7bbb
Bindings: Fixed binding for cPlayer::PermissionMatches().
2014-10-01 12:59:31 +02:00
madmaxoft
901bed3989
Unified cRoot broadcast chat documentation.
2014-10-01 12:44:28 +02:00
madmaxoft
e65e0f1795
cClientHandle: Alpha-sorted the sending functions.
2014-10-01 12:14:38 +02:00
Mattes D
3ccda572b3
Merge pull request #1490 from mc-server/removecompact
...
Removed WSSCompact
2014-10-01 07:47:17 +02:00
Tiger Wang
9e4a5f824a
Removed WSSCompact
2014-09-30 22:20:21 +01:00
Tiger Wang
48c99dcd2e
Improved torch handler
2014-09-30 22:00:33 +01:00
Mattes D
1d185fe207
Merge pull request #1487 from mc-server/BlockFixes
...
Block fixes
2014-09-30 22:53:32 +02:00
Howaner
7d3016c7ad
Code improvements
2014-09-30 20:59:59 +02:00
Mattes D
5de27e7edf
Merge pull request #1485 from mc-server/PluginMessages
...
Rewritten plugin messages, vanilla's are being parsed directly.
2014-09-30 20:48:40 +02:00
Howaner
425df6b694
Fixed 1.8 dirt types
2014-09-30 20:31:27 +02:00
madmaxoft
e74510bddf
Fixed a missing semicolon.
2014-09-30 20:27:20 +02:00
Howaner
83973520c8
Fixed iron trapdoors
2014-09-30 20:04:49 +02:00
Howaner
5111628ba5
Fixed 1.8 doors.
2014-09-30 19:49:42 +02:00
Mattes D
1531511bbe
Merge pull request #1427 from mc-server/chestcarts
...
Implemented Chest Minecarts
2014-09-30 17:16:15 +02:00
Julian Laubstein
b77480b4ef
Indentation
2014-09-30 14:05:23 +02:00
madmaxoft
d7066f43d3
Rewritten plugin messages, vanilla are being parsed directly.
...
This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
2014-09-30 13:33:57 +02:00
Julian Laubstein
b2cf4004f8
Set right indentation
2014-09-30 12:45:44 +02:00
Julian Laubstein
d731ad37b1
actual solving of the halfslap+torch problem
2014-09-30 12:43:48 +02:00
madmaxoft
33dc66a4d2
RankMgr: GetAllPlayers() returns players sorted by name.
2014-09-29 22:00:14 +02:00
madmaxoft
aae90c2cf0
Style fixes.
2014-09-29 21:38:11 +02:00
madmaxoft
30b083ed63
World: Fixed chunk generation by plugins.
...
ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue.
2014-09-29 21:34:15 +02:00
Alexander Harkness
bdb8d916c0
Fixed codestyle again.
2014-09-29 19:45:12 +01:00
Mattes D
d3c2c02b6b
Merge pull request #1472 from mc-server/Ranks
...
Added more cRankManager functions
2014-09-29 20:39:13 +02:00
w00tc0d3
9628733df2
BlockStone.h: fix the codestyle
2014-09-29 19:19:17 +02:00
