3692 Commits

Author SHA1 Message Date
Ludvig Böklin
0d7c0dfd50 Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Imbris
59490b2a89 Merge branch 'imbris/stamina-energy' into 'master'
Replace stamina with energy

Closes #1214

See merge request veloren/veloren!2704
2021-08-01 00:26:59 +00:00
Joshua Barretto
548e5fffbf Merge branch 'imbris/tracy-mem' into 'master'
Add small feature to profile memory allocation with Tracy

See merge request veloren/veloren!2699
2021-07-31 21:54:28 +00:00
Monty Marz
fddc2e9570 fix i18n 2021-07-31 18:17:34 +02:00
Imbris
22b77a7a04 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Imbris
a09f3a0532 Add feature to profile memory allocation with Tracy 2021-07-30 01:06:57 -04:00
Monty Marz
2466cad155 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Marcel Märtens
91a5e18fb2 mark missing files as untranslated 2021-07-29 22:18:47 +02:00
Marcel Märtens
cfe3a027be remove some reexports 2021-07-29 22:18:34 +02:00
Marcel Märtens
8c5d0665ae extract path logic 2021-07-29 20:15:23 +02:00
Marcel Märtens
2a314c3cab redo i18n git analysis completly and introduce a way to export csv data
also improve the performance by caching git_graph_descendant
2021-07-29 20:15:14 +02:00
Marcel Märtens
a142d59637 experiment with a git cache 2021-07-29 20:12:30 +02:00
Dr. Dystopia
c797fc29f7 base framework to print csv 2021-07-29 20:12:18 +02:00
Marcel Märtens
f939c5bb2f add a argument for i18n to enable csv generation 2021-07-29 20:12:13 +02:00
Imbris
fe77c6c76d Merge branch 'juliancoffee/hud_refactor' into 'master'
Skillbar hud refactoring (+ shortened key names)

See merge request veloren/veloren!2663
2021-07-29 16:08:56 +00:00
juliancoffee
f8f873df3f Improve ability descriptions 2021-07-29 18:27:18 +03:00
juliancoffee
4065f01797 Added comments on PositionSpecifier usage 2021-07-28 20:03:23 +03:00
juliancoffee
9c7f96b6c1 Improve terms of EntityConfig and LoadoutBuilder
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
2021-07-28 19:19:10 +03:00
juliancoffee
d06fe4517e Split Skillbar::update to separate stages 2021-07-28 10:33:51 +03:00
juliancoffee
e19e524f3a display_shortened for keys 2021-07-28 10:33:51 +03:00
juliancoffee
afbe7e77e6 Update skillbar ability text 2021-07-28 10:33:51 +03:00
juliancoffee
3487a1ae8d Deduplicate bar text 2021-07-28 10:33:51 +03:00
juliancoffee
226be88e80 Prettify skillbar code 2021-07-28 10:33:50 +03:00
juliancoffee
2a8d88ed28 Deduplicate skillbar slots 2021-07-28 10:33:50 +03:00
Marcel Märtens
b1818fb4ca fixed map to zoom and drag correctly, fixed #1111 2021-07-27 01:15:06 +02:00
Imbris
16be0abf6c Merge branch 'chat-scrolling-hack' into 'master'
Trying to fix chat hiding behind the chat window.

See merge request veloren/veloren!2678
2021-07-26 04:41:15 +00:00
DanTheOne
47e49f0409 Add shortcut to toggle chat 2021-07-26 02:42:35 +02:00
Imbris
45d032085f Merge branch 'tygyh/Resolve-all-'#-allow(clippy--match_single_binding)]'-error-supressions' into 'master'
Resolve all '#[allow(clippy::match_single_binding)]' error supressions

See merge request veloren/veloren!2674
2021-07-25 17:24:22 +00:00
Avi Weinstock
b0f76da08d Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
This reverts commit 63eff216f050e83404629dfd84ae3c8e38e8fe54.
2021-07-25 12:28:25 -04:00
Jonathan Berglin
ffeab0c391 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
KK
cc8f3f329d This little hack, tries to fix the bad Behavior hiding the chat behind the chat window. 2021-07-24 22:43:32 -07:00
Joshua Barretto
6162076246 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
4e88e8f209 Resolve all '#[allow(clippy::match_single_binding)]' error supressions 2021-07-24 22:11:50 +02:00
Dr. Dystopia
54085ea825 Resolve unused '#[allow(clippy::option_map_unit_fn)]' error supressions 2021-07-24 20:35:13 +02:00
Dr. Dystopia
6269c82bb2 Resolve unused '#[allow(clippy::manual_unwrap_or)]' error supressions 2021-07-24 20:26:15 +02:00
Dr. Dystopia
2044cea131 Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions 2021-07-24 20:22:05 +02:00
Dr. Dystopia
51f350525f Resolve unused '#[allow(clippy::collapsible_if)]' error supressions 2021-07-24 20:16:18 +02:00
Dr. Dystopia
d5e2fcca0f Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions 2021-07-24 20:14:26 +02:00
Dr. Dystopia
9156470ed3 Resolve unused '#[allow(clippy::same_item_push)]' error supressions 2021-07-24 20:08:08 +02:00
Joshua Barretto
4634696868 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
13bbb082b8 Fixed bad non-humanoid lantern offset 2021-07-24 15:05:36 +01:00
Joshua Barretto
1df81360ab Properly fixed command parsing 2021-07-23 17:33:31 +01:00
schnippl0r
1ba8b8c4d3 Moved GameInput to own module and made use of strum's EnumIter and AsRefStr. 2021-07-21 13:23:45 +02:00
schnippl0r
5f606768d7 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
8200bf4650 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
9218c3bc3b Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Imbris
e647fbabdd Remove unused setting for whether to create a log file 2021-07-19 10:26:55 -04:00
Imbris
5957e23828 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
3f7c49a726 Deduplicate setting equipment tooltips 2021-07-19 03:12:36 +03:00
Imbris
600034ec4d Use mountee_offset for not yet animated mounting transforms (ie those that aren't quadruped_medium) 2021-07-18 15:09:36 -04:00