Commit Graph

8784 Commits

Author SHA1 Message Date
juliancoffee
9bffa6f9e1 use bg_main.jpg instead of bg_main.png 2021-06-18 20:41:18 +03:00
Joshua Barretto
0d3cd7897f 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
493e0c9b2e 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
570ad841c8 Switched to new CI cache image 2021-06-18 12:59:15 +01:00
Joshua Barretto
6f6a7e3617 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
Joshua Barretto
bb24068208 Added JPEG backgrounds 2021-06-18 12:28:55 +01:00
Joshua Barretto
38907a8bf2 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
Joshua Barretto
d4dd756eea 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
c3c8fcc54a Renamed command event 2021-06-18 11:31:06 +01:00
Imbris
4994b9a3d1 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
ae84557cca More npc sfx 2021-06-18 06:24:57 +00:00
Imbris
27dc42b855 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
8059bda7dd Fix error message when no connection attempts succeed 2021-06-17 23:29:49 -04:00
Joshua Barretto
92c6128ac8 Made /alias moderator-only 2021-06-17 19:55:46 +01:00
Joshua Barretto
e2f558dacd Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
Joshua Barretto
2b269c7556 Enabled debug lines for Veloren crates only to significantly reduce binary size 2021-06-17 15:19:25 +01:00
Imbris
f7e331d7af 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
fd2094ca3d Added npc hurt sfx 2021-06-17 05:49:09 +00:00
Justin Shipsey
0a282c27c6 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
85fdf467fd basilisk tweaks 2021-06-16 23:28:25 -04:00
jshipsey
a98734d609 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Forest Anderson
f427d15e0d 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
e798a97402
Submit queue when maintaining and minimized 2021-06-16 20:22:33 +01:00
Joshua Barretto
33bb883452 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
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
João Capucho
9576180616
poll device to cleanup resources 2021-06-16 14:07:23 +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
Avi Weinstock
28cbaad146 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
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
Avi Weinstock
e8ff267f90 Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels. 2021-06-15 21:29:29 -04: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