Akkadius
|
ed7ce38fe0
|
Add some pointer safety checks to underlying data service call [skip ci]
|
2019-11-03 14:34:07 -06:00 |
|
Michael Cook (mackal)
|
dff23793c6
|
Merge pull request #930 from noudess/patch-2
Fix damage done by poison proc changes
|
2019-11-02 15:54:09 -04:00 |
|
Paul Coene
|
10c383fd86
|
Update attack.cpp
|
2019-11-02 15:24:17 -04:00 |
|
Paul Coene
|
2a8ab28551
|
Fix damage done by poison proc changes
spell procs were not firing due to bad conditional.
|
2019-11-02 15:19:15 -04:00 |
|
Akkadius
|
769df9ce7b
|
Allow hotfix to be ran in bin paths [skip ci]
|
2019-11-02 00:18:54 -05:00 |
|
Akkadius
|
b1704377da
|
Fix for pointer crash [skip ci]
|
2019-11-01 22:36:04 -05:00 |
|
Akkadius
|
c90bed9f69
|
Fix regression from build work changes https://github.com/EQEmu/Server/issues/929
|
2019-11-01 16:14:56 -05:00 |
|
Kinglykrab
|
40c835c576
|
Merge branch 'master' of https://github.com/EQEmu/Server
|
2019-10-31 23:39:07 -04:00 |
|
Kinglykrab
|
15609ab1e8
|
Added optional 'ignore_mods' parameter to AddLevelBasedExp() in Perl and Lua.
|
2019-10-31 23:38:09 -04:00 |
|
Uleat
|
384b1b89c7
|
Merge branch 'master' of https://github.com/EQEmu/Server
|
2019-10-30 19:19:17 -04:00 |
|
Uleat
|
01b3b41bae
|
Fix for mailkey-based server crashes (does not fix the problem of non-existent mailkeys...)
|
2019-10-30 07:22:11 -04:00 |
|
Akkadius
|
e2630d2b20
|
Return blank string on null socket [skip ci]
|
2019-10-29 23:16:37 -05:00 |
|
Akkadius
|
dadeb01045
|
One more arg [skip ci]
|
2019-10-29 20:55:27 -05:00 |
|
Akkadius
|
31914eb0b6
|
Properly set box size [skip ci]
|
2019-10-29 20:32:20 -05:00 |
|
Uleat
|
135eaae402
|
Merge pull request #925 from prestanneth/master
Added some backticks on mysql keywords
|
2019-10-23 22:22:51 -04:00 |
|
kentai
|
62be0c475e
|
Added backticks on sql keyword
|
2019-10-24 02:44:57 +11:00 |
|
kentai
|
1c6971da4a
|
Merge branch 'master' of https://github.com/prestanneth/Server
|
2019-10-24 02:11:13 +11:00 |
|
Uleat
|
653801a54b
|
Fix for tradeskill combine-based zone crashes
|
2019-10-18 20:47:21 -04:00 |
|
KentaiVZ
|
6a393afdf3
|
Merge pull request #2 from EQEmu/master
SYNC
|
2019-10-18 16:30:58 +11:00 |
|
Michael Cook (mackal)
|
b0efe88a03
|
Merge pull request #922 from noudess/spawn2
Fix some bugs with the use of the model field in npc_types
|
2019-10-15 21:02:36 -04:00 |
|
Noudess
|
7eb2e834b1
|
Fix some bugs with the use of the model field in npc_types
|
2019-10-15 13:22:49 -04:00 |
|
KimLS
|
754ed71f9a
|
Update dependency locations
|
2019-10-15 00:07:02 -07:00 |
|
Alex
|
4f538fbdad
|
Merge pull request #921 from EQEmu/master_build_revert
Build merge into master again
|
2019-10-13 21:47:06 -07:00 |
|
Uleat
|
99ee4e04d9
|
Added bot command 'precombat' to manually set pre-combat mode rather than the 'assumption' process used before; Added rule Bot:AllowOwnerOptionAltCombat to allow admins control over its use
|
2019-10-13 22:24:06 -04:00 |
|
Alex
|
7989451c36
|
Merge pull request #920 from EQEmu/build
Build
|
2019-10-13 18:50:33 -07:00 |
|
Alex
|
4c9c070d67
|
Merge pull request #919 from EQEmu/revert-917-revert-916-build
Revert "Revert "Build System Updated""
|
2019-10-13 18:49:42 -07:00 |
|
Alex
|
058a722569
|
Revert "Revert "Build System Updated""
|
2019-10-13 18:49:16 -07:00 |
|
Alex
|
1d460bd636
|
Merge pull request #918 from EQEmu/revert-821-feature/remove_boost
Revert "Remove boost"
|
2019-10-13 01:30:26 -07:00 |
|
Alex
|
47ee5b5afb
|
Revert "Remove boost"
|
2019-10-13 00:53:31 -07:00 |
|
Alex
|
7edfdbd9db
|
Merge pull request #917 from EQEmu/revert-916-build
Revert "Build System Updated"
|
2019-10-12 21:08:09 -07:00 |
|
Alex
|
b9f57f1f28
|
Revert "Build System Updated"
|
2019-10-12 21:07:06 -07:00 |
|
Alex
|
579471afcc
|
Merge pull request #916 from EQEmu/build
Build System Updated
|
2019-10-12 19:04:26 -07:00 |
|
KimLS
|
04e7238a6e
|
Fix for wrong perl lib in auto dependencies
|
2019-10-11 15:53:23 -07:00 |
|
KimLS
|
0e9fae3181
|
Merge remote-tracking branch 'origin/master' into build
|
2019-10-10 17:29:17 -07:00 |
|
Michael Cook (mackal)
|
37d4371acd
|
Merge pull request #915 from noudess/spawn2
Old School poison changes to be close to live. Added extending proci…
|
2019-10-10 17:32:48 -04:00 |
|
Noudess
|
bcf0af0a8d
|
Old School poison changes to be close to live. Added extending procing rule.
|
2019-10-10 14:32:27 -04:00 |
|
Chris Miles
|
f17779efeb
|
Merge pull request #913 from EQEmu/quest_logging
Added logging functions to perl/lua apis
|
2019-10-08 20:56:03 -05:00 |
|
Uleat
|
3aed0e257a
|
Added logging functions to perl/lua apis
|
2019-10-08 20:35:03 -04:00 |
|
Uleat
|
a26227f258
|
Fix for #npceditmass command failure on string-based updates
|
2019-10-07 22:15:24 -04:00 |
|
Michael Cook (mackal)
|
db085b7126
|
Merge pull request #911 from noudess/spawn2
Old school apply poison was allowing multiple poisons at once.
|
2019-10-07 17:18:35 -04:00 |
|
Paul Coene
|
bca567d2f5
|
Merge branch 'master' into spawn2
|
2019-10-07 13:25:12 -04:00 |
|
Noudess
|
c62d9040cb
|
Old school apply poison was allowing multiple poisons at once.
|
2019-10-07 13:16:52 -04:00 |
|
Uleat
|
abb1086e52
|
Added rules Bots:AllowOwnerAutoDefend and Bots:LeashDistance
|
2019-10-05 23:11:16 -04:00 |
|
Uleat
|
1f04938535
|
Merge pull request #910 from EQEmu/bot_ai_rework
Updated Bot AI to make use of neglected commands/features
|
2019-10-05 19:15:13 -04:00 |
|
Uleat
|
12204dd927
|
Updated Bot AI to make use of neglected commands/features
|
2019-10-05 18:17:23 -04:00 |
|
Chris Miles
|
b118864920
|
Merge pull request #907 from alimalkhalifa/master
Added automated initialization of login.json [ci skip]
|
2019-10-05 00:54:49 -05:00 |
|
Ali
|
af749cf07a
|
Updated do_install_config_login_json to pull from EQEmu repo [ci skip]
|
2019-10-01 23:14:01 +03:00 |
|
Ali
|
bf45e8b491
|
Fix missing ;s [ci skip]
|
2019-10-01 21:31:22 +03:00 |
|
KimLS
|
abd14f556a
|
Merge remote-tracking branch 'origin/master' into build
|
2019-09-30 14:02:39 -07:00 |
|
Akkadius
|
29b90fbeaf
|
Fix escaping issue in #npcspawn create
|
2019-09-30 14:14:59 -05:00 |
|