Akkadius
|
d89b2f11b5
|
Get time remaining directly from database for now, this needs to be cached better at the zone state level, I'll refactor this when repositories are merged in
|
2020-04-10 02:03:30 -05:00 |
|
Akkadius
|
88ff56b2f2
|
Add client->SendToGuildHall - have instances properly cycle out IDs
|
2020-04-10 01:43:00 -05:00 |
|
Akkadius
|
1728923bbb
|
Revert "Merge pull request #1007 from EQEmu/feature/improved-name-generator"
This reverts commit 3c71e2c91df68421ab32d7f14094f067014cb70b, reversing
changes made to 80d160175450a7e74500f5c773f9e1d72ecb907d.
|
2020-04-08 16:00:27 -05:00 |
|
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
|
54b33f959e
|
Merge pull request #1026 from KinglyKrab/getclassname
Add getclassname(class_id, level) to Perl/Lua.
|
2020-04-06 16:25:39 -04:00 |
|
Alex
|
c6e4b5647f
|
Merge branch 'master' into getclassname
|
2020-04-06 16:25:29 -04:00 |
|
Alex
|
928070e994
|
Merge pull request #1023 from KinglyKrab/getcurrencyitemid
Add getcurrencyitemid(currency_id) to Perl/Lua.
|
2020-04-06 16:22:50 -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 |
|
Chris Miles
|
c3cbe90575
|
Merge pull request #1021 from KinglyKrab/getnpcnamebyid
Add getnpcnamebyid(npc_id) to Perl/Lua.
|
2020-04-06 01:56:01 -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
|
4c348baabd
|
Merge pull request #1020 from KinglyKrab/getcharnamebyid
Added getcharnamebyid(char_id) to Perl/Lua.
|
2020-04-05 21:26:31 -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 |
|
Chris Miles
|
4157a03f32
|
Merge pull request #1019 from KinglyKrab/getcharidbyname
Add getcharidbyname(name) to Perl/Lua.
|
2020-04-05 20:14:00 -05:00 |
|
Alex
|
41d0b1a947
|
Add getcharidbyname(name) to Perl/Lua.
|
2020-04-05 20:41:49 -04:00 |
|
Chris Miles
|
3c71e2c91d
|
Merge pull request #1007 from EQEmu/feature/improved-name-generator
Improved Random Name Generator
|
2020-04-03 03:23:08 -05: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 |
|
Michael Cook (mackal)
|
7aa8db76f4
|
Merge pull request #1016 from noudess/patch-14
Update ruletypes.h
|
2020-04-02 14:44:52 -04: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 |
|
Paul Coene
|
f2b68e6783
|
Merge pull request #5 from EQEmu/master
Update from master
|
2020-04-02 11:50:50 -04:00 |
|
Paul Coene
|
8193b04627
|
Update ruletypes.h
|
2020-04-01 08:41:40 -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 |
|
Chris Miles
|
9362890d26
|
Merge pull request #1013 from EQEmu/unusedtaskcode
Remove unused variables in resettaskactivity.
|
2020-03-31 22:11:37 -05:00 |
|
KimLS
|
6d3848b2c7
|
Removed make_unique from namegen, was conflicting with real make_unique on windows and we're set to cxx11 still
|
2020-03-31 19:55:27 -07:00 |
|
Alex
|
8974059577
|
Remove unused variables in resettaskactivity.
|
2020-03-31 20:01:47 -04:00 |
|