Samuel Keiffer
e2bb44a70b
Merge branch 'xvar/inventory-sorting' into 'master'
...
Implemented inventory sorting
See merge request veloren/veloren!2141
2021-04-17 22:57:56 +00:00
Ben Wallis
07e6f8fbd9
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Yusuf Bera Ertan
84a7f666c2
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
33c00839e9
build: use git keyboard-keynames to fix nix build error
2021-04-17 21:37:22 +03:00
Imbris
8b41409227
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
2021-04-16 21:58:59 -04:00
Samuel Keiffer
8a83b00e78
Merge branch 'DaforLynx/normalize' into 'master'
...
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
4d74fe9d7c
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
a62598c62c
Merge branch 'gGmMsS/Burning' into 'master'
...
Added burning debuff for Staff M2
See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
Imbris
0a44ec852a
Merge branch 'aweinstock/server-authoritative-physics' into 'master'
...
Aweinstock/server authoritative physics
See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00:00
gGmMsS123
191d60266a
m2 staff
2021-04-16 00:48:20 +03:00
gGmMsS123
90a47a20ea
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
Ben Wallis
f0ab4bbb28
Fixed miscount in Overitem::prim_count causing the tutorial button to fly around when multiple overitem texts are drawn
2021-04-15 21:45:09 +01:00
gGmMsS123
db8d189ebd
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Justin Shipsey
b4757616f6
Merge branch 'slipped/changes' into 'master'
...
combat tweaks
See merge request veloren/veloren!2131
2021-04-15 17:36:19 +00:00
jshipsey
16869933b7
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
599981fca4
combat tweaks
2021-04-15 11:43:52 -04:00
Avi Weinstock
1064e3777b
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Marcel
219f577106
Merge branch 'hqurve/settings-cleanup' into 'master'
...
Settings changes from the ui are now wrapped into a single enum and handling was moved to session/settings_change.rs, also settings.rs was split up
See merge request veloren/veloren!2130
2021-04-15 09:06:10 +00:00
hqurve
b54cfeefc6
Debug change visibility from settings_window works again
2021-04-14 19:24:28 -04:00
hqurve
9f0b794e46
Seem to have missed minimap again
2021-04-14 19:10:18 -04:00
hqurve
5709c76e4e
simplified settings changing within hud and settings_window
2021-04-14 19:10:18 -04:00
hqurve
bf22f631ca
forgot to add minimap to settings_change
2021-04-14 19:10:17 -04:00
hqurve
84ba336c81
cleaned up settings_change.rs
2021-04-14 19:10:17 -04:00
hqurve
fd11654e29
Wrapped settings changes from the ui into a single enum and handling moved to session/settings_change.rs
2021-04-14 19:10:17 -04:00
hqurve
94d3e79115
Moved session.rs into session/mod.rs
2021-04-14 19:10:17 -04:00
hqurve
64e3a52934
Split settings.rs into multiple files
2021-04-14 19:10:17 -04:00
hqurve
c647e81a54
Moved settings.rs to settings/mod.rs
2021-04-14 19:10:17 -04:00
Sam
b76181aaa0
Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.
2021-04-14 17:38:37 -04:00
Samuel Keiffer
17d51db095
Merge branch 'holychowders/resolve_issue_#978_extract_skillset_into_own_component' into 'master'
...
Resolve Issue #978 - Extract SkillSet Into Its Own Component
Closes #1065 and #978
See merge request veloren/veloren!2116
2021-04-14 15:35:35 +00:00
holychowders
793e7982b0
Resolve Issue #978 - Extract SkillSet Into Its Own Component
2021-04-14 15:35:34 +00:00
Ben Wallis
22bd1d5bb5
Fixed initial creation of saves directory. Added path of old singleplayer saves directory to information logged when it is moved to the new userdata directory
2021-04-14 07:15:51 +01:00
jshipsey
28778fbbd0
addressing commments
2021-04-13 20:19:35 -04:00
jshipsey
48d02cff83
2h/1h bug fix, staggers
2021-04-13 20:19:35 -04:00
jshipsey
ce168a17f7
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
jshipsey
31598107d4
spins, combos
2021-04-13 20:18:59 -04:00
jshipsey
40fc3f6daa
leaps
2021-04-13 20:18:59 -04:00
jshipsey
0419ca882e
more setups. chargeswing/dash anims
2021-04-13 20:18:59 -04:00
jshipsey
1b7af50388
alpha attacks
2021-04-13 20:18:59 -04:00
Sam
9bbfe163c4
You can now roll without a weapon equipped.
2021-04-13 20:18:58 -04:00
Sam
72e62701f8
Fixed offhand weapons, when nothing was in the mainhand
2021-04-13 20:18:58 -04:00
jshipsey
f94169ed22
initial wield testing
2021-04-13 20:18:58 -04:00
Ben Wallis
1fbea66a66
* Replaced diesel with rusqlite and refinery
...
* Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table
* Removed all down migrations as refinery does not support down migrations
* Changed all diesel up migrations to refinery naming format
* Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling
* Added /disconnect_all_players admin command
* Added disconnectall CLI command
* Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
Adam Blanchet
329d480706
Display keys based off of scancodes
...
Queries the OS to translate physical keyboard scancodes into
Strings that can be shown in the UI.
Addresses issues #861 and #354
2021-04-13 11:16:47 +02:00
Samuel Keiffer
7e12629884
Merge branch 'mdx97/fix-diary-toggle' into 'master'
...
Fix diary toggling when escape menu is open.
See merge request veloren/veloren!2109
2021-04-13 06:07:01 +00:00
Illia Denysenko
5e0fd884c7
Fix localization test bug which produced bunch of Unknown states
2021-04-12 21:29:45 +00:00
Samuel Keiffer
22ef002238
Merge branch 'aweinstock/combat-music' into 'master'
...
Add combat music transitions based on number of enemies in player radius.
See merge request veloren/veloren!2077
2021-04-12 06:01:19 +00:00
Monty Marz
876e9704a6
Merge branch 'hqurve/settings-ui' into 'master'
...
Cleanup of settings window: split each tab into its own file
See merge request veloren/veloren!2108
2021-04-12 04:11:06 +00:00
Avi Weinstock
545eda6eea
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
f1f38002ae
Address MR2077 review comments: add comment about group::ENEMY and remove trace statements, and fuse filtering loops.
2021-04-11 22:08:41 -04:00
Avi Weinstock
abdc7bb112
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
