Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,275 Commits 151 Branches 18 Tags 2.1 GiB
4bfc92c65d
Commit Graph

3650 Commits

Author SHA1 Message Date
Knightress Paladin
42c3872528 Added healing aura duration skill to voxygen UI 2021-07-10 20:02:36 -07:00
Samuel Keiffer
351a68944b Merge branch 'juliancoffee/skill_truth' into 'master' 
Move skill boost modifiers to skills module

See merge request veloren/veloren!2540
 2021-07-09 23:05:48 +00:00
Jonathan Berglin
00434b25c0 Replace deprecated constant in 'chat' 2021-07-09 21:00:15 +00:00
Caleb
ffeb936601 Prevent chat from scrolling with new messages if not already at the bottom to allow players to read history 2021-07-08 20:01:07 -05:00
Marcel
8bb5fb6c14 Merge branch 'xMAC94x/dependencies' into 'master' 
update dependencies

See merge request veloren/veloren!2577
 2021-07-08 16:40:37 +00:00
Dr. Dystopia
7ded50a668 Convert 'prepare_tab_completion' to ternary operation in 'chat' file 2021-07-08 16:38:27 +02:00
Marcel Märtens
98800c5424 update depednencies 2021-07-08 12:21:02 +02:00
Dominik Broński
e6af005ed1 Merge branch 'pfau/stuff' into 'master' 
Minimap modes, Danari customizations update & bald hairstyles

See merge request veloren/veloren!2576
 2021-07-08 00:01:09 +00:00
Monty Marz
7c8d73a0c6 Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
Joshua Barretto
ad1f6a5304 Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" 
This reverts merge request !2566
 2021-07-07 22:07:00 +00:00
juliancoffee
67f22baed5 Add support for splicing numbers into skill desc 2021-07-07 17:51:30 +03:00
Marcel
fc835f675e Merge branch 'xvar/wgpu-0.9' into 'master' 
Updated wgpu to 0.9.0 and egui to 0.13.0

See merge request veloren/veloren!2566
 2021-07-06 07:27:45 +00:00
Ben Wallis
88bb160336 Updated wgpu to 0.9.0 and egui to 0.13.0 2021-07-06 07:32:27 +01:00
Benoît du Garreau
110b9742b7 Add a feature to optionnally disable hot-reloading 2021-07-06 00:27:09 +02:00
Marcel
c86118ee2c Merge branch 'aweinstock/fix-keyedjobs-warning' into 'master' 
Fix spurious warning in KeyedJobs.

See merge request veloren/veloren!2561
 2021-07-05 21:41:00 +00:00
Avi Weinstock
86f5564dc7 Fix spurious warning in KeyedJobs. 2021-07-05 13:52:34 -04:00
juliancoffee
15d83e65cc Remove load_expect_dir as it's misused 
- load_expect_dir while expected to fail on erros, fails only on
filesystem errors and only on root directory.
This commit replaces this function with `read_expect_dir` which returns iterator
which loads all files and panics if can't load them.
 2021-07-05 20:14:26 +03:00
juliancoffee
d4c61ae2f3 (voxygen) Better support for multibuff items 
+ change `effect` field in ItemKind::Consumable to `effects`, as it's
set of effects and not single effect.
 2021-07-05 10:56:29 +03:00
juliancoffee
c538a9696c Use Food after Buildup 
+ Remove Saturation effect by rolling
+ Remove Saturation effect if interrupted with poise
+ Rename Potion to Drink, add ComplexFood
 2021-07-05 10:56:29 +03:00
Ben Wallis
b499cf2c58 Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds. 
Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph.

This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
 2021-07-04 09:47:18 +00:00
Avi Weinstock
6ba512efc8 Add some tracy plots about network usage to the client. 2021-07-02 12:40:52 -04:00
Jonathan Berglin
fc618b2222 Extract 'create_new_button' function from 'update' 2021-07-01 14:39:02 +00:00
Joshua Barretto
61edae79ae 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
cf01dd7df7 Improved consistency of default controls 2021-06-30 13:39:37 +01:00
Joshua Barretto
a7f7ea6327 Improved key names and platform support 2021-06-30 13:14:17 +01:00
DaforLynx
a757bf3dbd Sfx fixes and new test 2021-06-30 11:43:00 +00:00
Samuel Keiffer
0151e5aeed Merge branch 'potion-animations' into 'master' 
Consumable Animations

