pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-19 16:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,687 Commits 87 Branches 159 Tags
Commit Graph

8687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
b23bc83f0f
Merge pull request #1018 from EQEmu/feature/generated-repositories 
Code Generated Repositories
 2020-04-06 02:24:43 -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
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
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
Akkadius
867ff3dcfa Add constructor to world content service 2020-04-06 00:22:52 -05: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
723a3aa18e Update cmake lists [skip ci] 2020-04-05 23:18:32 -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
Akkadius
725ad9ddf5 Fix comment formatting [skip ci] 2020-04-05 22:23:29 -05:00
Akkadius
c978ca65a4 Split repositories out between a base immutable repository (that does not change) and an extended repository of which developers can add more custom methods to 2020-04-05 22:19:36 -05: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
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
Akkadius
91c874a310 Filter starting_items [skip ci] 2020-04-05 19:43:09 -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
152d985821 Filter loot tables and drops [skip ci] 2020-04-05 19:01:45 -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
17e9198a58 Another typo fix [skip ci] 2020-04-04 21:38:05 -05:00
Akkadius
e17bd303b8 Fix typos to stop triggering Secrets [skip ci] 2020-04-04 18:00:48 -05:00