fdee2d4a62
Resolve all '#[allow(clippy::unused_unit)]' error supressions
2021-07-14 21:42:29 +02:00
e379aacf8c
char selection frames, adjustments
2021-07-13 13:31:01 +02:00
5f780aa0ee
add biome and site info to F3 debug menu
2021-07-12 18:44:54 +02:00
468cfe84e7
clippy fixes in tests
2021-07-12 13:35:26 +02:00
db8aedd363
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
9b3b21f368
fix clippy warnings
2021-07-12 12:09:09 +02:00
2633e9d70c
Merge branch 'sam/buff-stat' into 'master'
...
Added buff strength stat to weapons.
See merge request veloren/veloren!2586
2021-07-11 19:06:13 +00:00
6bb47b447e
Replace "Player 1" with an NPC name when trading with an NPC
2021-07-11 18:27:34 +00:00
be8b12845a
Added buff strength stat to weapons.
2021-07-11 12:50:38 -05:00
7cf5bc4bb7
Merge branch 'sam/rename-poise-stat' into 'master'
...
Renamed poise_strength to effect_power to allow it to be used more generally...
See merge request veloren/veloren!2589
2021-07-11 15:13:00 +00:00
01a118efc5
Replace deprecated constant in 'loot_scroller'
2021-07-11 13:13:36 +02:00
fbcc774911
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-10 23:22:00 -05:00
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
00434b25c0
Replace deprecated constant in 'chat'
2021-07-09 21:00:15 +00:00
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
8bb5fb6c14
Merge branch 'xMAC94x/dependencies' into 'master'
...
update dependencies
See merge request veloren/veloren!2577
2021-07-08 16:40:37 +00:00
7ded50a668
Convert 'prepare_tab_completion' to ternary operation in 'chat' file
2021-07-08 16:38:27 +02:00
98800c5424
update depednencies
2021-07-08 12:21:02 +02:00
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
7c8d73a0c6
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
ad1f6a5304
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
...
This reverts merge request !2566
2021-07-07 22:07:00 +00:00
67f22baed5
Add support for splicing numbers into skill desc
2021-07-07 17:51:30 +03:00
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
88bb160336
Updated wgpu to 0.9.0 and egui to 0.13.0
2021-07-06 07:32:27 +01:00
110b9742b7
Add a feature to optionnally disable hot-reloading
2021-07-06 00:27:09 +02:00
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
86f5564dc7
Fix spurious warning in KeyedJobs.
2021-07-05 13:52:34 -04:00
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
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
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
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
6ba512efc8
Add some tracy plots about network usage to the client.
2021-07-02 12:40:52 -04:00
fc618b2222
Extract 'create_new_button' function from 'update'
2021-07-01 14:39:02 +00:00
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
cf01dd7df7
Improved consistency of default controls
2021-06-30 13:39:37 +01:00
a7f7ea6327
Improved key names and platform support
2021-06-30 13:14:17 +01:00
a757bf3dbd
Sfx fixes and new test
2021-06-30 11:43:00 +00:00
0151e5aeed
Merge branch 'potion-animations' into 'master'
...
Consumable Animations
See merge request veloren/veloren!2512
2021-06-29 16:36:41 +00:00
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
37c6fe9ee8
anims
2021-06-29 05:59:02 -05:00
1978b590aa
Destringified consumables
2021-06-29 05:59:02 -05:00
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
3ec5306ed0
Adds an outcome to death with SFX and VFX
2021-06-29 00:14:05 +02:00
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
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
b8249cc64c
build(nix): fix audio resource patching
2021-06-27 23:23:01 +03:00
ea41f9ab39
Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs
2021-06-27 18:18:01 +00:00
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
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
681fd37429
style
2021-06-27 02:44:19 +03:00
