pa/eqemu-server
2
0 Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-10-08 13:43:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,451 Commits 89 Branches 159 Tags
7cc23fcbebd438e3fcd246aa70d9fe6ee37d855c
Commit Graph
75 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Coene 7cc23fcbeb Removed duplicate code for pruning merhantlist_temp 
The code already exists, guarded by a rule.
 2020-08-19 14:48:28 -04:00
Paul Coene 44a1256eb9 Merge pull request #18 from EQEmu/master 
Merge mainline into my fork
 2020-07-27 09:53:56 -04:00
Paul Coene a8928d4a39 Merge pull request #17 from EQEmu/master 
Merge master into our fork
 2020-07-08 15:48:20 -04:00
Paul Coene 0202a2ad23 Merge pull request #16 from EQEmu/master 
Merge master into main
 2020-06-30 07:56:00 -04:00
Paul Coene 9195e5e961 Merge pull request #15 from EQEmu/master 
Merge master into my branch
 2020-05-28 08:19:35 -04:00
Paul Coene 0e04e42bea Added two missing agnostic mods 2020-05-25 16:48:03 -04:00
Paul Coene 40e690f8e3 SQL to add the needed guktan and drakkin faction fixes missed by faction_conversion. 2020-05-25 16:25:55 -04:00
Paul Coene 3ebbcd84d4 Merge pull request #14 from EQEmu/master 
Merge Mainline into my base
 2020-05-20 15:52:59 -04:00
Paul Coene c799267c86 Merge pull request #13 from EQEmu/master 
Merge from master
 2020-05-11 08:37:28 -04:00
Paul Coene ca50013334 Merge pull request #12 from EQEmu/master 
Merge base
 2020-05-08 09:54:23 -04:00
Paul Coene 855e592d22 Merge pull request #10 from EQEmu/master 
Merge from master
 2020-04-30 11:33:13 -04:00
Paul CoeneandNoudess 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
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
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
Paul Coene 6fb6d8891d Hack to fix RoF2 perma IVU/IVA bug after zoning. 
This fixes the problem, but I believe someone with better knowledge of the client than I can find a more "correct" solution.

Posted as a PR per @joligario  to solve it for now.  Was also asked to put SE_Invisibility in there so that this "hack" is a catch all.
 2020-03-31 09:22:16 -04:00
Paul Coene 482584f95a Merge pull request #4 from EQEmu/master 
Update to master
 2020-03-05 10:37:41 -05:00
Paul Coene 08002eacea restore some code unintentionally removed 
Checked with @KimLS.
 2020-02-24 16:51:05 -05:00
Paul Coene 10e5f0e949 Update ruletypes.h 2020-02-16 12:28:18 -05:00
Paul Coene bd4fa4fb6b Implement RuleB(Skills, RequireTomeHandin) 2020-02-16 11:42:55 -05:00
Paul Coene 5901df4485 Added Skills, RequireTomeHandin rule 
Default behavior will remain the same as current code.

If set to true, tomes will need to be turned in to Guild Masters to learn, like in older times.
 2020-02-16 11:41:08 -05:00
Paul Coene 8cda4257b4 Merge pull request #3 from EQEmu/master 
Update to Master
 2020-02-16 11:38:20 -05:00
Paul Coene 1528e7cb09 Update npc.cpp 2020-02-05 16:28:07 -05:00
Paul Coene 8dacadb4f9 Update ruletypes.h 2020-02-05 16:26:46 -05:00
Paul Coene e19db3b7f4 Update npc.cpp 2020-02-05 16:25:24 -05:00
Paul Coene e1adffc4be Update npc.cpp 2020-02-05 15:32:07 -05:00
Paul Coene 6b27e88315 Update attack.cpp 2020-02-05 14:42:37 -05:00
Paul Coene 4accb4ea2a Update ruletypes.h 2020-02-05 14:41:36 -05:00
Paul Coene c419df52ff Merge pull request #2 from EQEmu/master 
Get up to date
 2020-02-05 14:40:12 -05:00
Paul Coene b4f42c150f Update database.cpp 
Change variable_name and use LastInsertedID() to remove unneeded call.
 2020-02-05 12:31:29 -05:00
Paul Coene ad1f18306b Update command.cpp 
Fix #size command to be useful for anyone using the model field in npc_types.

All will remain the same for everyone else.
 2020-02-03 13:47:16 -05:00
Paul Coene 6a984a53b5 Merge pull request #1 from noudess/patch-9 
Implement DefaultGuild rule
 2020-02-03 13:02:55 -05:00
Paul Coene f9b3b7aecf Implement DefaultGuild rule 2020-02-03 12:54:26 -05:00
Paul Coene 5fefdfcc17 Added new DefaultGuild rule to Character 2020-02-03 12:50:05 -05:00
Paul Coene ab3d65b2ea Fix FixZ regarding the use of model in npc_types 
This fix only impacts those that use the model field in npc_types to override race on the client.

