Alexander Harkness
150024265e
Merge pull request #2135 from linnemannr/master
...
Support building on FreeBSD
2015-05-25 07:07:18 +01:00
linnemannr
5049fd0fbf
Support building on FreeBSD
...
SetFlags.cmake
Add -lexecinfo to linker flags for FreeBSD to resolve backtrace()
lib/sqlite/CMakeLists.txt
Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for
POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define
controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined
to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE
and __POSIX_VISIBLE to the 199506 for POSIX.1c
lib/tolua++/CMakeLists.txt
src/CMakeLists.txt
Add /usr/local/lib to the library search path for FreeBSD builds
src/OSSupport/Errors.cpp
Correct the strerror_r() implementation determination to check whether
_GNU_SOURCE is defined, not what it evaluates to
2015-05-24 20:07:31 -06:00
tycho
d1c9122340
Fix warnings in cPath
2015-05-24 17:47:15 +01:00
tycho
a6ccee5948
Merge branch 'master' into PreventNewWarnings
2015-05-24 17:27:05 +01:00
tycho
5ab650e4bb
Fix bearbins comments
2015-05-24 15:25:52 +01:00
tycho
76a3165f09
Fix comments
2015-05-24 14:58:24 +01:00
tycho
95b81b3ef1
Disable -Werror for warnings in tests.
2015-05-24 14:16:05 +01:00
worktycho
bd95d7bf7b
Merge pull request #2091 from Rakete1111/master
...
Placing buckets up to 25 blocks away #2059
2015-05-24 13:44:34 +01:00
Tiger Wang
10c9e66aad
Fixes #2041
2015-05-24 13:37:36 +01:00
tycho
dae9e5792a
Made -Weverything an error.
2015-05-24 12:56:56 +01:00
worktycho
d86e8fae79
Merge pull request #2122 from SafwatHalaby/bounding
...
Pathfinder - Bounding boxes and some tweaks
2015-05-24 12:51:15 +01:00
Safwat Halaby
79c3e11a31
Merge pull request #2118 from mc-server/login-gamemode
...
Fix gamemode not changing properly.
2015-05-24 09:52:45 +03:00
Alexander Harkness
45012b72e7
Wolves don't spawn in rivers.
2015-05-24 07:28:17 +01:00
HaoTNN
2578afb244
Merge remote-tracking branch 'upstream/master'
2015-05-23 14:06:37 -07:00
SafwatHalaby
7021547e99
Pathfinder - Bounding boxes and some tweaks
2015-05-23 22:16:19 +03:00
Safwat Halaby
042c08d7e3
Merge pull request #2107 from mc-server/cow-waterspawn
...
Cows no longer spawn over water.
2015-05-23 22:11:34 +03:00
Alexander Harkness
febc8529b1
Fix gamemode not changing properly.
...
Should fix #604
2015-05-23 19:31:33 +01:00
tycho
81c0116cf1
Merge branch 'master' into PreventNewWarnings
2015-05-23 07:33:52 -07:00
worktycho
7e0dc0f9bc
Merge pull request #2117 from Seadragon91/clang_errors
...
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
2015-05-23 15:31:49 +01:00
Lukas Pioch
e30b2ed487
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
2015-05-23 16:28:37 +02:00
tycho
b29ae54d91
Merge branch 'master' into PreventNewWarnings
2015-05-23 06:50:28 -07:00
tycho
a5624debcb
Fix tests
2015-05-23 13:21:02 +01:00
Mattes D
dbf5fed2bc
Merge pull request #2065 from mc-server/OldArgs
...
Move some of the old arguments over to TCLAP
2015-05-23 13:05:16 +02:00
Alexander Harkness
3a27fabbab
Merge pull request #2103 from beeduck/Issue1980
...
Fixed players head visible when in spectator mode
2015-05-23 11:56:39 +01:00
tycho
1577a080ee
Merge branch 'master' into PreventNewWarnings
2015-05-23 11:31:03 +01:00
worktycho
26c9c34780
Fixed wrong copy/paste
...
Fixes CID 110962
2015-05-23 11:30:15 +01:00
Alexander Harkness
abf6ac3148
Cows and rabbits no longer spawn over water.
...
Fixes #2080
2015-05-23 10:38:57 +01:00
Alexander Harkness
de5e056a88
TryGetHeight returns a bool
...
should fix #2099
2015-05-23 10:37:50 +01:00
Alexander Harkness
e0fd3ce95b
Merge pull request #2101 from mc-server/EquifaxCerts
...
Close Ssl Socket on destroy
2015-05-23 07:28:36 +01:00
Alexander Harkness
31f66fd812
Merge pull request #2104 from beeduck/Issue2053
...
Fix for players falling through world when loading in as spectator
2015-05-23 07:27:04 +01:00
SafwatHalaby
f983bb6234
Fixed creeper not exploding when 1 block higher than player
2015-05-23 09:06:00 +03:00
b33duck
afb96c5bd6
Added a fix for players falling through the world when connecting in spectator mode
2015-05-22 16:33:11 -07:00
Tiger Wang
8f6788b2ef
Close Ssl Socket on destroy
...
* Fixes #2072
2015-05-22 23:54:32 +01:00
b33duck
906288c6eb
Fixed players head visible when in spectator mode
2015-05-22 12:25:16 -07:00
Blitz Rakete
e512b7bf8e
Fixes #2059
2015-05-21 19:03:51 +02:00
Mattes D
6bafff0560
Merge pull request #2086 from Seadragon91/master
...
Renamed hook HOOK_ENTITY_CHANGE_WORLD
2015-05-21 12:57:25 +02:00
Lukas Pioch
bc838e5bd2
Renamed hook HOOK_ENTITY_CHANGE_WORLD
2015-05-21 12:27:54 +02:00
Mattes D
90ab8a338b
Added Equifax root CA.
...
Fixes #2076 .
Closes #2081 .
Ref.: #2072 .
2015-05-21 10:26:45 +02:00
worktycho
c0d7b4d569
Merge pull request #2030 from beeduck/master
...
Issue #1868 and Issue #1984
2015-05-21 07:50:30 +01:00
Alexander Harkness
6202fdafe7
Merge pull request #2084 from mc-server/patch-2050
...
Added missing fencetypes to torchhandler
2015-05-21 07:02:10 +01:00
b33duck
ed3c0b771f
Added open/close and sound effects for all door types
2015-05-20 16:24:16 -07:00
b33duck
a511db78ca
Added thunder sound effect to CastThunderbolt()
2015-05-20 16:23:56 -07:00
Julian Laubstein
48b7874099
Added missing fencetypes to torchhandler
2015-05-20 23:18:21 +02:00
SafwatHalaby
8436e5d8bd
Path recalculation improvements
2015-05-20 20:42:35 +03:00
worktycho
eaedd5f19d
Merge pull request #2074 from SafwatHalaby/rmUnique
...
Removed UniquePTR from PathFinder
2015-05-20 13:06:51 +01:00
tycho
d9d4adc2a5
Moved no buffering command line argument to tclap
2015-05-20 01:50:04 +01:00
tycho
7c196ffde6
Move commlog arguments over to TCLAP
2015-05-20 01:50:04 +01:00
HaoTNN
ac1bfd9671
Merge remote-tracking branch 'upstream/master'
2015-05-19 14:22:27 -07:00
worktycho
8026133078
Don't verify certificate
...
Temporary Hot-fix for #2072
2015-05-19 21:25:38 +01:00
SafwatHalaby
395f3d9c4c
newlines
2015-05-19 22:47:48 +03: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
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
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
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
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
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
worktycho
c94134ec5e
Fix FastRandom seeding
...
Fixes #1815
Fixes #2021
2015-05-17 13:16:18 +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
tycho
c96849f431
Move make_unique into a namespace to avoid ADL issues
...
this prevents VS finding std::make_unique for constructors that take types from std
2015-05-16 10:47:04 +01:00
tycho
b9efa02c80
Initial implementation of IniFile overloading
2015-05-16 10:46:51 +01:00
SafwatHalaby
4ffc6621a9
PathFinder uses UniquePtr for cell map.
2015-05-16 10:38:58 +02:00
worktycho
5c3a85fba1
Revert "PathFinder - smart pointers"
2015-05-15 18:54:45 +01:00
SafwatHalaby
a8878dd2b6
uniquePTR
2015-05-15 20:25:44 +03:00
Mattes D
163aebf8ca
Fixed cPluginManager:ForEachCommand() and ForEachConsoleCommand()
...
The functions would leak one value on the Lua stack for each enumerated command.
Fixes #2017 .
2015-05-14 19:46:18 +02:00
Mattes D
c3804f08c8
Merge pull request #2018 from mc-server/ProbDif
...
Fixed possible crash in cProbabDistrib
2015-05-14 17:23:23 +02:00
STRWarrior
67b6b71a5b
Fixed possible crash in cProbabDistrib
...
It could divide through 0 which causes a crash
2015-05-14 16:49:13 +02:00
Mattes D
80f2e1eb66
Merge pull request #2010 from TwiddleStick/patch-2
...
Update World.cpp
2015-05-14 13:41:22 +02:00
Mattes D
43fecf48e3
Merge pull request #2006 from mc-server/ManualBindingsWorld
...
Moved cWorld manual bindings out into a separate file.
2015-05-14 08:15:40 +02:00
