tycho
7f35671b21
Fix tests
2015-05-19 19:53:16 +01:00
tycho
813c95d4b0
Merge branch 'master' into PreventNewWarnings
2015-05-19 19:40:39 +01:00
tycho
77f1f58c0a
Make -Werror disabling file only
...
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
SafwatHalaby
0741ad3526
Removed UniquePTR from PathFinder
2015-05-19 21:07:05 +03:00
Alexander Harkness
cbb425f027
Merge branch 'master' of github.com:mc-server/MCServer
2015-05-19 18:43:19 +01:00
Alexander Harkness
8fae5fa467
Updated Core.
2015-05-19 18:42:19 +01:00
Alexander Harkness
0c06ec6abd
Merge pull request #2057 from Seadragon91/master
...
Fix the health of animals
2015-05-19 18:02:43 +01:00
tycho
480052c058
Added LuaState support for all integral types
...
All so added error handling for out of range values
2015-05-19 17:09:05 +01:00
tycho
2bb25b8afa
Fixed some more warnings
2015-05-19 15:21:29 +01:00
tycho
050a014106
Finish fixing windows
2015-05-19 14:02:02 +01:00
tycho
03c75943ea
More fixed warnings
2015-05-19 13:34:52 +01:00
tycho
6cccd2aabb
Properly fix cFile Warnings
2015-05-19 13:33:34 +01:00
tycho
fa4fb75e03
Fixed compile and a few more warnings
2015-05-19 12:28:31 +01:00
tycho
95e06ab93f
Merge branch 'master' into PreventNewWarnings
...
Conflicts:
src/Blocks/BlockLeaves.h
2015-05-19 11:55:23 +01:00
tycho
f2689c4887
Fixed a lot of warnings
2015-05-19 11:50:59 +01:00
Alexander Harkness
fff5efedc3
Merge pull request #2019 from mc-server/OverrideArgs
...
Initial Implementation of command line arguments
2015-05-19 10:53:44 +01:00
Alexander Harkness
e7d948dc3c
Removed tip4commit, it's not used anymore.
2015-05-19 09:38:37 +01:00
Alexander Harkness
2c0a11a8af
Merge pull request #2060 from mc-server/more-leafimprove
...
Improved leaves a bit more.
2015-05-19 09:32:14 +01:00
Alexander Harkness
d852209f8d
Manual merge of #2066
2015-05-19 09:29:27 +01:00
Alexander Harkness
d1a0717a57
Improved contributor
2015-05-19 09:27:14 +01:00
Alexander Harkness
b50135e78f
Merge pull request #2064 from Seadragon91/hook_entity_change_world
...
Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD
2015-05-19 09:24:50 +01:00
haotnn
6128e3f7cd
Fixes lit furnace issue in #2051
2015-05-18 23:19:03 -07:00
Lukas Pioch
9aced8cd85
Added OnEntityChangeWorld.lua and OnEntityChangedWorld.lua hooks to APIDump
2015-05-19 06:34:40 +02:00
Lukas Pioch
4d4d1e9c69
Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD
...
Fixes #1435 .
2015-05-18 22:29:39 +02:00
tycho
2e98bfc4e9
Add support for setting ports through command line
2015-05-18 17:26:12 +01:00
tycho
c2303ac4cf
Fix max slots logic to only override if acctually present.
2015-05-18 15:43:26 +01:00
Tiger Wang
1632d5f8f1
Fixes #2003
2015-05-18 15:43:24 +01:00
Tiger Wang
0dbba305b6
Fixes #2052
2015-05-18 14:30:16 +01:00
Alexander Harkness
aedf9d05cb
Improved leaves a bit more.
...
Should fix #2058 .
2015-05-18 13:43:00 +01:00
STRWarrior
007bac638b
Merge branch 'master' of https://github.com/mc-server/MCServer
2015-05-18 09:30:43 +02:00
Safwat Halaby
75d2f1a61b
Merge pull request #2049 from mc-server/sapling-probability
...
Fix sapling probability.
2015-05-18 08:20:00 +03:00
Lukas Pioch
a75106aea7
Fix the health of animals
2015-05-18 06:36:52 +02:00
Mattes D
1f3f64fccd
APIDump: Removed an unneeded global variable.
2015-05-17 22:33:57 +02:00
Safwat Halaby
b7b088494c
Merge pull request #2037 from SafwatHalaby/aprox
...
Pathfinder - approximated paths when original destination unreachable
2015-05-17 23:21:52 +03:00
STRWarrior
b9481dafeb
Updated the defaults for the overworld world generator
2015-05-17 19:36:18 +02:00
SafwatHalaby
29e31c5be9
Pathfinder - approximated paths when original destination unreachable
2015-05-17 19:36:52 +03:00
Alexander Harkness
1049d5b706
properly this time?
2015-05-17 16:30:13 +01:00
Alexander Harkness
adecdc2f07
Fixed typo.
2015-05-17 16:10:55 +01:00
Alexander Harkness
d48825fa81
Fix sapling probability.
...
Probability is 5% of leaves drop a sapling.
This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability.
2015-05-17 14:23:16 +01:00
Alexander Harkness
519677c847
Merge pull request #2040 from mc-server/Random
...
Fix FastRandom seeding
2015-05-17 14:17:38 +01:00
worktycho
c94134ec5e
Fix FastRandom seeding
...
Fixes #1815
Fixes #2021
2015-05-17 13:16:18 +01:00
Alexander Harkness
a22f0795f6
Should disable coveralls.
2015-05-17 09:32:56 +01:00
Alexander Harkness
54b69d0bb8
Merge pull request #2038 from mc-server/InventoryFix
...
Fixed inventory handling.
2015-05-17 07:13:40 +01:00
Mattes D
f3d6da29f7
Fixed inventory handling.
...
Fixes #2035 .
2015-05-16 23:22:50 +02:00
Safwat Halaby
4ace226dcd
Merge pull request #2033 from mc-server/BreakIntoDebugger
...
Lua: Break into ZBS debugger on API errors.
2015-05-16 22:59:42 +03:00
Mattes D
1240c76cb4
Lua: Break into ZBS debugger on API errors.
2015-05-16 16:19:18 +02:00
Mattes D
0b536701b4
Merge pull request #2029 from mc-server/bedPatch
...
Bed uses bottom two bits for direction not three
2015-05-16 14:11:56 +02:00
tycho
36fe8ee5f5
Added deoxy comments
2015-05-16 12:46:43 +01:00
worktycho
6350e4f279
Bed uses bottom two bits for direction not three
2015-05-16 12:07:38 +01:00
worktycho
0da8c7392e
Fix service Main
2015-05-16 10:47:04 +01:00
