Commit Graph

7824 Commits

Author SHA1 Message Date
Snowram
c8e191e138 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
5295894105 Add new batch of starves and scepter (by Gemu) 2021-03-29 01:27:55 +02:00
Imbris
813d9fded3 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
75944d19eb 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
b2f6e3bdc7 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
1a7fc900e8 Turn off incremental compilation to avoid fingerprints bug 2021-03-28 15:49:58 -04:00
Marcel
c131407a91 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
eb7122e8e9 Less horrible spawn 2021-03-28 20:12:27 +01:00
Marcel Märtens
6e77028605 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
614a0aac13 display error when rodio panic is fixed 2021-03-28 20:40:07 +02:00
Joshua Barretto
15caf440e8 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
8c2a5559d3 Move common code out into function 2021-03-28 18:22:47 +01:00
Joshua Barretto
5bf17779ec Updated changelog, fmt 2021-03-28 18:07:01 +01:00
Samuel Keiffer
b205358fe1 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
b660c53b4c Revert to old sky colours for no clouds 2021-03-28 17:07:41 +01:00
Joshua Barretto
34a7667410 Toned down aurora 2021-03-28 17:07:41 +01:00
Treeco
ab596d2ae8 New default world map, default continent scale doubled 2021-03-28 17:07:38 +01:00
Treeco
12cf8847c8 Added command to teleport to sites by name 2021-03-28 17:02:17 +01:00
Joshua Barretto
f16c2b8b4c Made clouds adjust to world dimensions correctly 2021-03-28 17:02:17 +01:00
Treeco
24763972ea Added spawn_town server setting 2021-03-28 17:02:17 +01:00
Joshua Barretto
d8117b3b3d Make caves and rtsim entities scale with map size, more cloud detail 2021-03-28 17:02:16 +01:00
Joshua Barretto
0bed52f63c Properly simulate atmospheric scattering 2021-03-28 17:01:53 +01:00
Joshua Barretto
d53042c852 Client-side time of day interpolation 2021-03-28 17:01:53 +01:00
Joshua Barretto
19ef00085d Softer and faster clouds with more verticality 2021-03-28 17:01:51 +01:00
Treeco
f3284b7d90 Fix issues loading larger maps 2021-03-28 17:01:19 +01:00
Ben Wallis
6bc0f76bf8 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
738aa02e7e Loot table hotfix 2021-03-28 11:26:30 -04:00
Joshua Yanovski
84ce211bff 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
40f2c59401 Reclassify Glowing Remains as Armor for econsim. 2021-03-28 10:29:40 -04:00
Treeco
8f13750027 Temporarily disable humanoid rtsim entities until their pathfinding is fixed 2021-03-28 14:49:40 +01:00
Ben Wallis
05e93c3518 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
ef43d29627 Fix husk drops in miniboss rooms. 2021-03-28 10:39:20 +00:00
Marcel
519c01a888 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
66d0948d06 Fix the price category of the newly added items 2021-03-28 09:25:51 +00:00
Samuel Keiffer
05ed391bb2 Merge branch 'sam/mindflayer-rework' into 'master'
Mindflayer Rework

See merge request veloren/veloren!1957
2021-03-28 02:10:51 +00:00
Sam
f117a57083 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
Sam
ade466a12b Removed potential for divide by zero 2021-03-27 21:06:21 -04:00
Sam
0c19679406 Fixed offset of decayed health 2021-03-27 21:06:21 -04:00
Sam
0e3b0a9ee7 Repalced stone golems with 10 husks in T5 dungeon miniboss rooms. 2021-03-27 21:06:18 -04:00
Monty
345ef1ca22 decay display for groups and overhead bars 2021-03-27 21:05:17 -04:00
Sam
06bd7bd929 Removed experimental group health decay 2021-03-27 21:05:17 -04:00
jshipsey
558c82ee54 flayer anims 2021-03-27 21:05:16 -04:00
Sam
91ddcaa155 Particles for summoned minions 2021-03-27 21:05:15 -04:00
Sam
b0b114a7f8 Balance tweaks 2021-03-27 21:05:15 -04:00
Monty Marz
345b725478 decayed health texture 2021-03-27 21:05:14 -04:00
Monty Marz
cc70560027 WIP animation 2021-03-27 21:05:13 -04:00
Sam
c0c6ff3063 Initial work to show decayed health in healthbars 2021-03-27 21:05:13 -04:00
Sam
1edf79d109 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Sam
4ec387af82 Added particles for lifesteal effect 2021-03-27 21:05:12 -04:00
Sam
6c611d632a Mindflayer now only summons minions at set thresholds of health. 2021-03-27 21:05:11 -04:00