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
Avi Weinstock
8a11a723fd
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
70a2027634
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
6a3883b8f1
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
39d4d84f15
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
e1ca34d9e8
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
mdx97
1357f99564
Fix diary toggling when escape menu is open.
2021-04-11 18:53:45 -05:00
Marcel
dc2428b38e
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
95c44a6794
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Joshua Yanovski
b42ec9a4e5
Merge branch 'xMAC94x/deps' into 'master'
...
update deps
See merge request veloren/veloren!2095
2021-04-11 22:55:56 +00:00
hqurve
ff35d06062
Got rid of content setup macro
2021-04-11 17:36:02 -04:00
hqurve
fe23b0727b
Placed tabs in a loop and combined tab content chooser using macro
2021-04-11 17:36:02 -04:00
hqurve
bd2930a2b0
cleaned widget_ids
2021-04-11 17:36:02 -04:00
hqurve
73d6d86b4e
Moved settings window sections into separate files
2021-04-11 17:36:02 -04:00
hqurve
4668bfb333
Moved settings_window.rs to to settings_window/mod.rs
2021-04-11 17:36:02 -04:00
Vincent Foulon
36c3b08190
clean workspace
...
clean workspace (2)
clean workspace (2)
2021-04-11 16:35:24 +02:00
Vincent Foulon
c613e0022c
Asset reorganization + removed some unused and duplicates + reduce size of some images
2021-04-11 16:35:17 +02:00
Monty Marz
04d540c565
UI fixes and more
2021-04-11 03:49:47 +00:00
Joshua Yanovski
32be6c5f8f
Merge branch 'sharp/sprites-in-background' into 'master'
...
Mesh sprites in background.
See merge request veloren/veloren!2098
2021-04-10 20:34:35 +00:00
Marcel
8594b4ea84
Merge branch 'mdx97/default-names' into 'master'
...
Use username as default character name in multiplayer character creation.
See merge request veloren/veloren!2085
2021-04-10 16:41:47 +00:00
mdx97
b360143b42
Use username as default character name in multiplayer character creation.
2021-04-10 16:41:46 +00:00
Joshua Yanovski
94ebf99115
Mesh sprites in the background.
...
This makes the delay afetr selecting a character before logging into the
game much shorter, in the common case. It still doesn't handle things
perfectly (it blocks creating Terrain::new if it's not finished, and it
could be faster due to working in the background), but it's still a lot
better than it was before.
To improve sprite meshing performance, we also apply the terrain
flat_get optimizations to sprites. Though I didn't initially know how
much of an impact it would have, it feels significantly faster to me,
though being able to parallelize it would be ideal.
2021-04-10 17:51:42 +02:00
Marcel Märtens
7d8c85ff07
update deps
2021-04-10 15:53:00 +02:00
Joshua Yanovski
909f2c4680
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
hqurve
1b3536a5f5
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window
2021-04-07 20:24:22 +00:00
James Melkonian
7bb62615df
Add topographic option to map
2021-04-06 09:16:17 -07:00
James Melkonian
9c7bfb72ea
Map icon scaling
2021-04-06 08:42:09 -07:00
James Melkonian
44715100c1
Add layers to minimap
2021-04-06 08:42:08 -07:00
James Melkonian
3578116eee
Added map layers
2021-04-06 08:42:07 -07:00
