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

6943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KimLS
18fa53e09b Fix for broken movespeed in merge 2018-12-21 00:23:04 -08:00
Akkadius
07ab96b883 Post merge adjustments 2018-12-17 01:51:43 -06:00
Akkadius
0681e6dbb2 Merge branch 'master' into movement_manager 2018-12-17 01:39:37 -06:00
Chris Miles
bbec352a80
Update system_tables.txt [skip ci] 2018-12-17 01:19:02 -06:00
Chris Miles
54f322d2aa
Merge pull request #801 from EQEmu/feature/global-base-scaling 
Feature/global base scaling
 2018-12-16 23:16:25 -08:00
Akkadius
52df2fa8d3 Merge branch 'master' into feature/global-base-scaling 2018-12-17 00:35:30 -06:00
Akkadius
6b18c71c11 Changelog 2018-12-17 00:35:08 -06:00
Michael Cook (mackal)
bbbee6e6b2 Fix some bard stacking issues (mainly AE DOT) 
Please report if it breaks anything (shouldn't)
 2018-12-17 00:51:18 -05:00
Akkadius
e835514fca Merge branch 'master' into feature/global-base-scaling 2018-12-16 22:48:55 -06:00
Akkadius
a9fc1d89c8 Update eqemu_logsys.cpp 2018-12-16 04:21:37 -06:00
Akkadius
c32b31ffff Add npc_scale_global_base table and add devtools command and toggling functionality 2018-12-16 03:59:08 -06:00
Akkadius
bc6109ec8f Some adjustments to scale manager 2018-12-16 02:30:53 -06:00
Chris Miles
bfe85a2f1b
Merge pull request #798 from prestanneth/master 
Tidied Comments
 2018-12-15 23:47:55 -08:00
Akkadius
a7f2eebfdf Entity window adjustments 2018-12-16 01:46:55 -06:00
Chris Miles
e4b9ba7ff9
Merge pull request #799 from KinglyKrab/master 
Resolved a possible scaling issue with the way CharMaxLevel works wit…
 2018-12-14 22:41:52 -08:00
Kinglykrab
3a757a7a85 Resolved a possible scaling issue with the way CharMaxLevel works with quest globals and data buckets. 2018-12-15 01:37:13 -05:00
Chris Miles
9c1e14a4ab Merge branch 'master' into feature/global-base-scaling 2018-12-14 02:40:33 -06:00
kentai
e367fee4bc Tidied Comments 2018-12-14 16:24:15 +11:00
Kinglykrab
838ab5b77e Missed embparser_api.cpp and lua_general.cpp. Sorry. 2018-12-13 20:25:05 -05:00
Kinglykrab
8ae9c99f3d Added new data bucket and quest functionality. 
Added multiple new instance related quest functions.
	1. quest::GetInstanceIDByCharID(const char *zone, int16 version, uint32 char_id)
		- Allows you to pull the instance ID of a client by character ID.
	2. quest::AssignToInstanceByCharID(uint16 instance_id, uint32 char_id)
		- Allows you to assign an instance to a client by character ID.
	3. quest::RemoveFromInstanceByCharID(uint16 instance_id, uint32 char_id)
		- Allows you to remove a client from an instance by character ID.

Added spell buckets, similar to spell globals.
	- Uses a new spell_buckets table and the Spells:EnableSpellBuckets rule.

Added max level by data bucket.
	- Uses data bucket char_id-CharMaxLevel and Character:PerCharacterBucketMaxLevel rule.
 2018-12-13 19:42:31 -05:00
Michael Cook (mackal)
f4dee67d7c
Merge pull request #797 from noudess/master 
Fix typo in manifest.
 2018-12-12 12:56:40 -05:00
Noudess
cfbd8e727a Fix typo in manifest. 2018-12-12 09:15:54 -05:00
Michael Cook (mackal)
ce5c09441f
Merge pull request #795 from noudess/master 
Fix the LoadGFG function to no longer have the unused parameter.
 2018-12-11 17:20:48 -05:00
Noudess
58d0aef90d Fix the LoadGFG function to no longer have the unused parameter. 
Fixed the command that was passing the wrong second parameter.
 2018-12-07 12:17:27 -05:00
Michael Cook (mackal)
a4a69be0f5
Merge pull request #794 from noudess/master 
Small fix for an NPC on a faction but with no entries in npc_faction_entries
 2018-12-06 19:44:17 -05:00
Noudess
9bf23a131b Small fix for an NPC on a faction but with no entries in npc_faction_entries. 2018-12-06 14:25:58 -05:00
KimLS
dacbce1c5f Some changes to fixz while pathing 2018-11-29 23:11:39 -08:00
Uleat
df2e68ad31 Added missing return value 2018-11-29 22:55:04 -05:00
JJ
86ade2261b Move name_filter table from user_tables.txt to system_tables.txt [skip ci] 2018-11-26 18:08:34 -05:00
KimLS
1654dd6baf Some debug logging for water maps 2018-11-25 21:11:42 -08:00
KimLS
0662e3c780 Merge fix with sql 2018-11-25 15:35:52 -08:00
KimLS
db5c42735c Fix a situation where nav could end up not being reset 2018-11-25 15:33:04 -08:00
JJ
e46b9043ee And the version. [skip ci] 2018-11-25 16:55:56 -05:00
JJ
fc69824a3f Oops. be17d21149 2018-11-25 16:53:00 -05:00
JJ
be17d21149 Add primary key to name_filter table. [skip ci] 2018-11-25 16:46:42 -05:00
KimLS
78adc7590e Missing line from secret's patch, should address sometimes npcs stop moving. 2018-11-25 00:03:47 -08:00
KimLS
a26cf5f1de Some changes to fix various issues 2018-11-24 15:46:50 -08:00
KimLS
cfba613efd Remove floating logic, fix for some bestz logic 2018-11-21 22:10:51 -08:00
KimLS
b55771ca7d Some fixes as well as floating behavior for boats 2018-11-21 16:34:52 -08:00
Chris Miles
50525429ff
Merge pull request #787 from noudess/master 
Fix Get Corpse to fetch the corpse indicated.
 2018-11-21 09:04:50 -06:00
Chris Miles
9ab8a6d197
Merge pull request #791 from mthogan/master 
Fix omission for Perl/Lua binds for get_data_expires()
 2018-11-21 09:02:21 -06:00
Matt Hogan
ecf3c47968 Fix omission for Perl/Lua binds for get_data_expires() 2018-11-21 09:38:34 -05:00
Michael Cook (mackal)
c6bb4cd44a Update system_tables.txt [skip ci] 2018-11-19 20:40:52 -05:00
Akkadius
f3067872c4 Appveyor take 2 2018-11-19 02:57:38 -06:00
Akkadius
020b144449 Try to make appveyor happy 2018-11-19 02:52:53 -06:00
Akkadius
d215ccfa8c Few adjustments 2018-11-19 02:40:10 -06:00
KimLS
b772518901 Selective commit of secrets somewhat broken pr 2018-11-18 20:29:21 -08:00
Uleat
e43b8d8463 Limited Client::GetTraderItems() to 80-item return 2018-11-18 21:11:22 -05:00
Michael Cook (mackal)
0d0c22b5e5 Update corpse decay cap to 24 hours I guess 
Some people were wanting higher, w/e
 2018-11-18 16:06:31 -05:00
Michael Cook (mackal)
aae316c171 Fix formating in ZoneDatabase::GetDecayTimes() 2018-11-18 16:03:38 -05:00