gushromp
c2d32ce31b
Merge branch 'master' of https://github.com/gushromp/MCServer
...
Conflicts:
src/Simulator/FloodyFluidSimulator.cpp
2014-12-16 22:58:23 +01:00
gushromp
fd325e3990
Fixed water from spreading on bottom of world
2014-12-16 22:54:39 +01:00
gushromp
6cf3aa70f1
Fixed water from spreading on bottom of world
2014-12-16 22:38:57 +01:00
Mattes D
aff32ba27b
Updated Core.
2014-12-16 12:52:34 +01:00
Mattes D
6de847ef66
Merge pull request #1673 from gushromp/master
...
Updated cPlayer::DoMoveToWorld to send target world's weather info to Player
2014-12-15 20:16:25 +01:00
gushromp
b9977a39c3
Added braces to 'if' according to the code guidelines
2014-12-15 18:41:47 +01:00
blashyrk
4e5d2c36e9
Updated cPlayer::DoMoveToWorld to send target world's weather info to Player
2014-12-15 17:45:42 +01:00
Howaner
b3e5872c22
Fixed mob invisibility
2014-12-14 17:48:30 +01:00
Mattes D
81446b0f80
Merge pull request #1635 from mc-server/Cocoa
...
Added cocoa pod.
2014-12-14 17:39:50 +01:00
Franz Reiter
352063b63f
Merge pull request #1670 from Masy98/crafting
...
Fixed fence/-gates and door recipes and added baked potato recipe
2014-12-14 16:58:12 +01:00
Masy98
5005c01f4c
Fixed fence/-gates and door recipes and added baked potato recipe
2014-12-14 16:01:06 +01:00
Howaner
6436fe73ca
Merge branch 'master' into Cocoa
2014-12-14 13:14:58 +01:00
Howaner
bed456033f
"& 0x0f" isn't needed
2014-12-14 13:14:48 +01:00
Tycho
7542255d5c
Clang needs the libstdc++ that comes with gcc-4.8
2014-12-13 22:12:53 +00:00
Tycho
aef36a5c19
final syntax errors
2014-12-13 21:33:16 +00:00
Tycho
946adeac3b
Double equals
2014-12-13 21:26:38 +00:00
Tycho
0e1ef05ea8
Fix forgoten thens
2014-12-13 21:22:15 +00:00
Tycho
3d9c88affa
"Don't set compiler to gcc on clang builds"
2014-12-13 20:58:28 +00:00
Mattes D
58668351ae
Merge pull request #1664 from mc-server/SandstoneCaves
...
WormNestCaves occasionally generates sandstone around the cave
2014-12-13 20:43:17 +01:00
Howaner
2a8c234f46
Fixes
2014-12-13 20:31:37 +01:00
Howaner
a595a4a842
Merge branch 'master' into Cocoa
2014-12-13 20:10:23 +01:00
Alexander Harkness
72b38c284f
Merge pull request #1663 from mc-server/APIDumpSize
...
APIDump Width
2014-12-13 14:39:22 +00:00
STRWarrior
00bee25b4b
WormNestCaves occasionally generates sandstone around the cave
...
Only when the block around the cave is sand.
2014-12-13 15:38:37 +01:00
STRWarrior
3fb10f064c
Made comment in example code smaller
...
It caused the whole page to extend beyond the max width
2014-12-13 15:34:46 +01:00
STRWarrior
4f2931dd39
Reverted main_APIDump.lua changes
2014-12-13 15:33:51 +01:00
STRWarrior
f62a0e137e
Fixed the width sometimes going over the div size
2014-12-13 12:59:23 +01:00
Mattes D
b8072cbd62
Merge pull request #1660 from Seadragon91/master
...
Fixed print of milliseconds from chrono
2014-12-12 21:00:06 +01:00
Lukas Pioch
ece8b8ac96
Fixed print of milliseconds from chrono
2014-12-12 15:10:29 +01:00
Mattes D
125c70ab63
Updated the Core.
2014-12-12 14:33:11 +01:00
Mattes D
c8a49a6189
LightingThread: Fixed a memory leak.
2014-12-12 14:27:19 +01:00
Mattes D
6cd7e52eb7
Exported cWorld:PrepareChunk to Lua API, test in Debuggers.
2014-12-12 13:32:52 +01:00
Mattes D
1142879cc8
Debuggers: Added loadchunk and preparechunk commands.
...
preparechunk is not working yet because the required API is missing.
2014-12-11 21:21:58 +01:00
Mattes D
2a4ad3a475
Debuggers: Changed to use Info.lua file.
2014-12-11 21:21:57 +01:00
Mattes D
781b3303a5
Merge pull request #1657 from mc-server/PrepareChunk
...
Prepare chunk
2014-12-11 17:06:18 +01:00
Mattes D
33c6ff872e
Cosmetic touchups.
...
Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
2014-12-11 14:34:09 +01:00
Mattes D
1b1f971752
Merge remote-tracking branch 'planetx/master'
2014-12-11 11:17:54 +01:00
Mattes D
09453619e6
Fixed DungeonRooms edges not generating sometimes.
2014-12-11 11:16:11 +01:00
Mattes D
fcd3d1bfed
Added a cWorld:PrepareChunk function.
...
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
2014-12-10 22:35:16 +01:00
Mattes D
563f41af65
Lighting thread: skip chunks that are already lit.
2014-12-10 22:27:48 +01:00
Mattes D
fbf98b8488
Merge pull request #1655 from tonibm19/patch-2
...
Added NetherOreNests to default nether generator.
2014-12-10 17:44:53 +01:00
tonibm19
7ceeefb26f
Moved NetherOreNests
2014-12-10 17:13:20 +01:00
Mattes D
32bce44f1f
Merge pull request #1623 from p-mcgowan/issue_1253
...
Prevent multiple logins with same username, unless allowed in settings
2014-12-10 11:17:11 +01:00
Vincent
9bba8e4c7d
Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin()
...
Compiles correctly.
2014-12-10 00:45:24 -08:00
Vincent
3a2759fdc1
Fixed return value in CheckMultiLogin()
2014-12-09 14:23:44 -08:00
Howaner
e21159d4a8
Fixed compiling.
2014-12-09 13:29:22 +01:00
Vincent
4b08ca261b
Fixed indent problems and added return definitions to CheckMultiLogin().
...
Changed from IsAllowMultiLogin() to DoesAllowMultiLogin().
Fixed CheckMultiLogin() to not run to the end without returning a value.
2014-12-09 03:06:25 -08:00
Mattes D
2ab8d2bd98
Added a RemoveIf() function to cQueue
2014-12-09 10:43:40 +01:00
Vincent
e9a27db028
Changed DoWithPlayer to auto instead of using iterator.
2014-12-08 15:58:46 -08:00
Vincent
12c012fa01
Changed CheckMultiLogin() to not have main body wrapped in an if statement.
...
Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin().
Added doxy-comment for DoWithPlayer().
Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments.
2014-12-08 14:33:59 -08:00
Mattes D
209de0268a
Moved NaturalPatches in front of PreSimulator and Animals.
2014-12-08 21:28:14 +01:00
