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 |
|
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 |
|
Alexander Harkness
|
97a418f6c1
|
Merge pull request #2116 from mc-server/CMakeCacheOptions
Add build_tools and Self_test as cache options, so that CLion can det…
|
2015-05-23 14:46:12 +01:00 |
|
tycho
|
2b844e3680
|
Add build_tools and Self_test as cache options, so that CLion can detect them
|
2015-05-23 06:36:45 -07:00 |
|
tycho
|
a5624debcb
|
Fix tests
|
2015-05-23 13:21:02 +01:00 |
|
tycho
|
62c99145d0
|
Disable warnings in MCADefrag, ProtoProxy and tests
|
2015-05-23 12:47:54 +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
|
7a5c1d30f8
|
Added pthread as a link flag.
|
2015-05-23 11:53:49 +01:00 |
|
Alexander Harkness
|
74f26a530e
|
Merge pull request #2110 from mc-server/coverity-fix
Fixed wrong copy/paste
|
2015-05-23 11:50:49 +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
|
0daa6a92ea
|
Merge pull request #2108 from mc-server/tgh-boolean
TryGetHeight returns a bool
|
2015-05-23 10:45:56 +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 |
|
Alexander Harkness
|
6c8052f117
|
Merge pull request #2100 from SafwatHalaby/creeper
Fixed creeper not exploding when 1-block higher than player
|
2015-05-23 07:25:51 +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 |
|