1
0
Commit Graph

8650 Commits

Author SHA1 Message Date
worktycho
1bdd205eb8 Merge pull request #2073 from SafwatHalaby/rand
Path recalculation improvements
2015-05-20 22:40:25 +01: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
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
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
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
Mattes D
1f3f64fccd APIDump: Removed an unneeded global variable. 2015-05-17 22:33:57 +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
Alexander Harkness
519677c847 Merge pull request #2040 from mc-server/Random
Fix FastRandom seeding
2015-05-17 14:17:38 +01:00
worktycho
c94134ec5e Fix FastRandom seeding
Fixes #1815
Fixes #2021
2015-05-17 13:16:18 +01:00
Alexander Harkness
a22f0795f6 Should disable coveralls. 2015-05-17 09:32:56 +01:00
Alexander Harkness
54b69d0bb8 Merge pull request #2038 from mc-server/InventoryFix
Fixed inventory handling.
2015-05-17 07:13:40 +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
tycho
da58620d45 Added TCLAP 2015-05-16 10:46:51 +01:00
SafwatHalaby
4ffc6621a9 PathFinder uses UniquePtr for cell map. 2015-05-16 10:38:58 +02:00
Alexander Harkness
5a1be26203 Newsletter, content tweak. 2015-05-15 19:01:13 +01:00
worktycho
4605f4f174 Merge pull request #2024 from mc-server/revert-2023-smartPointers
Revert "PathFinder - smart pointers"
2015-05-15 18:55:01 +01:00
worktycho
5c3a85fba1 Revert "PathFinder - smart pointers" 2015-05-15 18:54:45 +01:00
worktycho
c6658af155 Merge pull request #2023 from SafwatHalaby/smartPointers
PathFinder - smart pointers
2015-05-15 18:53:16 +01:00