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
Illia Denysenko
d42c03d57e
Fix localization test bug which produced bunch of Unknown states
2021-04-12 21:29:45 +00:00
Samuel Keiffer
c4f3522138
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
a4bd47f340
Support quantity + use Enum for autocompletion + Address comments
2021-04-12 20:07:34 +02:00
Vincent Foulon
0692562533
New Command: "kit" + Removed Command: "debug"
...
Update CHANGELOG.md
Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Marcel
9289feee23
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
bfd23a9828
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
e3d1d3ddd1
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
dd1e06115e
Inverted admin check.
2021-04-12 12:44:19 +02:00
Samuel Keiffer
e1020945dd
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
f7c8389f77
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
Marcel
e4a67a9ba2
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for Ukrainian
See merge request veloren/veloren!2107
2021-04-12 02:28:56 +00:00
Illia Denysenko
4ac8015ed9
Update localization for Ukrainian
2021-04-12 02:28:55 +00:00
Avi Weinstock
df4f44d946
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
d401d00d94
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
7c34a96934
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
Avi Weinstock
f1b022cdee
Add new version of combat soundtrack, and change details of how transitions between tracks work.
2021-04-11 22:08:41 -04:00
Avi Weinstock
0e16c23707
Only count enemy group members for combat music, and count bosses as high-intensity via an HP heuristic.
2021-04-11 22:08:41 -04:00
Avi Weinstock
5bfdd5f1af
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
54024ce401
Merge branch 'DaforLynx/more-music' into 'master'
...
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
9db290d4ea
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
2021-04-12 00:43:08 +00:00
