6511 Commits

Author SHA1 Message Date
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
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
Akkadius
2b1b786f02 Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository 2020-04-06 02:55:46 -05: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
Akkadius
700d062606 Fix windows compile 2020-04-06 01:51:58 -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
Akkadius
a19bb7b544 Merge branch 'feature/peq-expansions' of https://github.com/EQEmu/Server into feature/generated-repositories 2020-04-05 23:21:21 -05:00
Akkadius
be57c57029 More adjustments [skip ci[ 2020-04-05 23:11:25 -05: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
Akkadius
0cce61e85d Filter GetZoneCFG [skip ci] 2020-04-05 20:11:05 -05:00
Akkadius
c8722ea789 Filter start_zones [skip ci] 2020-04-05 19:58:04 -05:00
Akkadius
2f4a217f7a Filter zone_points [skip ci] 2020-04-05 19:49:04 -05:00
Akkadius
9aac84a405 filter traps [skip ci] 2020-04-05 19:45:45 -05:00
Alex
41d0b1a947 Add getcharidbyname(name) to Perl/Lua. 2020-04-05 20:41:49 -04:00
Akkadius
9fbcd99be2 Filter ground spawns [skip ci] 2020-04-05 19:40:40 -05:00
Akkadius
68a2af1bce Filter forage [skip ci] 2020-04-05 19:37:00 -05:00
Akkadius
dadd674b63 Filter fishing [skip ci] 2020-04-05 19:30:02 -05:00
Akkadius
f7d4e51da9 Filter global_loot [skip ci] 2020-04-05 19:20:50 -05:00
Akkadius
6e3922b7cc Filter merchants [skip ci] 2020-04-05 18:50:30 -05:00
Akkadius
9a90bdf91a Filter tradeskills [skip ci] 2020-04-05 18:40:19 -05:00
Akkadius
be8a6b6af4 Add spawn expansion filtering 2020-04-04 06:08:56 -05:00
Akkadius
80baf1b9ed Filter objects by expansion 2020-04-04 05:59:20 -05:00
Akkadius
8a711f3c64 Expansion filtering for doors 2020-04-04 05:51:21 -05:00
Akkadius
c1e58673b2 Add expansion gating for zoning 2020-04-04 05:36:18 -05:00
Akkadius
cc8aa354f1 Add string_id define [skip ci] 2020-04-04 04:15:43 -05:00
Akkadius
bcef171cf9 Fix for tradeskill query [skip ci] 2020-04-04 03:55:53 -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
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