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,459 Commits 151 Branches 18 Tags 2.1 GiB
edd37ad491
Commit Graph

3711 Commits

Author SHA1 Message Date
Joshua Barretto
37077b5703 Merge branch 'Resolve-unused-clippy-supressions' into 'master' 
Resolve unused clippy supressions

See merge request veloren/veloren!2673
 2021-07-24 20:44:06 +00:00
Dr. Dystopia
c79975dc5d Resolve all '#[allow(clippy::match_single_binding)]' error supressions 2021-07-24 22:11:50 +02:00
Dr. Dystopia
04700982d3 Resolve unused '#[allow(clippy::option_map_unit_fn)]' error supressions 2021-07-24 20:35:13 +02:00
Dr. Dystopia
360bf860ac Resolve unused '#[allow(clippy::manual_unwrap_or)]' error supressions 2021-07-24 20:26:15 +02:00
Dr. Dystopia
db48e30ea1 Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions 2021-07-24 20:22:05 +02:00
Dr. Dystopia
632eba0145 Resolve unused '#[allow(clippy::collapsible_if)]' error supressions 2021-07-24 20:16:18 +02:00
Dr. Dystopia
70d0840e96 Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions 2021-07-24 20:14:26 +02:00
Dr. Dystopia
1ac3d1b761 Resolve unused '#[allow(clippy::same_item_push)]' error supressions 2021-07-24 20:08:08 +02:00
Joshua Barretto
c7f14d300f Merge branch 'zesterer/cmd' into 'master' 
Properly fixed command parsing

See merge request veloren/veloren!2666
 2021-07-24 15:15:58 +00:00
Joshua Barretto
6dfa233cc4 Fixed bad non-humanoid lantern offset 2021-07-24 15:05:36 +01:00
Joshua Barretto
0cb524d8d6 Properly fixed command parsing 2021-07-23 17:33:31 +01:00
schnippl0r
9e3b2a20d0 Moved GameInput to own module and made use of strum's EnumIter and AsRefStr. 2021-07-21 13:23:45 +02:00
schnippl0r
d1a1e29cd6 Fixed wrong filename of logfile in Voxygen's panic message. 
Moved the '<date>' component of the logfile name to the
end of the filename string, as RollingFileAppender::new()
appends the date to the provided file name prefix.

Please see
https://docs.rs/tracing-appender/0.1.2/tracing_appender/rolling/struct.RollingFileAppender.html#method.new
 2021-07-21 03:33:13 +02:00
Marcel
5f38fb3c5b Merge branch 'juliancoffee/deduplicate_bag_hud' into 'master' 
Deduplicate setting equipment tooltips

See merge request veloren/veloren!2644
 2021-07-20 14:01:29 +00:00
Dr. Dystopia
9abd066e53 Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Imbris
6e6f73c971 Remove unused setting for whether to create a log file 2021-07-19 10:26:55 -04:00
Imbris
518ec1f54f Revamp voxygen settings so that the config directory is externally specified, remove persistence of the selected logs folder, remove unused old meta.rs file from voxygen 2021-07-19 10:26:47 -04:00
juliancoffee
6f0aeecfca Deduplicate setting equipment tooltips 2021-07-19 03:12:36 +03:00
Imbris
830b0f8fc1 Use mountee_offset for not yet animated mounting transforms (ie those that aren't quadruped_medium) 2021-07-18 15:09:36 -04:00
Imbris
3e6fd0ee1d Setup animation mount points for quadruped medium, update offsets in 
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
 2021-07-18 15:09:36 -04:00
Imbris
32915f89a8 Extract scaling from all the animations 2021-07-18 15:09:36 -04:00
Imbris
6a15501b27 Add Body as a parameter to compute_matrices and start to pull whole body scaling out of the animation files 2021-07-18 15:09:34 -04:00
Imbris
b2bf83e200 Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs 2021-07-18 15:04:02 -04:00
Snowram
09cbb90f61 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
Jonathan Berglin
b15f426ee5 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Imbris
ec342a2338 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--redundant_pattern_matching)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions

See merge request veloren/veloren!2622
 2021-07-18 12:26:44 +00:00
Imbris
251c201604 Merge branch 'revert-eb08b6a1' into 'master' 
Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant

See merge request veloren/veloren!2639
 2021-07-18 08:00:43 +00:00
Marcel
6004a10a1a Merge branch 'tygyh/Resolve-all-'#-allow(clippy--needless_return)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::needless_return)]' error supressions

See merge request veloren/veloren!2632
 2021-07-18 02:00:03 +00:00
Marcel
6e36c8b65c Merge branch 'tygyh/Resolve-all-'#-allow(clippy--len_zero)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::len_zero)]' error supressions

See merge request veloren/veloren!2633
 2021-07-18 01:24:28 +00:00
Imbris
30119a6afc Re-address approx_constant lint without using fractional constants and 
re-add a few blank lines
 2021-07-17 20:41:09 -04:00
Imbris
9c72333741 Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
Dr. Dystopia
29e034fa5e Resolve all '#[allow(clippy::op_ref)]' error supressions 2021-07-17 21:53:33 +02:00
Dr. Dystopia
6480cbd784 Resolve all '#[allow(clippy::len_zero)]' error supressions 2021-07-17 21:49:37 +02:00
Dr. Dystopia
dd84c320a3 Resolve all '#[allow(clippy::needless_return)]' error supressions 2021-07-17 21:47:17 +02:00
Joshua Barretto
7686023430 Merge branch 'aweinstock/hats' into 'master' 
Basic implementation of hat visuals.

See merge request veloren/veloren!2485
 2021-07-17 19:42:26 +00:00
Jonathan Berglin
121d87d87a Resolve all '#[allow(clippy::redundant_clone)]' error supressions 2021-07-17 18:04:01 +00:00
Dr. Dystopia
9c6cdbba71 Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions 2021-07-17 17:12:29 +02:00
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
Avi Weinstock
13fc4de561 Add per-species head offsets. 2021-07-16 19:22:28 -04:00
Avi Weinstock
0a33c98268 Basic implementation of hat visuals. 2021-07-16 18:49:40 -04: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
468cfe84e7 clippy fixes in tests 2021-07-12 13:35:26 +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
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