See merge request veloren/veloren!2512
 2021-06-29 16:36:41 +00:00
Sam
4cdf081a40 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
37c6fe9ee8 anims 2021-06-29 05:59:02 -05:00
Sam
1978b590aa Destringified consumables 2021-06-29 05:59:02 -05:00
Snowram
aaf5f89076 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
3ec5306ed0 Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Imbris
20a9a420c6 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
f4f6138d3d 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
b8249cc64c
build(nix): fix audio resource patching 2021-06-27 23:23:01 +03:00
DrunkOnHotCoco
ea41f9ab39 Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs 2021-06-27 18:18:01 +00:00
Marcel
f063dcd939 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
b477eac816 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
681fd37429 style 2021-06-27 02:44:19 +03:00
Alex Ryapolov
be75a31c39 Update coreaudio-sys to v0.2.8 2021-06-26 18:39:53 +00:00
juliancoffee
12b5d655cf Split Material and Dismantle crafting tabs 2021-06-26 21:37:13 +03:00
juliancoffee
123b2814cf Sort tabs in logical sequence 2021-06-26 21:37:13 +03:00
juliancoffee
3b6d6b9393 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
da319e71ec Added default-publish feature and updated build scripts. 2021-06-26 17:48:48 +01:00
Benoît du Garreau
1cba7db9b6 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Snowram
ef6d6563ea Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
d7f25627ab Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
8760b69345 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4 Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Snowram
87ca00fac0 Adds new species 2021-06-24 19:29:44 +02:00
Imbris
58f237eaf5 Ensure bind groups are ordered with the most frequently changed ones in later slots 2021-06-24 00:47:59 -04:00
Sam
aac24ad601 Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Snowram
47cc040301 Adds SpriteSummon animation 2021-06-23 22:38:16 -05:00
Sam
0a32b676c8 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
763461ebef Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Snowram
15a2fbc555 3 attack anims done 2021-06-23 22:38:16 -05:00
Joshua Barretto
b84708ca75 Added chat toggle 2021-06-21 20:16:03 +01:00
Joshua Barretto
288f2c13d4 Enable strafing in first-person mode 2021-06-21 13:27:19 +01:00
Imbris
83c49895ae Improve rendering spans for tracy 2021-06-19 04:27:51 -04:00
Imbris
315ab872f5 add prof_span to hud elements 2021-06-19 04:27:51 -04:00
Imbris
659b42e813 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
Imbris
380c58b6fc 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
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
DaforLynx
c85238014a More npc sfx 2021-06-18 06:24:57 +00:00
Imbris
15bf815750 Fix error message when no connection attempts succeed 2021-06-17 23:29:49 -04:00
Imbris
247606f8d5 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
96cbf60c3f Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
DaforLynx
9a5b95bc16 Added npc hurt sfx 2021-06-17 05:49:09 +00: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
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
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
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
Imbris
345add91db Eliminate panics when .current_monitor() returns None 2021-06-16 01:36:59 -04:00
Imbris
b7162ac15c Upgrade to winit 0.25 2021-06-15 22:59:54 -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
Snowram
b82dde2332 Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'" 
This reverts merge request !2457
 2021-06-15 22:12:11 +00:00
Snowram
4d3362586f Double the speed factor of pos interp 2021-06-15 22:11:57 +02:00
Imbris
1ed6a04a34 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
343b35b9cd 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
afc04ae22f Fix settings not saving when zooming map with keys 2021-06-15 21:20:10 +03:00
Zakru
52c965fb6d Avoid saving settings if maps are not updating 
Fixes #1193
 2021-06-15 21:19:52 +03:00
Snowram
84080607cd Truncates consumables value to the first decimal place 2021-06-15 19:36:20 +02:00
juliancoffee
3f176ca068 Panic if can't parse file 2021-06-15 19:15:17 +03:00
Snowram
8fde002189 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
a41c7a9a5b 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
f2c7836161 Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
cb0566299a Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
3ba0500b90 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4 Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00