Justin Shipsey
f4a97a27f5
Merge branch 'sam/2h-offhand-anim-fixes' into 'master'
...
2 Hand Offhand Animation Fixes
See merge request veloren/veloren!2129
2021-04-15 01:21:52 +00:00
Ben Wallis
ad02a21e61
Merge branch 'xvar/rework-char-deletes' into 'master'
...
Character deletes are now processed by CharacterUpdater and clear any pending...
See merge request veloren/veloren!2128
2021-04-15 00:39:17 +00:00
Samuel Keiffer
782f9930bb
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
b76181aaa0
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
6c9994ab58
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
Samuel Keiffer
89d58590fd
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
207e7d45a3
Stats adjusted for 2h. Poise adjusted by handedness.
2021-04-14 15:03:37 -04:00
Monty
b140745da2
Temporarily remove death messages
2021-04-14 20:31:34 +02: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
088d87f85c
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
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
Samuel Keiffer
3d7af53cb6
Merge branch 'slipped/animtweaks' into 'master'
...
1h weapons
See merge request veloren/veloren!2117
2021-04-14 03:02:22 +00: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
3640656a02
changelog
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
c3ae820694
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
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
Marcel
7d136c9805
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
ca4732bd29
fixed #1067
2021-04-13 20:39:56 +02:00
Marcel
149fc5ac76
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
03aa34590f
Updates the Brazilian Portuguese (pt-BR) translation
2021-04-13 11:56:58 -03:00
Imbris
8f09ed91f2
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
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
Samuel Keiffer
11f33ba8cf
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
2b306052f6
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
3565eb8bca
Denies any active trades on exit to char select.
2021-04-12 23:00:38 +00:00
Marcel
a179b777d3
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
60c3105fae
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
ce1c58fb7b
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
e669da890a
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
Illia Denysenko
5e0fd884c7
Fix localization test bug which produced bunch of Unknown states
2021-04-12 21:29:45 +00:00
Samuel Keiffer
02ac7168d7
Merge branch 'vfoulon80/cmd-item-kits' into 'master'
...
New Command: "kit" + Removed Command: "debug"
See merge request veloren/veloren!2115
2021-04-12 19:36:08 +00:00
Vincent Foulon
bdbbc23b9c
Support quantity + use Enum for autocompletion + Address comments
2021-04-12 20:07:34 +02:00
Vincent Foulon
65ef568d70
New Command: "kit" + Removed Command: "debug"
...
Update CHANGELOG.md
Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Marcel
a4779ea6b5
Merge branch 'imbris/update-cache-image' into 'master'
...
Update the ci cache image
See merge request veloren/veloren!2106
2021-04-12 15:35:06 +00:00
Enrico Marconi
43996abc0c
fix issue #1065 : admin bag and other admin items inside a container doesn't disappear when dropped
2021-04-12 16:21:10 +02:00
Marcel
ce47ac5f31
Merge branch 'sharp/inverted-check' into 'master'
...
Inverted admin check.
See merge request veloren/veloren!2112
2021-04-12 10:45:23 +00:00
Joshua Yanovski
85589081ed
Inverted admin check.
2021-04-12 12:44:19 +02: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
