Alex
cbd1f42a08
Merge conflict fixes...
2020-04-06 18:57:13 -04:00
Alex
f8735cf9ba
Update lua_general.cpp
2020-04-06 18:06:18 -04:00
Chris Miles
eb00667eab
Merge pull request #1027 from noudess/patch-15
...
Propose change in location of Stun check as possible resolution to crash
2020-04-06 15:40:39 -05:00
Chris Miles
cbc0ada454
Merge pull request #1017 from noudess/master
...
Fix Issue #849 .
2020-04-06 15:39:43 -05:00
Alex
c6e4b5647f
Merge branch 'master' into getclassname
2020-04-06 16:25:29 -04:00
Alex
40ef4c799b
Update embparser_api.cpp
2020-04-06 16:22:08 -04:00
Alex
8ba7ddd054
Merge branch 'master' into getcurrencyitemid
2020-04-06 16:21:29 -04:00
Paul Coene
973fd376e5
Propose change in location of Stun check as possible resolution to crash
2020-04-06 08:23:57 -04:00
Paul Coene
b5575133cd
Put in braces in my new function as well as the source function.
...
The entire file has implied braces... I'd change them all but fear making a mistake.
2020-04-06 08:10:15 -04:00
Chris Miles
6f846dc4ff
Merge pull request #1025 from KinglyKrab/getracename
...
Add getracename(race_id) to Perl/Lua.
2020-04-06 01:57:54 -05:00
Chris Miles
0461fc1789
Merge pull request #1024 from KinglyKrab/getskillname
...
Add getskillname(skill_id) to Perl/Lua.
2020-04-06 01:57:12 -05:00
Chris Miles
aa6264266e
Merge pull request #1022 from KinglyKrab/getcurrencyid
...
Add getcurrencyid(item_id) to Perl/Lua.
2020-04-06 01:56:25 -05:00
Alex
c2c6282cc7
Add getclassname(class_id, level) to Perl/Lua.
2020-04-06 02:26:58 -04:00
Alex
fab071d9da
Add getracename(race_id) to Perl/Lua.
2020-04-06 02:02:20 -04:00
Alex
358bd60716
Add getskillname(skill_id) to Perl/Lua.
2020-04-06 01:36:46 -04:00
Alex
03ca345b37
Add getcurrencyitemid(currency_id) to Perl/Lua.
2020-04-06 01:07:59 -04:00
Alex
6ddcc2bb8a
Add getcurrencyid(item_id) to Perl/Lua.
2020-04-06 00:49:57 -04:00
Alex
02cac686b6
Add getnpcnamebyid(npc_id) to Perl/Lua.
2020-04-06 00:10:58 -04:00
Alex
035bac1044
Update embparser_api.cpp
2020-04-05 21:22:23 -04:00
Alex
5a8d467d25
Merge branch 'master' into getcharnamebyid
2020-04-05 21:21:15 -04:00
Alex
ae959be5ac
Added getcharnamebyid(char_id) to Perl/Lua.
2020-04-05 21:18:05 -04:00
Alex
41d0b1a947
Add getcharidbyname(name) to Perl/Lua.
2020-04-05 20:41:49 -04:00
Chris Miles
80d1601754
Merge pull request #1009 from noudess/patch-13
...
Hack to fix RoF2 perma IVU/IVA bug after zoning.
2020-04-03 03:22:50 -05:00
Chris Miles
cfcbfea3ab
Merge pull request #1010 from EQEmu/feared_proximity
...
Added proximity check for feared clients
2020-04-03 03:22:29 -05:00
Paul Coene
561433902e
Removed heal per @mackal
2020-04-02 13:08:05 -04:00
Paul Coene
abeb93f1e6
Update entity.h
2020-04-02 12:04:16 -04:00
Paul Coene
ef0b29dc8e
Update entity.cpp
2020-04-02 12:03:45 -04:00
Paul Coene
42f959329d
Update client.h
2020-04-02 11:56:06 -04:00
Paul Coene
a898a1d07b
Update aggro.cpp
2020-04-02 11:55:05 -04:00
Paul Coene
803c3aabe4
Update client.cpp
2020-04-02 11:54:19 -04:00
Paul Coene
15dde4778a
Update aggro.cpp
2020-04-02 11:52:27 -04:00
Chris Miles
47e56f9381
Merge pull request #1015 from EQEmu/checkinstancebycharid
...
Add CheckInstanceByCharID(instance_id, char_id) to Perl/Lua.
2020-03-31 22:21:08 -05:00
Chris Miles
58b9b719f4
Merge pull request #1014 from EQEmu/gettaskname
...
Add gettaskname(task_id) to Perl/Lua.
2020-03-31 22:20:58 -05:00
Alex
a4bf484c74
Add CheckInstanceByCharID(instance_id, char_id) to Perl/Lua.
2020-03-31 23:19:32 -04:00
Alex
4712b56078
Add gettaskname(task_id) to Perl/Lua.
2020-03-31 23:17:25 -04:00
Alex
8974059577
Remove unused variables in resettaskactivity.
2020-03-31 20:01:47 -04:00
Chris Miles
963735e7dd
Merge pull request #1012 from EQEmu/getspellname
...
Add getspellname(spell_id) to Perl/Lua.
2020-03-31 18:53:20 -05:00
Alex
ceb8b31bc0
Add getspellname(spell_id) to Perl/Lua.
2020-03-31 19:48:44 -04:00
Alex
51b31b5e53
Add getitemname(item_id) to Perl/Lua.
2020-03-31 19:31:04 -04:00
Paul Coene
6fb6d8891d
Hack to fix RoF2 perma IVU/IVA bug after zoning.
...
This fixes the problem, but I believe someone with better knowledge of the client than I can find a more "correct" solution.
Posted as a PR per @joligario to solve it for now. Was also asked to put SE_Invisibility in there so that this "hack" is a catch all.
2020-03-31 09:22:16 -04:00
Chris Miles
1b888784eb
Merge pull request #1001 from alimalkhalifa/fix_double_spell_msg
...
Fix double damaging spell messages to non-attacked and non-attacker
2020-03-29 19:23:49 -05:00
Uleat
b94fdda429
Updated command 'editmassrespawn' queries to use resolved names over aliases
2020-03-29 18:02:27 -04:00
Ali Al-Khalifa
a48153baa1
Fix errant formatting
...
Mistakenly had a variable in camelCase
2020-03-30 00:26:56 +03:00
Uleat
a2b381bc9e
Added command 'editmassrespawn' for mass editing of respawn times
2020-03-29 16:34:07 -04:00
Ali
60e194e32b
Fix double damaging spell messages to non-attacked and non-attacker
...
With handling for client attacker and pets thanks to @noudess
2020-03-25 15:41:09 +03:00
Chris Miles
3e98e60877
Merge pull request #996 from KinglyKrab/master
...
Add countitem(item_id) to Perl/Lua.
2020-03-21 21:33:07 -05:00
KimLS
52d2469da2
Rewrite how zone finds ports
2020-03-21 17:05:28 -07:00
Alex
0ab7291625
Add countitem(item_id) to Perl/Lua.
2020-03-19 22:33:07 -04:00
KimLS
e384cf6149
Replace hard coded 12 with EFFECT_COUNT in the two spots I see it used.
2020-03-18 20:42:27 -07:00
Uleat
463c0d9e0e
Added proximity check for feared clients
2020-03-18 16:12:25 -04:00