GetModel() returns model if set, otherwise race.

As a refresher, the model field is there so the server can still see a mob as its base race for things like bane, while the client can use a new model.

FixZ needs to know about this.
 2020-02-01 20:29:48 -05:00
Paul Coene 83ad9c86db Update attack.cpp 2020-01-30 15:19:02 -05:00
Paul Coene bcb08f99f0 Update attack.cpp 2020-01-30 15:05:41 -05:00
Paul Coene f968d0df4c Reduce changes to those suggested by @mackal 2020-01-30 15:04:06 -05:00
Paul Coene 712366293d Further refine monk weight checks for floating point 2020-01-30 11:10:57 -05:00
Paul Coene 51fb7d8b77 _GetRunSpeed did not correctly report aa mods for Clients. 
I actually believe this was some old cut-n-paste error.  aa_mod was being set to a total of all (3) caps - like the previous line.
 2020-01-20 15:38:07 -05:00
Paul Coene 9cc73f2b4a Fix formula for mana 
There were errors in the old formula for wis/int values over 201.
 2020-01-20 14:24:29 -05:00
Paul Coene 8eb60302a2 Update attack.cpp 
Fix to Monk Mitigation.  Divided weight by 10 to convert to stones.
 2020-01-19 16:03:09 -05:00
Paul Coene d47bf6a73b Update waypoints.cpp 
Fixed log message to be correct.
 2020-01-17 14:35:32 -05:00
Paul Coene eed4a648b4 Added addition usage message for #grid for #grid show. 2020-01-04 16:17:25 -05:00
Paul Coene 10c383fd86 Update attack.cpp 2019-11-02 15:24:17 -04:00
Paul Coene 2a8ab28551 Fix damage done by poison proc changes 
spell procs were not firing due to bad conditional.
 2019-11-02 15:19:15 -04:00
Paul Coene 96e5adc8de Merge pull request #6 from noudess/patch-2 
Allow for new merchant corpse rule
 2019-10-28 10:24:15 -04:00
Paul Coene 6609728188 Allow for new merchant corpse rule 2019-10-28 10:21:33 -04:00
Paul Coene 74ca949a5b Added rule to allow merchants to have a corpse. 2019-10-28 10:16:20 -04:00
Paul Coene bca567d2f5 Merge branch 'master' into spawn2 2019-10-07 13:25:12 -04:00
Paul Coene 26e14c02b6 Merge pull request #4 from EQEmu/master 
Merge master changes into my fork.
 2019-09-02 08:50:51 -04:00
Paul Coene 5a0fcdfefd Merge branch 'master' into light-wield 2019-08-16 10:30:54 -04:00
Paul Coene 49094bcfbc Fix attack to not attack with a non-weapon (expand cancel to include cancel of light) 
I found a single item in the db, Flickering Watchtower Torch, that is a light item type but has 1 damage/100 delay.  This code would make that weapon not operate, if we care.
 2019-08-16 10:28:06 -04:00
Paul Coene d3641be6c0 Update loottables.cpp 2019-08-05 09:30:57 -04:00
Paul Coene 06fbd7103e Update client_packet.cpp 2019-08-05 09:24:22 -04:00
Paul Coene acef4c0264 Merge pull request #3 from EQEmu/master 
Pull down all of the latest
 2019-08-05 08:18:20 -04:00
Paul Coene a402f01514 Update perl_mob.cpp 2019-04-24 17:26:17 -04:00
Paul Coene dfe4bb5b78 Update lua_mob.cpp 2019-04-24 10:32:09 -04:00
Paul Coene c24bfaf35f Update lua_mob.h 2019-04-24 10:30:24 -04:00
Paul Coene 7dc1e10956 Update perl_mob.cpp 2019-04-24 10:10:48 -04:00
Paul Coene 3105577c1b Fix the auto-correct mechanism on illegal faction 
Auto correct was not using the new client_base_data for min/max.
 2019-04-13 12:39:45 -04:00
Paul Coene c06774ca61 Fix version to match committed manifest 2019-04-13 07:22:16 -04:00
Paul Coene 0426a15fec Update mob.cpp 2019-04-12 19:34:28 -04:00
Paul Coene 5b374927f2 Update mob.cpp 2019-04-12 19:16:00 -04:00
Paul Coene 5e008a5a97 Fix SetCurrentWP to allow negatives 
Needed to make new roambox constants (that were used instead of 666) actually work.
 2019-04-03 15:56:12 -04:00
Paul Coene 6dbd579f4f Merge branch 'master' into master 2019-02-28 15:05:18 -05:00
Paul Coene e71eefab50 Merge branch 'master' into master 2018-12-18 11:33:52 -05:00