1
0
Commit Graph

7766 Commits

Author SHA1 Message Date
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
3bf9e978ae Updated core 2014-12-01 16:05:22 +01:00
Howaner
e74ad386f0 Reverted bad .gitignore change 2014-12-01 16:04:49 +01:00
Mattes D
a13c75085e Merge pull request #1602 from mc-server/MobSpawner
Added mob spawner
2014-12-01 15:59:57 +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
Mattes D
d8e6931fe6 Merge pull request #1626 from mc-server/StackTraceOnFailure
Stack trace on failure
2014-11-30 11:10:28 +01:00
Howaner
c173bf61ad Removed old StringToMobType() function from Monster.cpp 2014-11-30 02:29:17 +01:00
Mattes D
dec89478a7 Fixed MCADefrag compilation. 2014-11-29 23:58:26 +01: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
8e6f98eb40 Fixed missing files in ProtoProxy. 2014-11-29 23:30:27 +01:00
Mattes D
201313a9f8 Added a basic stacktracing for assert and signal failures. 2014-11-29 23:06:10 +01:00
Mattes D
c8384fee39 Merge pull request #1622 from M10360/master
Missing Fuels, Incorrect Smelting Recipe, Duplicate Code, Listing Myself
2014-11-29 22:00:06 +01:00
Howaner
615bca1567 Update core 2014-11-29 16:00:52 +01:00
Howaner
ea20ccaa96 Removed old MobType category. 2014-11-29 15:45:12 +01: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
M10360
02828304c2 Added M10360. 2014-11-29 02:02:35 -06:00
M10360
7f190c4ec2 Smelting Netherrack not TallGrass gives you NetherBrickItem. 2014-11-29 01:59:01 -06:00
M10360
23a176057d Added missing fuels. 2014-11-29 01:56:44 -06:00
M10360
ab9c006938 Removed duplicate. 2014-11-29 01:47:13 -06:00
Mattes D
883230abbc Merge pull request #1619 from mc-server/WarningFixes
Warning fixes
2014-11-28 22:46:58 +01: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