6986 Commits

Author SHA1 Message Date
kentai
c5a08f978f SaveCharacterTribute..
Skipping Tribute id 0 during save loop.
Aura of Clarity has an id of 0.
2019-01-10 14:50:02 +11:00
Barry
c234adefcc
Merge pull request #3 from EQEmu/master
updating before pull
2019-01-10 14:30:00 +11:00
Chris Miles
34e7d96977
Merge pull request #804 from isenior/DataBucketFix
Properly escape key in SQL queries
2019-01-08 00:41:27 -06:00
=
31b33ba72c Properly escape key in SQL queries 2019-01-08 06:16:57 +00:00
Barry
f617250281
Merge pull request #2 from EQEmu/master
merge_test_updates
2019-01-08 12:57:06 +11:00
Uleat
0ad43977bf Naming convention update for EQEmu::versions::ClientVersionBit 2019-01-07 20:25:43 -05:00
Uleat
8eaed2233f Added namespace expansions 2019-01-07 18:18:35 -05:00
Uleat
0d38808030 Updated EQDictionary entries to allow ease of reading and gui tooltip propagation (pt. 2) 2019-01-07 07:39:43 -05:00
Uleat
011d7a6a29 Updated EQDictionary entries to allow ease of reading and gui tooltip propagation 2019-01-07 00:11:07 -05:00
Akkadius
9c9d46e3ea Fix NpcScaleManager::ScaleNPC MinDMG overflow issue when NPC's load dynamic min with static maxd 2019-01-06 18:46:14 -06:00
Akkadius
d127b1bef9 Client version check on show proximity 2019-01-06 18:41:05 -06:00
Akkadius
5a5d73ca25 [Scaling] Global base scaling data has been updated in new database binary revision 2019-01-06 15:45:13 -06:00
Akkadius
f3782af10e Update eqemu_server.pl [skip ci] 2019-01-04 19:38:33 -06:00
Akkadius
bce3609617 Update system_tables.txt [skip ci] 2019-01-04 19:15:32 -06:00
Akkadius
030339aab8 Update system_tables.txt [skip ci] 2019-01-04 19:06:16 -06:00
Akkadius
57c3e9d146 Update system_tables [skip ci] 2019-01-04 19:03:02 -06:00
Akkadius
4471a0aab5 Update system_tables [skip ci] 2019-01-04 18:58:57 -06:00
Akkadius
e5021241b2 Update user_tables.txt [skip ci] 2019-01-04 18:56:53 -06:00
Akkadius
2da6acee6c Update user_tables.txt [skip ci] 2019-01-04 18:45:11 -06:00
Akkadius
b9abc09294 Update base scaling data [skip ci] 2019-01-04 18:14:11 -06:00
Akkadius
d073d682e7 Merge branch 'master' of https://github.com/EQEmu/Server 2019-01-03 20:49:03 -06:00
Akkadius
d25dff7a72 Update eqemu_server.pl [skip ci] 2019-01-03 20:48:59 -06:00
KimLS
dd295866c5 Merge branch 'master' of github.com:EQEmu/Server 2019-01-03 18:33:31 -08:00
KimLS
85ebda1b5a GMMove minor logic change so clients who are not LD/Charmed will be affected 2019-01-03 18:33:22 -08:00
Akkadius
4a099ca0ef Update maintenance script with new appveyor windows CI build artifact [skip ci] 2019-01-03 19:45:16 -06:00
Uleat
55e856d5fe Update for a couple of things...
- secondary material slot on self spawn (inc. pet)
- instant update of prim/sec weapon ornamentations
2019-01-02 19:41:48 -05:00
Michael Cook (mackal)
f39244acca Comment out some IsBardOnlyStackEffect stuff 2019-01-02 17:09:36 -05:00
Barry
a0ae45e412
Merge pull request #1 from EQEmu/master
testsync
2019-01-02 21:00:50 +11:00
Akkadius
b870873ffe Changelog [skip ci] 2019-01-02 02:57:47 -06:00
Akkadius
4ba5ef9170 Reload scaling data on repop 2019-01-02 02:36:12 -06:00
Akkadius
df68ad6358 More texture / ornamentation work - export SetPrimaryWeaponOrnamentation and SetSecondaryWeaponOrnamentation to Perl / Lua 2019-01-01 04:22:31 -06:00
Akkadius
7a56ffc380 Comment change [skip ci] 2018-12-31 23:20:55 -06:00
Akkadius
c1a02e8244 Add path finder wrapper around devtools proximity show 2018-12-31 23:20:04 -06:00
Akkadius
2c8ed1074a Fix bots build 2018-12-31 23:19:48 -06:00
Akkadius
11a43cd320 Texture work 2018-12-31 03:18:59 -06:00
Akkadius
a24dfd35e8 Update changelog.txt 2018-12-30 14:50:16 -06:00
Akkadius
4e24184089 Merge branch 'master' into movement_manager 2018-12-30 14:49:59 -06:00
Akkadius
82d2843d92 Safely access IsProximitySet 2018-12-28 02:46:10 -06:00
Akkadius
9059efe98e Add proximity show to devtools 2018-12-28 02:39:08 -06:00
KimLS
e96539e6a8 Some changes to navmesh path finding, disabled waypoint nav interface for now, might keep it disabled (i don't think anyones using it anyway) added a rule that might need some fine tuning for navmesh pathfinding 2018-12-24 14:48:11 -08:00
KimLS
d3aa74ff54 Update glm 2018-12-21 00:39:28 -08:00
KimLS
18fa53e09b Fix for broken movespeed in merge 2018-12-21 00:23:04 -08:00
Uleat
8499c3e65d Fix for conditional zone crashes caused by post-bot owner death hate aggregation (irongut_av) 2018-12-19 07:11:59 -05:00
Uleat
487e994f89 Disabled zone map mmf option in cmake 2018-12-19 05:36:48 -05: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