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
Martin Fahy
8f0f421ae4
Update World.cpp
...
Fixed minor typos in comments, simply trying to understand the code base to fix issue regarding no sound when lighting is produced, no change to actual code.
2015-05-13 23:05:44 -04:00
Mattes D
2cdc2a16e4
Fixed chat message manipulation by plugins.
...
Plugins, in their OnChat hook, can change the chat message sent by a player.
2015-05-13 18:45:29 +02:00
Mattes D
f36b00f4d4
All in-game commands go through the OnExecuteCommand hook.
...
Everything that has a slash at the beginning, doesn't matter if it is a registered command or not.
2015-05-13 18:31:01 +02:00
Mattes D
15771e4759
Moved cWorld manual bindings out into a separate file.
2015-05-13 11:30:57 +02:00
Mattes D
0686b55901
Merge pull request #2001 from mc-server/BindingsCleanup
...
Bindings cleanup
2015-05-12 10:29:55 +02:00
Mattes D
4b97569b3a
ToLua now generates cLuaState::Push() and GetStackValue()
...
For classes exported through ToLua it generates the cLuaState::Push() and cLuaState::GetStackValue() functions, as well as the supporting forward declarations and typedefs.
Renamed virtual_method_hooks.lua to BindingsProcessor.lua since it no longer provides virtual method hooks and instead does additional processing when generating the bindings.
2015-05-12 09:20:54 +02:00
Tiger Wang
c10e83c02d
Fixed creative click-outside
...
* Fixes #1995
2015-05-11 23:21:46 +01:00
Tiger Wang
30b17bcb97
Improved hoppers
...
* Fixes #1994
2015-05-11 22:58:27 +01:00
Mattes D
4083bc7005
AllToLua: Removed unneeded virtual method hooks.
2015-05-11 16:11:53 +02:00
Mattes D
dd10ffb63a
OnExecuteCommand hook can override the command result (crXXX).
2015-05-10 23:11:30 +02:00
Mattes D
693ffb689c
Exported cPluginManager:ExecuteConsoleCommand() to Lua API.
...
Fixes #1999 .
2015-05-10 22:51:16 +02:00
Mattes D
6c53abed23
Call HOOK_EXECUTE_COMMAND even for unknown console commands.
...
This allows plugins such as Aliases to intercept even unknown commands.
2015-05-10 21:46:25 +02:00
Mattes D
b356419a07
StringUtils: Fixed StringSplitWithQuotes().
...
The function would crash when given a string that started with the delimiter.
2015-05-10 21:39:14 +02:00
Mattes D
cbb1eff17a
Added the EntireCommand parameter to HOOK_EXECUTE_COMMAND.
...
Fixes #1996 .
2015-05-10 21:37:46 +02:00
Tiger Wang
9c490293b8
Merge remote-tracking branch 'origin/master' into warnings
...
Conflicts:
src/Mobs/Monster.cpp
src/Vector3.h
2015-05-10 12:16:20 +01:00
Tiger Wang
11ef1fd24a
Fixed some warnings and logic errors in Monster.cpp
2015-05-10 12:14:55 +01:00
wiseoldman95
8a576a0a35
PF - Less calcs per tick
2015-05-10 09:08:42 +03:00
Mattes D
756d310318
Added check against "Type const &" and "Type const *".
2015-05-09 12:58:56 +02:00
Mattes D
846d16315a
CheckBasicStyle: checks spaces around * and &.
2015-05-09 12:58:55 +02:00
Mattes D
c13b1931ff
More style checking.
...
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
jammet
61300ab9ef
Rabbit and cooked rabbit now stackable
...
And corrected the alphabetical ordering.
2015-05-09 12:56:23 +02:00
Mattes D
92b8cd2f2a
Merge pull request #1956 from Tri125/master
...
Fixed Magma cube sound and spawn size
2015-05-09 12:44:57 +02:00
worktycho
e2e206d81b
Fixed remaing pragmas
2015-05-09 10:59:08 +01:00
worktycho
4dcd9a9924
clang diagnostic not diagnostics
...
fixed clang pragmas
2015-05-09 10:55:40 +01:00
Alexander Harkness
049ff67416
Merge pull request #1973 from Tri125/QuartzStack
...
Fixed #1893 : Quartz can now stack
2015-05-09 06:58:29 +01:00
Tristan
4642a50d62
GetSizeName of cSlime and cMagmaCube is now static
2015-05-08 20:50:05 -04:00
worktycho
523db778d9
Merge pull request #1972 from Woazboat/CodeCleanup_refactored
...
Fixed compiler warning overrides in Vector3.h
2015-05-09 00:25:38 +01:00
Woazboat
eaba777a0e
Fixed compiler warning overrides in Vector3.h
2015-05-09 01:15:45 +02:00
Tiger Wang
218010cd96
Fixed some Visual Studio warnings
2015-05-08 23:32:02 +01:00
worktycho
1cef39cb73
Move chunk position accesses after the chunk validity checks
2015-05-08 23:20:22 +01:00
Mattes D
9329c2c2cb
Merge pull request #1945 from Woazboat/CodeCleanup_refactored
...
Small code cleanup - clean version
2015-05-08 21:52:41 +02:00
wiseoldman95
290bc2e377
Spaces in cPath
2015-05-08 17:08:15 +03:00
Woazboat
eb84ffe5a6
Added float comparison warning overrides to Vector3::hasNonZeroLength
2015-05-08 15:12:33 +02:00
Woazboat
ed404bc2f6
Ignoring Clang warnings for strict float comparison in Vector::Equals()
2015-05-08 15:12:33 +02:00
Woazboat
689fe6041c
Changed Vector3 Equals function to avoid using memcmp
2015-05-08 15:12:33 +02:00
Woazboat
8a50918d2a
Tracer::signum function now returns int
...
convert c style casts to c++ static casts
Changed fabs() to std::abs()
2015-05-08 15:12:32 +02:00
Woazboat
c74bfc35d6
Check for zero length vector in Trace
...
Added hasNonZeroLength member function to Vector3
2015-05-08 15:12:32 +02:00
Woazboat
0d003a2d2a
Changed Tracer::m_NormalTable to static array
...
Was previously instantiated for every trace
2015-05-08 15:12:32 +02:00
Mattes D
fee690a3d1
Fixed inter-plugin calls.
...
When an inter-plugin call failed due to function not found, the server would maul the LuaState and "yield".
Fixes #1959 .
2015-05-07 23:03:04 +02:00
worktycho
011126293b
Merge pull request #1949 from SafwatHalaby/burn
...
AI - Better shade cover
2015-05-07 21:58:02 +01:00
Tri125
429e545167
Fixed #1893
...
Quartz ore now stack properly
2015-05-07 11:49:11 -04:00
Mattes D
4888f671d1
Merge pull request #1951 from mc-server/BroadcastRefactor
...
Added support for sending additional data in the ParticleEffect packet
2015-05-07 16:14:56 +02:00
Tri125
9f6192687f
Big Magma Cube can now spawn
...
Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4.
2015-05-06 23:56:08 -04:00
Tri125
63af47832d
Fixed the sound issue with the MagmaCube
...
-Name of the sound is correctly capitalized
-Get the appropriate sound depending on its size
2015-05-06 23:12:17 -04:00
tycho
448df85e56
Added support for additional data in the ParticleEffect Packet
...
Also started refactoring how broadcasts are handled
2015-05-07 03:47:46 +01:00
wiseoldman95
40af96b100
AI - Safer WouldBurnAt()
2015-05-06 20:01:06 +03:00
wiseoldman95
753dfb950a
AI - Better shade cover
2015-05-06 20:01:06 +03:00
worktycho
7771091099
Actually empty the open list
2015-05-06 17:26:59 +01:00
wiseoldman95
b8aa38b18d
(duplicate) AI - Livestock escape fixed, water jumping fixed
2015-05-06 17:23:07 +03:00
wiseoldman95
c6dd455d72
PF - Swimming bugfix
2015-05-06 09:27:47 +03:00
wiseoldman95
020e928685
PF - Fixed mobs not reaching leaning player
2015-05-06 07:31:02 +03:00
worktycho
f71d693302
Merge pull request #1939 from SafwatHalaby/Polising
...
AI - More conservative use of ResetPathFinding, some polishing
2015-05-05 14:09:16 +01:00
wiseoldman95
304bc4eca4
AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug
2015-05-05 12:51:58 +03:00
wiseoldman95
94f882b144
Chmod +x CheckBasicStyle.lua
2015-05-05 12:49:07 +03:00
Mattes D
9ba7823252
Merge pull request #1938 from jan64/master
...
Change visual protocol name to include MCServer
2015-05-04 23:28:49 +02:00
Alexander Harkness
adba982257
Merge pull request #1935 from mc-server/fixes
...
Entity improvements
2015-05-04 19:31:53 +01:00
jan64
b1efaa55cd
Change visual protocol name to include MCServer
2015-05-04 17:52:46 +02:00
worktycho
6df0e877e8
Print Build info as part of the crash information
2015-05-04 09:07:03 +01:00
Tiger Wang
a509cf00ef
Entity improvements
...
•Pathfinder improvements
•Fixes #1217
•Fixes #1933
Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
2015-05-03 23:58:12 +01:00
Tiger Wang
335879e224
Merge pull request #1934 from SafwatHalaby/p_IsSolidChunks
...
PathFinder - Fixed nullptr chunk bug
2015-05-03 18:53:37 +01:00
wiseoldman95
33ffa420a6
PathFinder - Fixed nullptr chunk bug
2015-05-03 19:43:11 +03:00
Tiger Wang
f96f9dae66
Merge pull request #1930 from SafwatHalaby/AI_Jump
...
AI - Improved Mob Jumping
2015-05-03 13:23:04 +01:00
wiseoldman95
d68b75a679
AI - Improved Mob Jumping
2015-05-03 14:24:24 +03:00
Mattes D
d757d75b6c
Merge pull request #1932 from SafwatHalaby/F_AssertFix
...
PathFinder - Fixed Howaner's bug
2015-05-03 11:51:09 +02:00
wiseoldman95
599ad97b65
PathFinder - Crash fix, chunks in parameters are now references
2015-05-03 10:49:06 +03:00
Mattes D
e6eeee84e0
Merge pull request #1880 from mc-server/submodules
...
Update submodules
2015-05-03 00:03:07 +02:00
Tiger Wang
9226bdbd4c
Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze
...
Pathfinder optimization
2015-05-02 16:50:42 +01:00
Tiger Wang
114962943b
Merge pull request #1927 from SafwatHalaby/AI_BetterDayLightHandling
...
AI - Much better burning/daylight behavior
2015-05-02 16:50:08 +01:00
Tiger Wang
e4eb039704
Merge pull request #1919 from mathias-github/patch-1
...
Added Guardian and Rabbit to DefaultMonsters in Overworld
2015-05-02 16:10:51 +01:00
