3578 Commits

Author SHA1 Message Date
Joshua Barretto
a533c96d63 Merge branch 'zesterer/keyboard' into 'master'
Improve default keybindings and Key names

See merge request veloren/veloren!2532
2021-06-30 17:33:17 +00:00
Joshua Barretto
d25d61490e Improved consistency of default controls 2021-06-30 13:39:37 +01:00
Joshua Barretto
c180af8d82 Improved key names and platform support 2021-06-30 13:14:17 +01:00
DaforLynx
e20a5db899 Sfx fixes and new test 2021-06-30 11:43:00 +00:00
Samuel Keiffer
74d4f3e49c Merge branch 'potion-animations' into 'master'
Consumable Animations

See merge request veloren/veloren!2512
2021-06-29 16:36:41 +00:00
Sam
a3dd5f395c Removed potential for accessing OOB index and panicking in animations for combo melee.
Made only entities with a character state component emit a death outcome on death.
2021-06-29 06:20:26 -05:00
jshipsey
c4c183cdf0 anims 2021-06-29 05:59:02 -05:00
Sam
938978bdbd Destringified consumables 2021-06-29 05:59:02 -05:00
Snowram
eb0a8efad1 Merge branch 'snowram/death-outcome' into 'master'
Adds an outcome to death with SFX and VFX

See merge request veloren/veloren!2519
2021-06-28 23:18:45 +00:00
Snowram
64045ed7bd Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Imbris
340c531021 Merge branch 'imbris/bind-order' into 'master'
Ensure bind groups are ordered with the most frequently changed ones in later slots

See merge request veloren/veloren!2496
2021-06-28 15:39:31 +00:00
Marcel
1c1047bb4a Merge branch 'master' into 'master'
Update `coreaudio-sys` to v0.2.8 to fix build failure on M1 Macs

See merge request veloren/veloren!2505
2021-06-28 07:47:50 +00:00
Yusuf Bera Ertan
1cfad57684
build(nix): fix audio resource patching 2021-06-27 23:23:01 +03:00
DrunkOnHotCoco
5852dad802 Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs 2021-06-27 18:18:01 +00:00
Marcel
9e47c177d2 Merge branch 'alphyr/assets_manager0_5' into 'master'
Update `assets_manager` to 0.5

See merge request veloren/veloren!2501
2021-06-27 15:50:16 +00:00
Snowram
1c7c70c1bf Merge branch 'juliancoffee/fix_dismantle' into 'master'
Improve Dismantle UX

See merge request veloren/veloren!2498
2021-06-27 00:11:01 +00:00
juliancoffee
641aa921bf style 2021-06-27 02:44:19 +03:00
Alex Ryapolov
7a6ee590ae Update coreaudio-sys to v0.2.8 2021-06-26 18:39:53 +00:00
juliancoffee
cba3187b92 Split Material and Dismantle crafting tabs 2021-06-26 21:37:13 +03:00
juliancoffee
fb8787a826 Sort tabs in logical sequence 2021-06-26 21:37:13 +03:00
juliancoffee
e22ddb0385 Improve Dismantle UX
- Change `Any {}` to `Any {} item` so for example when you want to
dismantle something into linen, you will see `Any linen item` which
points you that you need to get some item which is made from linen, and
not some generic linen.
2021-06-26 21:37:13 +03:00
Ben Wallis
f8dc0e3a2c Added default-publish feature and updated build scripts. 2021-06-26 17:48:48 +01:00
Benoît du Garreau
ab3c8cf764 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Snowram
3b393a9c5c Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
f518aebe81 Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
38c9ff5225 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
080328941b Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
78afaf32a2 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Snowram
21b526856d Adds new species 2021-06-24 19:29:44 +02:00
Imbris
4c881e411d Ensure bind groups are ordered with the most frequently changed ones in later slots 2021-06-24 00:47:59 -04:00
Sam
5dc1f8f8ae Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Snowram
718eafd13b Adds SpriteSummon animation 2021-06-23 22:38:16 -05:00
Sam
d93d0aa4f5 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
cc748c0a3f Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Snowram
129b6cb30c 3 attack anims done 2021-06-23 22:38:16 -05:00
Joshua Barretto
0499a1e360 Added chat toggle 2021-06-21 20:16:03 +01:00
Joshua Barretto
8e13e53abb Enable strafing in first-person mode 2021-06-21 13:27:19 +01:00
Imbris
e40a6eb5b3 Improve rendering spans for tracy 2021-06-19 04:27:51 -04:00
Imbris
30914f23f2 add prof_span to hud elements 2021-06-19 04:27:51 -04:00
Imbris
156e2e86b5 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
Imbris
7b962beda8 Merge branch 'imbris/init-error' into 'master'
Log the raw client error at the ERROR level and include the dates in the...

See merge request veloren/veloren!2464
2021-06-19 07:53:16 +00: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
DaforLynx
ae84557cca More npc sfx 2021-06-18 06:24:57 +00:00
Imbris
8059bda7dd Fix error message when no connection attempts succeed 2021-06-17 23:29:49 -04:00
Imbris
1067baeecf Log the raw client error at the ERROR level and include the dates in the message displayed in the UI 2021-06-17 22:20:40 -04:00
Joshua Barretto
e2f558dacd Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
DaforLynx
fd2094ca3d Added npc hurt sfx 2021-06-17 05:49:09 +00: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
0c925ea03e Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00