p-mcgowan
8557ab18d0
conflict resolution
2014-12-04 13:31:58 -08:00
p-mcgowan
99a5b38e27
format blocks and randomizing
2014-12-04 13:28:27 -08:00
Mattes D
64f8428d03
Fixed trailing whitespace.
2014-12-04 22:07:04 +01:00
Mattes D
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
p-mcgowan
b7c4ef05ac
last doxy fix
2014-12-04 01:18:55 -08:00
p-mcgowan
a36e7669a7
added p-mcgowan to contributors
2014-12-04 01:14:38 -08:00
p-mcgowan
83d4bec369
awful comment fixing, randomizer fix
2014-12-04 01:08:17 -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
0ecc16c618
Fixed indent.
2014-12-03 18:24:28 +01:00
Mattes D
f206f34a3d
Server: Fixed a MSVC warning.
2014-12-03 18:04:21 +01:00
Mattes D
664ea804a3
ByteBuffer: Re-added Single-thread access checker.
2014-12-03 18:04:08 +01:00
Mattes D
010546051e
Fixes socket leak in HTTP server.
...
Fixes #1643 .
2014-12-03 16:14:26 +01: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
p-mcgowan
8c3b9ae15b
class description and doxy-commenting
2014-12-03 00:12:32 -08:00
p-mcgowan
d348433406
doxy-commenting
2014-12-02 22:35:34 -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
7f8f2f1e70
forgot generation defaul init
2014-12-02 15:57:41 -08:00
p-mcgowan
2ea8a36df6
forgot initializer
2014-12-02 15:55:09 -08:00
p-mcgowan
6803df129f
typos and oversights for lua and CI
2014-12-02 11:32:53 -08:00
p-mcgowan
8d7c2d4b13
fastRandom unused
2014-12-02 11:26:37 -08:00
p-mcgowan
585662e63f
indentation, repeatable random, small corrections
2014-12-02 11:21:51 -08: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
p-mcgowan
978c9967ad
fix comments after replacing spaces with tabs
2014-12-02 02:03:29 -08:00
p-mcgowan
2d93274a90
animal terrain finisher
2014-12-02 01:58:30 -08:00
p-mcgowan
9831220a1c
animal terrain finisher
2014-12-02 01:37:17 -08: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
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
3bf9e978ae
Updated core
2014-12-01 16:05:22 +01:00
