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
Noudess
5989edb6ec Fix for static zone issue with mobs congregating after last player zones 2020-04-21 09:09:30 -04:00
Akkadius
2159b5db2d Add damageshieldtypes to content tables 2020-04-21 02:10:52 -05:00
Paul Coene
54d494da36
Fix errant merchant full messages and add logging for later use (#1035) 
* Fix errant merchant full issues, add logging for later use

* Rename merchant list dump more clearly

* spaces around '='

* Added line spacing,

Co-authored-by: Noudess <noudess@gmail.com>
 2020-04-20 23:40:18 -05:00
Alex
d6af1b566f
Merge pull request #1041 from peterigz/master 
Add missing break for OP_AppCombined switch statement
 2020-04-19 19:23:40 -07:00
Akkadius
b6b008e74a Add tenancy support to the dump service 2020-04-19 19:52:19 -05:00
Michael Cook (mackal)
89f5b0b71e
Merge pull request #1040 from alimalkhalifa/redundant-check-during-enter-world 
Removed redundant check during enter world
 2020-04-19 15:22:18 -04:00
Akkadius
6409e02aed Update base repositories to use int as a base to avoid atoi overflow 2020-04-19 04:49:28 -05:00
Akkadius
373fb3f0e7 Decouple zone calls, cleanup logic 2020-04-19 04:36:39 -05:00
Akkadius
ebda1cf601 Add zone store 2020-04-19 03:05:15 -05:00
Akkadius
6a51bcf8fd Fix null reference issue [skip ci] 2020-04-19 01:02:35 -05:00
Akkadius
caa0ffda00 Add Truncate repository method and purge player sold items on world bootup 2020-04-18 23:53:52 -05:00
Akkadius
85daee85b8 Move spawn events from content table to server 2020-04-18 23:26:53 -05:00
Akkadius
e4748a01e0 Fix tradeskill combine logic [skip ci] 2020-04-18 21:50:00 -05:00
Akkadius
472c0cd196 More tweaks [skip ci] 2020-04-18 20:03:34 -05:00
Akkadius
df43a23d98 Another adjustment [skip ci] 2020-04-18 19:52:56 -05:00
Akkadius
74c878a481 Fix [skip ci] 2020-04-18 19:49:20 -05:00
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
peterigz
21ed02ca52 Add missing break for OP_AppCombined switch statement 2020-04-17 18:27:45 +01:00
Ali
6c3ae4580f [skip ci] Win64 eqemu_server.pl 
Changed binaries to x64 and got rid of wget.exe for windows, switched to
native WebClient
 2020-04-17 18:53:35 +03:00
Ali
5d4e53bb25 Removed redundant check during enter world 2020-04-17 18:48:43 +03: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