Commit Graph

8757 Commits

Author SHA1 Message Date
Joshua Barretto
0c925ea03e Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
Joshua Barretto
93affee6ac Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
19dd62a887 More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
0d39e4047e Emit sound from head 2021-06-16 17:23:22 +01:00
Joshua Barretto
0a8d4af404 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
64e79b5659 Chasing sounds 2021-06-16 17:23:22 +01:00
Imbris
6d55c23ca5 Merge branch 'imbris/small-fixes' into 'master'
Small fixes

See merge request veloren/veloren!2461
2021-06-16 08:18:45 +00:00
Marcel
d5d6ef5cb6 Merge branch 'imbris/current-monitor-fix' into 'master'
Eliminate panics when .current_monitor() returns None

Closes #1199 and #811

See merge request veloren/veloren!2463
2021-06-16 07:34:52 +00:00
Imbris
85ffc33b8f Reset the slot 1 bind group to shadows when dropping the DebugDrawer 2021-06-16 03:24:10 -04:00
Imbris
1dec2a9a05 Do some checks to make sure WGPU_TRACE_DIR is useable if set and exit early if it isn't to avoid the user not being aware that they are failing to collect a trace 2021-06-16 03:24:10 -04:00
Imbris
295e58016c Show the graphics backend in the hud debug info and include the adapter info when panicking in the wgpu error handler 2021-06-16 03:24:10 -04:00
Imbris
8e8e0a1522 Log format used for the swapchain 2021-06-16 03:24:10 -04:00
Imbris
bdff88ab7c Add note on the reasoning for the visual position interpolation rate value in voxygen 2021-06-16 03:24:10 -04:00
Justin Shipsey
431755aaf2 Merge branch 'karmicknight/swordspin_poise_damage' into 'master'
lowered spin.ron base poise damage to 13 from 25

See merge request veloren/veloren!2462
2021-06-16 06:17:30 +00:00
Imbris
114f07e42c Eliminate panics when .current_monitor() returns None 2021-06-16 01:36:59 -04:00
donovanlank
1c57a114f5 lowered spin.ron base poise damage to 13 from 25 2021-06-15 22:26:45 -07:00
Imbris
0e5e964413 Merge branch 'imbris/winit-0.25' into 'master'
Upgrade to winit 0.25

See merge request veloren/veloren!2449
2021-06-16 05:21:13 +00:00
Imbris
bf6f624c7f Upgrade to winit 0.25 2021-06-15 22:59:54 -04:00
Imbris
d60c7a0c2d Merge branch 'imbris/release-tweak' into 'master'
Add debug line tables and avoid building unwinding landing pads in release builds

See merge request veloren/veloren!2446
2021-06-16 02:17:49 +00:00
Imbris
36821e5575 Merge branch 'capucho/wgpu-format-fixes' into 'master'
Update wgpu and check for best swap chain format

See merge request veloren/veloren!2454
2021-06-16 01:24:05 +00:00
Imbris
e89c6a80e2 Add debug line tables and avoid building unwinding landing pads in release builds 2021-06-15 21:14:49 -04:00
Joshua Barretto
c86c776ef4 Merge branch 'revert-1a2f1127' into 'master'
Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'"

See merge request veloren/veloren!2459
2021-06-15 22:51:32 +00:00
Snowram
1a073cb964 Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'"
This reverts merge request !2457
2021-06-15 22:12:11 +00:00
Marcel
741623ac69 Merge branch 'snowram/snappier-pos-interp' into 'master'
Double the speed factor of pos interp

See merge request veloren/veloren!2457
2021-06-15 20:52:22 +00:00
Snowram
e927d835ce Double the speed factor of pos interp 2021-06-15 22:11:57 +02:00
Imbris
bf9e5f6e11 Merge branch 'zakru/fix/1193' into 'master'
Avoid saving settings if maps are not updating

Closes #1193

See merge request veloren/veloren!2456
2021-06-15 19:55:14 +00:00
Imbris
4bd50bb768 Merge branch 'rodio014' into 'master'
bump rodio to 0.14

See merge request veloren/veloren!2443
2021-06-15 19:04:28 +00:00
Zakru
3c42eb3666 Fix settings not saving when zooming map with keys 2021-06-15 21:20:10 +03:00
Zakru
323b03e406 Avoid saving settings if maps are not updating
Fixes #1193
2021-06-15 21:19:52 +03:00
Marcel
f4bf5f4de7 Merge branch 'snowram/fix-consumables-desc' into 'master'
Truncates consumables value to the first decimal place

See merge request veloren/veloren!2455
2021-06-15 18:13:27 +00:00
Snowram
4f835c3741 Truncates consumables value to the first decimal place 2021-06-15 19:36:20 +02:00
Marcel
f225366970 Merge branch 'juliancoffee/i18n_tests' into 'master'
Panic in tests if can't parse i18n file

See merge request veloren/veloren!2453
2021-06-15 17:26:16 +00:00
Marcel
179230c31d Merge branch 'veloren/veloren/master' into 'master'
Veloren/veloren/master

See merge request veloren/veloren!2452
2021-06-15 16:36:41 +00:00
K. Kisa
55e5d9e544 Veloren/veloren/master 2021-06-15 16:36:41 +00:00
juliancoffee
3dfae1c664 Panic if can't parse file 2021-06-15 19:15:17 +03:00
Snowram
0c802077d7 Merge branch 'snowram/more-trolls' into 'master'
Add more trolls npcs, and roc npc with tornado attack

See merge request veloren/veloren!2384
2021-06-15 08:35:30 +00:00
Imbris
748b135446 Merge branch 'imbris/resize-tweaks' into 'master'
Resize related tweaks

See merge request veloren/veloren!2448
2021-06-15 07:53:12 +00:00
Snowram
e2b26dc0ef Addresses comments about roc AI 2021-06-15 09:50:23 +02:00
Snowram
e32c103e9a Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
a5ff4be601 Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
aa62ad8bc0 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Snowram
3df69ba11d Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Imbris
6f5eab4896 [iced renderer] Skip content processing if the clip intersection is zero sized or invalid 2021-06-15 02:02:10 -04:00
Imbris
4535de21cd Fix trying to create a zero sized shadow texture when resizing window down to a small size 2021-06-15 01:53:00 -04:00
Imbris
4188b23cc8 Merge branch 'imbris/userdata-tweak' into 'master'
Fallback to executable strategy for the userdata rather than panicking when...

See merge request veloren/veloren!2445
2021-06-15 03:22:51 +00:00
Samuel Keiffer
2218018177 Merge branch 'juliancoffee/swing_fix' into 'master'
Introduce hit_timing for combo_melee

See merge request veloren/veloren!2426
2021-06-15 02:38:23 +00:00
Imbris
1be7a62d63 Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder 2021-06-14 21:42:50 -04:00
asumface
a63e839bfa
Bump rodio to 0.14 2021-06-14 22:04:23 +02:00
Marcel
93557ac9c5 Merge branch 'aweinstock/hotfix-pick-icon' into 'master'
Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.

See merge request veloren/veloren!2442
2021-06-14 18:02:56 +00:00
Avi Weinstock
3267765e85 Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller. 2021-06-14 13:39:50 -04:00