Forest Anderson
83692ae1b7
Merge branch 'aylana/asp-sfx' into 'master'
...
Princess-Lana - Add asp sound effects for the game
See merge request veloren/veloren!2611
2021-07-17 01:49:20 +00:00
Samuel Keiffer
651b775932
Merge branch 'knightresspaladin/healing-aura' into 'master'
...
Knightresspaladin/healing aura
See merge request veloren/veloren!2587
2021-07-16 21:32:03 +00:00
Monty Marz
1443b3e78d
icon
2021-07-16 18:39:14 +02:00
Aylana
513085da30
Add asp sound effects
2021-07-15 20:15:36 +02:00
Jonathan Berglin
51aa54ba8d
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
Marcel
8ae3a81c62
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--useless_format)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::useless_format)]' error supressions
See merge request veloren/veloren!2609
2021-07-15 13:03:02 +00:00
Dr. Dystopia
66fd06f53c
Resolve all '#[allow(clippy::or_fun_call))]' error supressions
2021-07-15 13:49:59 +02:00
Dr. Dystopia
7c1d35c02e
Resolve all '#[allow(clippy::useless_format)]' error supressions
2021-07-15 13:46:53 +02:00
Dr. Dystopia
61afb82e99
Resolve all '#[allow(clippy::unused_unit)]' error supressions
2021-07-14 21:42:29 +02:00
Sam
dc31b9fd1e
Particles for healing aura
2021-07-13 20:54:43 -05:00
Monty Marz
afcb3eb1e7
char selection frames, adjustments
2021-07-13 13:31:01 +02:00
Marcel Märtens
63d790bb45
add biome and site info to F3 debug menu
2021-07-12 18:44:54 +02:00
Marcel Märtens
2cb27be0c6
clippy fixes in tests
2021-07-12 13:35:26 +02:00
Marcel Märtens
e2cd431908
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
7153e8879d
fix clippy warnings
2021-07-12 12:09:09 +02:00
Samuel Keiffer
37f544efbe
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
ubruntu
bac0ba468f
Replace "Player 1" with an NPC name when trading with an NPC
2021-07-11 18:27:34 +00:00
Sam
192078c6fb
Added buff strength stat to weapons.
2021-07-11 12:50:38 -05:00
Samuel Keiffer
c5a709943d
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
Dr. Dystopia
355df0c898
Replace deprecated constant in 'loot_scroller'
2021-07-11 13:13:36 +02:00
Knightress Paladin
1289b21e70
Removed references to Healing Beam, which Healing Aura is replacing
2021-07-10 21:39:11 -07:00
Sam
61a18a671d
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
Knightress Paladin
a2c89cd66b
Added healing aura duration skill to voxygen UI
2021-07-10 20:02:36 -07:00
Samuel Keiffer
7cc4a7b593
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
e739208f43
Replace deprecated constant in 'chat'
2021-07-09 21:00:15 +00:00
Caleb
9d308f8c45
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
af047229ce
Merge branch 'xMAC94x/dependencies' into 'master'
...
update dependencies
See merge request veloren/veloren!2577
2021-07-08 16:40:37 +00:00
Dr. Dystopia
81fc20c9de
Convert 'prepare_tab_completion' to ternary operation in 'chat' file
2021-07-08 16:38:27 +02:00
Marcel Märtens
e2e1f15cff
update depednencies
2021-07-08 12:21:02 +02:00
Dominik Broński
3a2d615fe5
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
2a1efb4b2b
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
Joshua Barretto
15200d48df
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
...
This reverts merge request !2566
2021-07-07 22:07:00 +00:00
juliancoffee
a380283480
Add support for splicing numbers into skill desc
2021-07-07 17:51:30 +03:00
Marcel
ffcf6360e8
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
1f100cd3ea
Updated wgpu to 0.9.0 and egui to 0.13.0
2021-07-06 07:32:27 +01:00
Benoît du Garreau
ab6105d789
Add a feature to optionnally disable hot-reloading
2021-07-06 00:27:09 +02:00
Marcel
b8961ce21b
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
a974f1b443
Fix spurious warning in KeyedJobs.
2021-07-05 13:52:34 -04:00
juliancoffee
63aa4219c5
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
3c20c4383b
(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
4f75e98cfa
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
9464a45783
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
929ed54e56
Add some tracy plots about network usage to the client.
2021-07-02 12:40:52 -04:00
Jonathan Berglin
477edd0375
Extract 'create_new_button' function from 'update'
2021-07-01 14:39:02 +00:00
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
