Tiger Wang
20b7152572
Potential crash fixes
...
* Potentially addresses my comment in #1969
* Probably fixes #2145
2015-05-28 13:03:28 +01:00
tycho
8dcb5105c9
Update SQLite
2015-05-28 12:57:39 +01:00
tycho
b2fa71a32a
Fix comments
2015-05-28 12:54:04 +01:00
tycho
e19693e529
Merge branch 'master' into PreventNewWarnings
...
Conflicts:
src/Inventory.cpp
2015-05-28 11:05:41 +01:00
Alexander Harkness
1487f57905
Merge pull request #2151 from SafwatHalaby/wolf
...
AI - Tweaked wolf speed and teleport threshold
2015-05-28 07:52:30 +01:00
SafwatHalaby
b936781f93
AI - Tweaked wolf speed and teleport threshold
2015-05-28 08:31:17 +03:00
worktycho
7c028b87bc
Merge pull request #2148 from SafwatHalaby/easy
...
AI - Saner Livestock
2015-05-27 17:46:11 +01:00
SafwatHalaby
52fcbb5c65
AI - Saner Livestock
2015-05-27 19:26:08 +03:00
Alexander Harkness
da4a76bb50
Merge pull request #2061 from mc-server/fixes
...
Fixes
2015-05-27 12:21:17 +01:00
Alexander Harkness
0fb7628e96
Merge pull request #2143 from jammet/patch-6
...
Corrected Cookie recipe
2015-05-26 18:41:33 +01:00
jammet
142a5dd05e
Corrected Cookie recipe
...
You should get a batch of 8 cookies for 2 wheat and one cocoabean.
2015-05-26 19:22:43 +02:00
Mattes D
1e297717e0
Merge pull request #2136 from mc-server/clientDestroyRace
...
Fixed ClientHandle not getting properly removed from the world
2015-05-26 17:01:57 +02:00
tycho
31b95afd79
Fixed ClientHandle not getting properly removed from the world
...
when socket is closed whilst the client is being added to the world
Fixes #1969
2015-05-26 10:34:14 +01:00
Mattes D
c3c30a78e1
Merge pull request #1848 from scottwillmoore/ImplementTitleCommand
...
Implement backend for /title command
2015-05-26 08:46:16 +02:00
Mattes D
35c40bd9eb
Merge pull request #2138 from Seadragon91/server_uptime
...
Added method to get the uptime of the server in seconds.
2015-05-26 07:59:10 +02:00
Lukas Pioch
c3b872ad93
Added method to get the uptime of the server in seconds. Implements #1650 .
2015-05-26 05:36:46 +02:00
Julian Laubstein
4c01fc70ab
Merge pull request #2139 from mathias-github/patch-3
...
Adding myself to contributors
2015-05-26 00:26:47 +02:00
Alexander Harkness
fffc8dce21
Merge pull request #2140 from mc-server/Plugins-duping
...
Only add default plugins if there are not any plugins
2015-05-25 21:24:34 +01:00
worktycho
6735b0d534
Only add default plugins if there are not any plugins
...
Fixes #2082
2015-05-25 18:43:18 +01:00
Mathias
c6d2d1d715
Update CONTRIBUTORS
2015-05-25 20:23:02 +03:00
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
c627016ea6
Fix other clang 3.6 commit
2015-05-24 17:14:35 +01:00
Alexander Harkness
d50c8f073c
Merge pull request #2114 from cengizIO/master
...
Fix #2105 - Add gcc to Travis CI compilers list
2015-05-24 15:45:03 +01:00
Cengiz Can
ea43ae2318
Fix #2105 - Add gcc to CI compilers
2015-05-24 17:42:30 +03:00
tycho
5ab650e4bb
Fix bearbins comments
2015-05-24 15:25:52 +01:00
tycho
51b4584b42
Fix clang 3.6 flags to only be used in clang 3.6
2015-05-24 15:22:55 +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
worktycho
ffacd89fae
Merge pull request #2130 from SafwatHalaby/easyInstall
...
Easy compile script
2015-05-24 13:36:23 +01:00
tycho
7a8025eacd
Disable -Werror for warnings in tools.
2015-05-24 13:24:34 +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
SafwatHalaby
9a6fb60c85
Easy compile script
2015-05-24 13:48:15 +03:00
Alexander Harkness
ae55723c3c
Update CONTRIBUTORS
2015-05-24 09:28:28 +01:00
Alexander Harkness
028cfe660a
Merge pull request #2129 from Seadragon91/master
...
Fixed item name
2015-05-24 09:27:02 +01:00
Lukas Pioch
1f18a0c8af
Add Seadragon91 to contributors
2015-05-24 10:11:51 +02:00
Lukas Pioch
885ebab7e6
Fixed item name
2015-05-24 10:02:44 +02: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
Safwat Halaby
64b3dcce7e
Merge pull request #2128 from mc-server/wolf-fix
...
Wolves don't spawn in rivers.
2015-05-24 09:50:54 +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
