1
0
Commit Graph

7794 Commits

Author SHA1 Message Date
Mattes D
ad13a80d14 Merge pull request #1649 from jonfabe/InfoDumpFix
Fix duplicate commands added to README.md
2014-12-05 08:09:56 +01:00
Jonathan Fabian
a1c6e89273 Fix duplicate commands added to README.md 2014-12-04 23:25:46 -05:00
Mattes D
b7820256a7 Merge pull request #1648 from mc-server/CraftingLuaFix
Fixed the CRAFTING_NO_RECIPE hook call.
2014-12-04 23:25:33 +01:00
Mattes D
8046022a83 Merge pull request #1638 from p-mcgowan/cactiNoLongerSpawnOnBeaches
cacti no longer spawn outside of desert variants
2014-12-04 23:08:33 +01:00
p-mcgowan
8557ab18d0 conflict resolution 2014-12-04 13:31:58 -08:00
Mattes D
34807248e2 Fixed the CRAFTING_NO_RECIPE hook call.
It used a pointer-to-pointer-to-cCraftingRecipe, which the Lua bindings didn't know how to handle, and emitted a warning message at runtime.
Fixes #1641.
2014-12-04 09:21:57 +01:00
Mattes D
c8e75994cc Merge pull request #1645 from jonfabe/SpectatorModeFixes
Spectator mode fixes
2014-12-04 09:10:14 +01:00
Jonathan Fabian
6ca47185c4 Updated whitespace in comment, changed conditional to logical equivalent due to popular demand 2014-12-03 23:04:53 -05:00
Mattes D
efb5f86cfa Merge pull request #1646 from p-mcgowan/luaCheckstyleWarnings
clearing CheckBasicStyle.lua messages
2014-12-03 10:06:14 +01:00
Mattes D
4d74adaa67 Merge pull request #1640 from p-mcgowan/mooshroomMobSpawnerRule
added spawning rule to mooshroom
2014-12-03 09:34:26 +01:00
p-mcgowan
27185dd374 clearing CheckBasicStyle.lua messages 2014-12-03 00:26:15 -08:00
Jonathan Fabian
1e6c13ea51 Fix Spaces to Tabs 2014-12-02 20:54:56 -05:00
Jonathan Fabian
24c6da6209 Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world. 2014-12-02 20:25:41 -05:00
Jonathan Fabian
b0e4643eb6 Allow Spectator Gamemode as a world default. 2014-12-02 20:24:05 -05:00
p-mcgowan
14bc241ec1 updated mooshroom check for mycelium 2014-12-02 11:10:20 -08:00
Mattes D
bc8937d315 Merge pull request #1634 from mc-server/DungeonSpawners
Dungeons spawners now spawn mobs
2014-12-02 11:15:20 +01:00
STRWarrior
f1177984f1 Fixed forgotten semicolon 2014-12-02 10:20:20 +01:00
STRWarrior
a466986f53 Using IntNoise3DInt instead of IntNoise3D 2014-12-02 09:55:25 +01:00
STRWarrior
5db3ceb333 Suggestions by xoft
Using IntNoise3D to prevent needless floating point math
2014-12-02 09:42:49 +01:00
p-mcgowan
865b567665 extra formatting parentheses 2014-12-01 22:13:52 -08:00
p-mcgowan
ae47c00547 added spawning rule to mooshroom 2014-12-01 22:11:28 -08:00
p-mcgowan
bb5a7d8f15 reformat for lua and CI 2014-12-01 17:47:36 -08:00
p-mcgowan
3bf111c69e formatting and commenting fixes 2014-12-01 17:28:46 -08:00
p-mcgowan
cb584a87bd cacti no longer spawn outside of desert variants 2014-12-01 11:44:20 -08:00
Alexander Harkness
53a55e62b3 Merge pull request #1636 from mc-server/MineshaftSpawners
Mineshaft spawners now spawn cave spiders
2014-12-01 19:15:09 +00: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
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