7375 Commits

Author SHA1 Message Date
Sam
f2f2c41f86 Fix emerald sceptre. Remove duplicate asset. 2021-03-28 21:19:01 -04:00
Snowram
a1067a2ddb Merge branch 'snowram/new-scepters-starves' into 'master'
Add new batch of starves and scepter (by Gemu)

See merge request veloren/veloren!2022
2021-03-29 00:08:19 +00:00
Snowram
4b95401f7c Add new batch of starves and scepter (by Gemu) 2021-03-29 01:27:55 +02:00
Imbris
e010b00db0 Merge branch 'imbris/no-increments' into 'master'
Turn off incremental compilation to avoid fingerprints bug

See merge request veloren/veloren!2021
2021-03-28 20:56:00 +00:00
Joshua Barretto
beea24ef2e Merge branch 'treeco/less-horrible-spawn' into 'master'
Less horrible spawn

See merge request veloren/veloren!2020
2021-03-28 20:15:23 +00:00
Marcel
e01c3dec05 Merge branch 'xMAC94x/fearless_concurency_terrainmsg' into 'master'
make msg::terrain parallel via rayon, we parallelize over the number of...

See merge request veloren/veloren!2019
2021-03-28 20:05:01 +00:00
Imbris
89a2786bbf Turn off incremental compilation to avoid fingerprints bug 2021-03-28 15:49:58 -04:00
Marcel
7cc4f2472f Merge branch 'rodio_panicfix' into 'master'
display error when rodio panic is fixed

See merge request veloren/veloren!2018
2021-03-28 19:16:11 +00:00
Treeco
dfbfd25934 Less horrible spawn 2021-03-28 20:12:27 +01:00
Marcel Märtens
063d57b60c make msg::terrain parallel via rayon, we parallelize over the number of clients, so this is a change servers with more than 1 player profit from. 2021-03-28 21:08:40 +02:00
Marcel Märtens
ac9734bee5 display error when rodio panic is fixed 2021-03-28 20:40:07 +02:00
Joshua Barretto
e4b5f02df2 Merge branch 'treeco/new-map' into 'master'
A new map and clouds

See merge request veloren/veloren!2007
2021-03-28 18:32:20 +00:00
Treeco
bf155b1407 Move common code out into function 2021-03-28 18:22:47 +01:00
Joshua Barretto
6005756f94 Updated changelog, fmt 2021-03-28 18:07:01 +01: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
Joshua Barretto
64c517b7b2 Revert to old sky colours for no clouds 2021-03-28 17:07:41 +01:00
Joshua Barretto
6f7c2fbc04 Toned down aurora 2021-03-28 17:07:41 +01:00
Treeco
2922b00c11 New default world map, default continent scale doubled 2021-03-28 17:07:38 +01:00
Treeco
d47739c0c9 Added command to teleport to sites by name 2021-03-28 17:02:17 +01:00
Joshua Barretto
14257bd82d Made clouds adjust to world dimensions correctly 2021-03-28 17:02:17 +01:00
Treeco
6d9a7e8fb3 Added spawn_town server setting 2021-03-28 17:02:17 +01:00
Joshua Barretto
fa1fee430b Make caves and rtsim entities scale with map size, more cloud detail 2021-03-28 17:02:16 +01:00
Joshua Barretto
48c733b77a Properly simulate atmospheric scattering 2021-03-28 17:01:53 +01:00
Joshua Barretto
2874cc54e1 Client-side time of day interpolation 2021-03-28 17:01:53 +01:00
Joshua Barretto
a76f15dd9f Softer and faster clouds with more verticality 2021-03-28 17:01:51 +01:00
Treeco
0186cf8398 Fix issues loading larger maps 2021-03-28 17:01:19 +01: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