Commit Graph

8550 Commits

Author SHA1 Message Date
Joshua Barretto
b0acbda236 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
88f99986af Merge branch 'snowram/items-infos' into 'master'
Snowram/items infos

See merge request veloren/veloren!1956
2021-03-29 20:16:35 +00:00
Sam
92973a470c Made entity spawn room check more intuitive to understand 2021-03-29 13:05:04 -04:00
Snowram
6adaac8106 Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
b8ac90d049 Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Snowram
5b99b7ca18 Skillbar uses item tooltip 2021-03-29 18:34:45 +02:00
Snowram
508e35ca17 Add several new i18n lines 2021-03-29 18:34:45 +02:00
Snowram
d1e734b9b1 Tooltip now use ItemDesc instead of Item 2021-03-29 18:34:45 +02:00
Snowram
2c09180189 Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Snowram
b7dd2d6685 Use a dummy item for the new() function 2021-03-29 18:34:45 +02:00
Snowram
955008c3c1 Kinda working tooltip height but not really 2021-03-29 18:34:45 +02:00
Snowram
0405f04d53 More item tooltip UI layout 2021-03-29 18:34:45 +02:00
Snowram
aa71dcb9c7 Make the new tooltip item specific 2021-03-29 18:34:45 +02:00
Snowram
4786f84afd New tooltip 2021-03-29 18:34:45 +02:00
Marcel
88cdd24847 Merge branch 'vfoulon80/dialogues' into 'master'
Implement a basic dialogue system

See merge request veloren/veloren!1986
2021-03-29 14:47:43 +00:00
Vincent Foulon
a35fa19409 Implement a basic dialogue system 2021-03-29 14:47:42 +00:00
Sam
71ba9b6a54 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Marcel
206efcfc3a Merge branch 'capucho/cpal-update' into 'master'
Update cpal

See merge request veloren/veloren!2029
2021-03-29 12:02:54 +00:00
João Capucho
3445ec2820
Update cpal
Fixes the alsa distortion in some configs
2021-03-29 11:33:27 +01:00
Marcel Märtens
fdd1eac6ed if more than 1 player is in the area of a newly created chunk, skip additional copies 2021-03-29 12:21:07 +02:00
Marcel
b0376c690f Merge branch 'xMAC94x/voxygen_panic' into 'master'
do a clear teardown of tokio runtime

See merge request veloren/veloren!2028
2021-03-29 10:02:09 +00:00
Marcel
3f10d003f9 Merge branch 'xMAC94x/dependencies' into 'master'
update dependencies and fix audio issues

Closes #1005, #1004, #816, #807, #1025, #1029, #1017, #1020, #1033, and #1027

See merge request veloren/veloren!2027
2021-03-29 09:18:46 +00:00
Marcel Märtens
e7452aa7ab do a clear teardown of tokio runtime 2021-03-29 10:34:33 +02:00
Marcel Märtens
2907850ffe update dependencies and fix audio issues
fixed #1027
fixed #1033
fixed #1020
fixed #1017
fixed #1029
fixed #1025
fixed #807
fixed #816
fixed #1004
fixed #1005
2021-03-29 09:45:00 +02:00
Imbris
9df3004843 Merge branch 'sam/fix' into 'master'
Fix emerald sceptre. Remove duplicate asset.

See merge request veloren/veloren!2023
2021-03-29 01:21:37 +00:00
Sam
f6e4626887 Fix emerald sceptre. Remove duplicate asset. 2021-03-28 21:19:01 -04:00
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