tycho
|
1577a080ee
|
Merge branch 'master' into PreventNewWarnings
|
2015-05-23 11:31:03 +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
|
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 |
|
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 |
|
Julian Laubstein
|
a6740a335d
|
Merge pull request #2085 from mc-server/EquifaxCerts
Added Equifax root CA.
|
2015-05-21 11:22:55 +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
|
d7aa1c0434
|
Added beeduck to contributors
|
2015-05-20 16:24:30 -07: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 |
|
worktycho
|
1bdd205eb8
|
Merge pull request #2073 from SafwatHalaby/rand
Path recalculation improvements
|
2015-05-20 22:40:25 +01: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 |
|
Alexander Harkness
|
2f185ed476
|
Merge pull request #2076 from mc-server/Cert-disable
Don't verify certificate
|
2015-05-19 21:27:28 +01: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
|
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 |
|
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 |
|