Forest Anderson
54eb2a3ff7
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
f38cde9d40
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
01c9d6d6d0
icon
2021-07-16 18:39:14 +02:00
Aylana
a3da5b31d6
Add asp sound effects
2021-07-15 20:15:36 +02:00
Jonathan Berglin
c1c331d59e
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
Marcel
583cc38889
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
5cc2fc8182
Resolve all '#[allow(clippy::or_fun_call))]' error supressions
2021-07-15 13:49:59 +02:00
Dr. Dystopia
2ff74f5cc9
Resolve all '#[allow(clippy::useless_format)]' error supressions
2021-07-15 13:46:53 +02:00
Dr. Dystopia
fdee2d4a62
Resolve all '#[allow(clippy::unused_unit)]' error supressions
2021-07-14 21:42:29 +02:00
Sam
997da21001
Particles for healing aura
2021-07-13 20:54:43 -05:00
Monty Marz
e379aacf8c
char selection frames, adjustments
2021-07-13 13:31:01 +02:00
Marcel Märtens
5f780aa0ee
add biome and site info to F3 debug menu
2021-07-12 18:44:54 +02:00
Marcel Märtens
db8aedd363
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
9b3b21f368
fix clippy warnings
2021-07-12 12:09:09 +02:00
Samuel Keiffer
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
ubruntu
6bb47b447e
Replace "Player 1" with an NPC name when trading with an NPC
2021-07-11 18:27:34 +00:00
Sam
be8b12845a
Added buff strength stat to weapons.
2021-07-11 12:50:38 -05:00
Samuel Keiffer
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
Dr. Dystopia
01a118efc5
Replace deprecated constant in 'loot_scroller'
2021-07-11 13:13:36 +02:00
Knightress Paladin
146f86be2c
Removed references to Healing Beam, which Healing Aura is replacing
2021-07-10 21:39:11 -07:00
Sam
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
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
Dr. Dystopia
7ded50a668
Convert 'prepare_tab_completion' to ternary operation in 'chat' file
2021-07-08 16:38:27 +02:00
Monty Marz
7c8d73a0c6
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
juliancoffee
67f22baed5
Add support for splicing numbers into skill desc
2021-07-07 17:51:30 +03:00
Benoît du Garreau
110b9742b7
Add a feature to optionnally disable hot-reloading
2021-07-06 00:27:09 +02:00
Avi Weinstock
86f5564dc7
Fix spurious warning in KeyedJobs.
2021-07-05 13:52:34 -04: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
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
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
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
juliancoffee
681fd37429
style
2021-06-27 02:44:19 +03: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
