Commit Graph

8786 Commits

Author SHA1 Message Date
juliancoffee
36fa8bf4f7 Use Golem Shockwave only after loosing 30% health
+ Make shockwave buildup longer
2021-06-18 22:32:43 +03:00
Imbris
4dc14dbe66 Merge branch 'juliancoffee/fix_common_build' into 'master'
use bg_main.jpg instead of bg_main.png in common/build.rs

See merge request veloren/veloren!2477
2021-06-18 18:11:05 +00:00
juliancoffee
9a5f749bc7 use bg_main.jpg instead of bg_main.png 2021-06-18 20:41:18 +03:00
Joshua Barretto
46dfc119fb Merge branch 'aweinstock/tighten_e2t' into 'master'
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.

See merge request veloren/veloren!2460
2021-06-18 16:27:20 +00:00
Joshua Barretto
05c375a8b0 Merge branch 'zesterer/meta' into 'master'
Optimising for size

See merge request veloren/veloren!2468
2021-06-18 12:35:16 +00:00
Joshua Barretto
68d88ea271 Switched to new CI cache image 2021-06-18 12:59:15 +01:00
Joshua Barretto
747ef50a58 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
Joshua Barretto
f6d64a424f Added JPEG backgrounds 2021-06-18 12:28:55 +01:00
Joshua Barretto
0265da1074 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
Joshua Barretto
bb6e8582a6 Merge branch 'zesterer/no-cmd-santisation' into 'master'
Made dealing with chat vs commands safer for clients, made /alias require moderator permissions

See merge request veloren/veloren!2472
2021-06-18 10:55:57 +00:00
Joshua Barretto
294b6e394a Renamed command event 2021-06-18 11:31:06 +01:00
Imbris
f4f06f581c Merge branch 'DaforLynx/more-npc-sfx' into 'master'
More npc sfx

See merge request veloren/veloren!2473
2021-06-18 06:24:57 +00:00
DaforLynx
c85238014a More npc sfx 2021-06-18 06:24:57 +00:00
Imbris
338109149f Merge branch 'imbris/error-message-fix' into 'master'
Fix error message when no connection attempts succeed

See merge request veloren/veloren!2465
2021-06-18 04:00:28 +00:00
Imbris
15bf815750 Fix error message when no connection attempts succeed 2021-06-17 23:29:49 -04:00
Joshua Barretto
0067cea560 Made /alias moderator-only 2021-06-17 19:55:46 +01:00
Joshua Barretto
96cbf60c3f Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
Joshua Barretto
1af6f685d1 Enabled debug lines for Veloren crates only to significantly reduce binary size 2021-06-17 15:19:25 +01:00
Imbris
f132c3fcb4 Merge branch 'DaforLynx/initial-hurt-sfx' into 'master'
Added npc hurt sfx

See merge request veloren/veloren!2467
2021-06-17 05:49:09 +00:00
DaforLynx
9a5b95bc16 Added npc hurt sfx 2021-06-17 05:49:09 +00:00
Justin Shipsey
befa91fdf9 Merge branch 'slipped/stretchcontent' into 'master'
buffs to stretch progression

See merge request veloren/veloren!2447
2021-06-17 04:05:09 +00:00
jshipsey
a42e6e20b8 basilisk tweaks 2021-06-16 23:28:25 -04:00
jshipsey
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Forest Anderson
6097bf0b1d Merge branch 'capucho/gpu-poll' into 'master'
cleanup gpu resources on maintain

See merge request veloren/veloren!2466
2021-06-16 20:30:30 +00:00
João Capucho
9454c34cc2
Submit queue when maintaining and minimized 2021-06-16 20:22:33 +01:00
Joshua Barretto
c63cf5f734 Merge branch 'zesterer/grunts' into 'master'
Utterances and sound optimisation

See merge request veloren/veloren!2458
2021-06-16 17:10:54 +00:00
Joshua Barretto
b8749dc219 Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
Joshua Barretto
9510869870 Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
e3c44ba7fe More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
fb51fd3230 Emit sound from head 2021-06-16 17:23:22 +01:00
Joshua Barretto
0ef29a6989 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
559311e1b0 Chasing sounds 2021-06-16 17:23:22 +01:00
João Capucho
cb55676bb9
poll device to cleanup resources 2021-06-16 14:07:23 +01:00
Imbris
a9229e3625 Merge branch 'imbris/small-fixes' into 'master'
Small fixes

See merge request veloren/veloren!2461
2021-06-16 08:18:45 +00:00
Marcel
0729e487c0 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
1483c2be74 Reset the slot 1 bind group to shadows when dropping the DebugDrawer 2021-06-16 03:24:10 -04:00
Imbris
2d7b82c2f4 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
19f741b33f 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
09a914aa84 Log format used for the swapchain 2021-06-16 03:24:10 -04:00
Imbris
8f429d532a Add note on the reasoning for the visual position interpolation rate value in voxygen 2021-06-16 03:24:10 -04:00
Justin Shipsey
dd6b5ffa38 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
345add91db Eliminate panics when .current_monitor() returns None 2021-06-16 01:36:59 -04:00
donovanlank
f26de7bbe9 lowered spin.ron base poise damage to 13 from 25 2021-06-15 22:26:45 -07:00
Imbris
02c974da52 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
b7162ac15c Upgrade to winit 0.25 2021-06-15 22:59:54 -04:00
Avi Weinstock
96ffae4387 Address MR 2460 comments.
- Switch from point query to AABB query to take into account block thickness.
2021-06-15 22:52:02 -04:00
Imbris
9d9c0a045d 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
Avi Weinstock
5e6363dbcc Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels. 2021-06-15 21:29:29 -04:00
Imbris
3e79972061 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
e5f23eb41a Add debug line tables and avoid building unwinding landing pads in release builds 2021-06-15 21:14:49 -04:00