Commit Graph

7861 Commits

Author SHA1 Message Date
hqurve
6ac2b87006 Debug change visibility from settings_window works again 2021-04-14 19:24:28 -04:00
hqurve
9018ead8d0 Seem to have missed minimap again 2021-04-14 19:10:18 -04:00
hqurve
399795dbf1 simplified settings changing within hud and settings_window 2021-04-14 19:10:18 -04:00
hqurve
4503d5160c forgot to add minimap to settings_change 2021-04-14 19:10:17 -04:00
hqurve
56deb5919f cleaned up settings_change.rs 2021-04-14 19:10:17 -04:00
hqurve
df38dfbaf8 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
732fe3bb40 Moved session.rs into session/mod.rs 2021-04-14 19:10:17 -04:00
hqurve
685eeb42d8 Split settings.rs into multiple files 2021-04-14 19:10:17 -04:00
hqurve
8effdb1773 Moved settings.rs to settings/mod.rs 2021-04-14 19:10:17 -04:00
Samuel Keiffer
d37d310a87 Merge branch 'sam/handed-stat-adjustment' into 'master'
Adjusts Stats for Handedness Correctly

See merge request veloren/veloren!2125
2021-04-14 22:11:17 +00:00
Sam
c88df846a7 Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky. 2021-04-14 17:38:37 -04:00
Ben Wallis
378561598e Character deletes are now processed by CharacterUpdater and clear any pending logout updates for the deleted character 2021-04-14 22:30:53 +01:00
Yusuf Bera Ertan
6331f4e1cc
build(nix): remove useless rustpkgs 2021-04-15 00:28:35 +03:00
Yusuf Bera Ertan
ff1d86cee3
chore(deps): update nix flake lock 2021-04-15 00:19:55 +03:00
Samuel Keiffer
e6f10e5176 Merge branch 'pfau/temp_disable_death_msg' into 'master'
Temporarily remove death messages

See merge request veloren/veloren!2124
2021-04-14 20:45:54 +00:00
Sam
94042bdf79 Stats adjusted for 2h. Poise adjusted by handedness. 2021-04-14 15:03:37 -04:00
Monty
ed233efc53 Temporarily remove death messages 2021-04-14 20:31:34 +02:00
Samuel Keiffer
435b5d5912 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
568a8d9666 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
Stanisław Grupiński
fd7bf41678 Update main.ron 2021-04-14 12:40:02 +00:00
Ben Wallis
6db79d5439 Merge branch 'xvar/fix-saves-dir-creation' into 'master'
Fixed initial creation of saves directory

See merge request veloren/veloren!2122
2021-04-14 07:41:59 +00:00
Ben Wallis
d6b3eb3784 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
Samuel Keiffer
6f9f28af18 Merge branch 'slipped/animtweaks' into 'master'
1h weapons

See merge request veloren/veloren!2117
2021-04-14 03:02:22 +00:00
jshipsey
808634aa75 addressing commments 2021-04-13 20:19:35 -04:00
jshipsey
a7f5b90f0e 2h/1h bug fix, staggers 2021-04-13 20:19:35 -04:00
jshipsey
161382d06a changelog 2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374 loot tables, clippy, animation tweaks 2021-04-13 20:18:59 -04:00
jshipsey
42460f7e65 spins, combos 2021-04-13 20:18:59 -04:00
jshipsey
97528b7954 leaps 2021-04-13 20:18:59 -04:00
jshipsey
529f8eb5a6 more setups. chargeswing/dash anims 2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb alpha attacks 2021-04-13 20:18:59 -04:00
Sam
0b10ffc715 You can now roll without a weapon equipped. 2021-04-13 20:18:58 -04:00
Sam
c594f67d47 Fixed offhand weapons, when nothing was in the mainhand 2021-04-13 20:18:58 -04:00
jshipsey
b53e1653f6 initial wield testing 2021-04-13 20:18:58 -04:00
Ben Wallis
e30cc4abd7 Merge branch 'xvar/switch-from-diesel-to-rusqlite' into 'master'
Replaced Diesel with Rusqlite

See merge request veloren/veloren!2011
2021-04-13 22:05:48 +00:00
Ben Wallis
1de94a9979 * 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
Marcel
9ccaec1aca Merge branch 'xMAC94x/netfix' into 'master'
fixed #1067

Closes #1067

See merge request veloren/veloren!2119
2021-04-13 18:56:51 +00:00
Marcel Märtens
8ee83df600 fixed #1067 2021-04-13 20:39:56 +02:00
Marcel
4c23be44dd Merge branch 'socherbyc/assets' into 'master'
Updates the Brazilian Portuguese (pt-BR) translation

See merge request veloren/veloren!2118
2021-04-13 17:24:45 +00:00
Yuri Socher Bichibichi
c6dea3acca Updates the Brazilian Portuguese (pt-BR) translation 2021-04-13 11:56:58 -03:00
Imbris
763f9ff3af Merge branch 'Frinksy/scancodes' into 'master'
#861: Displaying keys based off of scancodes

See merge request veloren/veloren!1730
2021-04-13 13:48:30 +00:00
Adam Blanchet
0d7d069d41
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
522e89d57f 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
Samuel Keiffer
879b3e0133 Merge branch 'UMR1352/fix#1065' into 'master'
fix issue #1065: admin bag and other admin items inside a container doesn't disappear when dropped

Closes #1065

See merge request veloren/veloren!2114
2021-04-13 05:55:36 +00:00
Marcel
5b8842fac3 Merge branch 'deny-trade-on-exit' into 'master'
Denies any active trades on exit to char select.

See merge request veloren/veloren!2111
2021-04-12 23:00:38 +00:00
Rickey Chamblee
883977a42f Denies any active trades on exit to char select. 2021-04-12 23:00:38 +00:00
Marcel
ef171478f6 Merge branch 'xMAC94x/protocol_errors' into 'master'
Have a clear error for when the I/O closes and when some protocol is violated....

See merge request veloren/veloren!2082
2021-04-12 22:44:49 +00:00
Marcel Märtens
9638581d09 ITFrame::read_frame now throws an error when the frame_no is invalid.
This will be catched by the respective protocols, e.g. tcp and cause a violation
2021-04-13 00:13:08 +02:00
Marcel Märtens
4fed9dab83 Have a clear error for when the I/O closes and when some protocol is violated. this should help find the rootcause of a bug.
If its Closed it looks like the TCP connection got dropped/cut off (e.g. OS, Wifi).
If its Violated we for sure know the cause is the messages send/recv in a wrong way
2021-04-13 00:12:20 +02:00
Ben Wallis
831cd9c5db Merge branch 'juliancoffee/fix_localization_tests' into 'master'
Fix localization test bug which produced bunch of Unknown states

See merge request veloren/veloren!2105
2021-04-12 21:29:45 +00:00