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

8218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akkadius
093509baa9 Few adjustments [skip ci[ 2020-04-18 19:46:19 -05:00
Akkadius
b8c44ee41b Fix container interaction [skip ci] 2020-04-18 18:19:59 -05:00
Akkadius
bcd62b76c4 Fix all expansion enabled filtering [skip ci] 2020-04-18 18:12:25 -05:00
Akkadius
a0f8bbb3b9 Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository 2020-04-18 02:31:43 -05:00
Akkadius
4db646db94 Revert "Merge pull request #1007 from EQEmu/feature/improved-name-generator" 
This reverts commit 3c71e2c91df68421ab32d7f14094f067014cb70b, reversing
changes made to 80d160175450a7e74500f5c773f9e1d72ecb907d.
 2020-04-18 01:44:43 -05:00
Michael Cook (mackal)
5ce1fef9ec
Merge pull request #1039 from alimalkhalifa/gitignore-win-64 
Added a VS ignore for x64 compiles
 2020-04-17 19:58:20 -04:00
Michael Cook (mackal)
874ca053f7
Merge pull request #1038 from alimalkhalifa/fix_charm_break_during_cast_lifetap_nuke 
Fix edge case with NPC pet owners charming PCs
 2020-04-17 14:19:13 -04:00
Ali
b8e7e5bb0d [skip ci] Added a VS ignore for x64 compiles 2020-04-17 18:46:07 +03:00
Ali
15f3697df1 Fix edge case with NPC pet owners charming PCs 
* Addresses #1036
* Cleaned up if statement formatting
* Using Mob::GetOwnerOrSelf() now, which accounts for the edge case

NB: The Mob::SpellOnTarget() and Mob::CommonDamage() methods really
should be looked at and spell logic combined somehow.  Both have if
statements that dodge around the other's conditions to decide which
method sends the CombatDamage_Struct packet
 2020-04-17 10:56:43 +03:00
Chris Miles
16cfad1966
UCS / Raid / Zone Fixes (#1033) 
* Cache EntityList::GetRaidByClient

* Adjustments [skip ci]

* Update entity [skip ci]

* More cleanup [skip ci]

* More tweaks [skip ci]

* Cleanup [skip ci]

* Fix bugs with UCS reconnection on crash / exit, not adding soft deleted characters, put main loop on UV lib

* Reduce log spam that should be debugging; send keepalives to clients so that they properly prune from the connection list

* Shutdown the eventloop to properly shutdown the zone versus calling a hard exit
 2020-04-14 23:28:43 -05:00
JJ
bffeee8d1a
Merge pull request #1034 from TurmoilToad/patch-1 
Update README.md
 2020-04-13 09:37:07 -05:00
TurmoilToad
d29c0fc332
Update README.md 
Updated wiki link.
 2020-04-13 10:01:22 -04:00
Chris Miles
a031c20e7e
Update peq-dump.sh [skip ci] 2020-04-11 16:44:19 -05:00
Akkadius
3daf03c796 Remove errant cout [skip ci] 2020-04-11 05:57:31 -05:00
Akkadius
5b4c4bfd66 Implement content flags 2020-04-11 05:48:41 -05:00
Akkadius
47b8aa3f18 Export quest calls 2020-04-11 04:38:42 -05:00
Akkadius
287fc5d313 Create 2020_04_11_expansions_content_filters.sql 2020-04-11 03:13:03 -05:00
Akkadius
77cacf5cd1 Add std::string WorldContentService::GetCurrentExpansionName() [skip ci] 2020-04-11 03:11:09 -05:00
Akkadius
e0363a8fe1 Repository tweaks [skip ci] 2020-04-11 02:47:54 -05:00
Akkadius
5c7eb0707f Bulk load goallists 2020-04-11 02:19:58 -05:00
Akkadius
423bb7f0b3 Adjust content bootstrapping in zone [skip ci] 2020-04-11 01:58:35 -05:00
Chris Miles
67d3cab80b
Merge pull request #1030 from EQEmu/feature/send-to-guild-hall-instance-fixes 
Implement SendToGuildHall and Improve Instance ID Cycling
 2020-04-11 01:33:12 -05:00
Akkadius
b41f2dac66 Clamp value for max reserved instance id [skip ci] 2020-04-10 03:26:09 -05:00
Akkadius
b5b473f25d Update peq dump [skip ci] 2020-04-10 03:21:33 -05:00
Akkadius
0dc3e5ba35 Add jank permanent reference pass back in [skip ci] 2020-04-10 03:20:41 -05:00
Akkadius
499fe153ab Tweak peq dump [skip ci] 2020-04-10 02:56:45 -05:00
Akkadius
d1349e5ac9 Oops, math 2020-04-10 02:30:46 -05:00
Akkadius
bd8e94ff17 Use version 1 for GH 2020-04-10 02:20:56 -05:00
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
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