7351 Commits

Author SHA1 Message Date
Imbris
89a2786bbf Turn off incremental compilation to avoid fingerprints bug 2021-03-28 15:49:58 -04:00
Samuel Keiffer
c2bc45fbfd Merge branch 'sam/mindflayer-loot' into 'master'
Loot table hotfix

See merge request veloren/veloren!2017
2021-03-28 16:19:08 +00:00
Ben Wallis
a75db4b436 Merge branch 'damaged-spellbag-pricefix' into 'master'
Reclassify Glowing Remains as Armor for econsim.

See merge request veloren/veloren!2016
2021-03-28 15:47:54 +00:00
Sam
c18726753d Loot table hotfix 2021-03-28 11:26:30 -04:00
Joshua Yanovski
e686b6b4bc Merge branch 'treeco/disable-human-rtsim' into 'master'
Temporarily disable humanoid rtsim entities until their pathfinding is fixed

See merge request veloren/veloren!2015
2021-03-28 15:01:05 +00:00
Avi Weinstock
69665c0b0d Reclassify Glowing Remains as Armor for econsim. 2021-03-28 10:29:40 -04:00
Treeco
e88f66f92e Temporarily disable humanoid rtsim entities until their pathfinding is fixed 2021-03-28 14:49:40 +01:00
Ben Wallis
4f9bd7b5a4 Merge branch 'swilliams/husk-drops-fix' into 'master'
Fix husk drops in miniboss rooms.

See merge request veloren/veloren!2014
2021-03-28 10:39:21 +00:00
Scott Williams
998d5f0719 Fix husk drops in miniboss rooms. 2021-03-28 10:39:20 +00:00
Marcel
6ecd0b68f3 Merge branch 'christof/item_price_fix' into 'master'
Fix the price category of the newly added items

See merge request veloren/veloren!2010
2021-03-28 09:25:52 +00:00
Christof Petig
b94013943f Fix the price category of the newly added items 2021-03-28 09:25:51 +00:00
Samuel Keiffer
a4ccf5db67 Merge branch 'sam/mindflayer-rework' into 'master'
Mindflayer Rework

See merge request veloren/veloren!1957
2021-03-28 02:10:51 +00:00
Sam
8c91749cf8 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
Sam
bda64409c5 Removed potential for divide by zero 2021-03-27 21:06:21 -04:00
Sam
d5c44cd2a2 Fixed offset of decayed health 2021-03-27 21:06:21 -04:00
Sam
d707fbbd83 Repalced stone golems with 10 husks in T5 dungeon miniboss rooms. 2021-03-27 21:06:18 -04:00
Monty
8d0b1e201a decay display for groups and overhead bars 2021-03-27 21:05:17 -04:00
Sam
1df8260208 Removed experimental group health decay 2021-03-27 21:05:17 -04:00
jshipsey
094fb4ee95 flayer anims 2021-03-27 21:05:16 -04:00
Sam
c40ad922de Particles for summoned minions 2021-03-27 21:05:15 -04:00
Sam
20989428d3 Balance tweaks 2021-03-27 21:05:15 -04:00
Monty Marz
25f4f15c37 decayed health texture 2021-03-27 21:05:14 -04:00
Monty Marz
ee0214317f WIP animation 2021-03-27 21:05:13 -04:00
Sam
42ca607eab Initial work to show decayed health in healthbars 2021-03-27 21:05:13 -04:00
Sam
43290d1dc3 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Sam
75c0e3f4eb Added particles for lifesteal effect 2021-03-27 21:05:12 -04:00
Sam
c315278673 Mindflayer now only summons minions at set thresholds of health. 2021-03-27 21:05:11 -04:00
Sam
4358908fda Mindflayer can now lifesteal off of its own minions 2021-03-27 21:05:11 -04:00
Sam
c1db5e230b Mindflayer summons husks instead of dogs now 2021-03-27 21:05:10 -04:00
Sam
e0ed4ca4d2 Particles for blink 2021-03-27 21:05:09 -04:00
Snowram
5b83b912f3 Adds husk npc 2021-03-27 21:05:09 -04:00
Sam
7e7a6001dc Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner. 2021-03-27 21:05:07 -04:00
Sam
02de4631c1 Improved mindflayer AI. Tweake some abilities. 2021-03-27 21:05:07 -04:00
Sam
17eab079ee Gave mindflayer AI.
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
5ebd2cf1d0 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
Sam
90e33cafb5 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Sam
c2e66c949c Added necrotic vortex attack to mindflayer 2021-03-27 21:05:03 -04:00
Sam
3452857d5c Added cursed flame attack to mindflayer 2021-03-27 21:05:03 -04:00
Imbris
edd612484a Merge branch 'desttinghim/changelog-patch-68444' into 'master'
Update CHANGELOG.md

See merge request veloren/veloren!2012
2021-03-28 01:03:59 +00:00
Louis Pearson
71a59db5f5 Update CHANGELOG.md 2021-03-28 00:53:40 +00:00
Samuel Keiffer
52f399c090 Merge branch 'sam/fix-debug-stick' into 'master'
Fix NaN Errors

See merge request veloren/veloren!2009
2021-03-27 23:40:19 +00:00
Sam
5a9481549d Switched normalized function to try_normalized 2021-03-27 19:05:48 -04:00
Marcel
b1f68d56b3 Merge branch 'xMAC94x/server-stability' into 'master'
track state tick in a historgram too

See merge request veloren/veloren!1998
2021-03-27 21:05:02 +00:00
Marcel Märtens
f3fd72de23 fix some tracy only and no default features 2021-03-27 18:24:10 +01:00
Marcel Märtens
0247595f41 extend network of incomming TCP metrics and failed handshake metric 2021-03-27 18:24:10 +01:00
Marcel Märtens
f42f6da6d8 track state tick in a historgram too 2021-03-27 18:24:10 +01:00
Marcel
54e29cc2e1 Merge branch 'swilliams/character-randomization-fix' into 'master'
Character Creation Randomization Fix

See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
Scott Williams
e0e7ab8fa2 Character Creation Randomization Fix 2021-03-27 15:58:34 +00:00
Samuel Keiffer
29dea2c99e Merge branch 'aweinstock/diamond-prices' into 'master'
Improve econsim's handling of diamond prices by lowering the implied homicide rate.

See merge request veloren/veloren!2005
2021-03-27 15:29:19 +00:00
Imbris
dac55e364c Merge branch 'desttinghim/build-areas' into 'master'
Build Areas

See merge request veloren/veloren!1978
2021-03-27 15:26:35 +00:00