Imbris
8c9d4dc3dd
Merge branch 'capucho/inactive-master' into 'master'
...
Lower volume of window on focus loss
See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
João Capucho
7a9876760b
Voxygen: Allow zoom on minimap with kbd
2021-04-19 20:26:54 +01:00
João Capucho
f23b515dd8
Voxygen: Add master volume sliders to the settings
2021-04-19 19:58:14 +01:00
João Capucho
7589331785
Voxygen: Add support for map zoom with keybind
2021-04-19 11:56:58 +01:00
João Capucho
fd302b6975
Voxygen: Add inactive window volume
2021-04-19 10:24:31 +01:00
João Capucho
1d605c2dc8
Voxygen: Update ambient channels volume
2021-04-19 10:24:28 +01:00
João Capucho
05279872ce
Voxygen: Use the master volume setting
2021-04-19 10:20:42 +01:00
Samuel Keiffer
0b80e8ac5d
Merge branch 'capucho/stop-ambient' into 'master'
...
Stop ambient sounds on logout
See merge request veloren/veloren!2151
2021-04-18 23:38:10 +00:00
Sam
ce7581037c
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
João Capucho
26c2738dc2
Voxygen: Stop ambient sounds on logout
2021-04-18 21:35:43 +01:00
Avi Weinstock
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Samuel Keiffer
a1d9ba15d9
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
f441c8c206
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
c962c5f12e
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
85ee4c8cd1
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
d5a887f195
m2 staff
2021-04-16 00:48:20 +03:00
gGmMsS123
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
Ben Wallis
1144eefa46
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
0d956610ec
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Avi Weinstock
50d0314a75
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Marcel
a386a27411
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
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
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
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
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
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
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
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
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
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
Illia Denysenko
d42c03d57e
Fix localization test bug which produced bunch of Unknown states
2021-04-12 21:29:45 +00: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
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
mdx97
03abe234ee
Fix diary toggling when escape menu is open.
2021-04-11 18:53:45 -05:00
Marcel
5e7adc6767
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
8a25ebb59a
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
hqurve
fd80a97f3d
Got rid of content setup macro
2021-04-11 17:36:02 -04:00
hqurve
690419ad90
Placed tabs in a loop and combined tab content chooser using macro
2021-04-11 17:36:02 -04:00
hqurve
469cb391d3
cleaned widget_ids
2021-04-11 17:36:02 -04:00
hqurve
04eea482ce
Moved settings window sections into separate files
2021-04-11 17:36:02 -04:00
hqurve
f2340105c1
Moved settings_window.rs to to settings_window/mod.rs
2021-04-11 17:36:02 -04:00
Vincent Foulon
de9d5b5e14
clean workspace
...
clean workspace (2)
clean workspace (2)
2021-04-11 16:35:24 +02:00
Vincent Foulon
7128c3d3f6
Asset reorganization + removed some unused and duplicates + reduce size of some images
2021-04-11 16:35:17 +02:00
Monty Marz
6772e71aaa
UI fixes and more
2021-04-11 03:49:47 +00:00
Joshua Yanovski
8b034ed56f
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
adb18ef645
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
eb4fb33f45
Use username as default character name in multiplayer character creation.
2021-04-10 16:41:46 +00:00
Joshua Yanovski
1bdf3b13a8
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
Joshua Yanovski
af94753ad9
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
hqurve
be42cc60c4
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
16871208f2
Add topographic option to map
2021-04-06 09:16:17 -07:00
James Melkonian
f2ebbb7f7f
Map icon scaling
2021-04-06 08:42:09 -07:00
James Melkonian
8ee1fc4a0f
Add layers to minimap
2021-04-06 08:42:08 -07:00
James Melkonian
bacda06dba
Added map layers
2021-04-06 08:42:07 -07:00
James Melkonian
70ede7f34d
Topographic map
2021-04-06 08:42:06 -07:00
Joshua Barretto
de9ad0942f
Merge branch 'zesterer/follow-cam' into 'master'
...
Added auto camera setting
See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Joshua Barretto
60e2ed3e7d
Added auto camera setting
2021-04-05 23:24:31 +01:00
Marcel
4dde9f84b0
Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
...
Fixes #520 and #840 - locks cursor to screen when menu is not open
Closes #840 and #520
See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
Hunter Parks
6af9662b03
Change cursor lock location to be center of screen
...
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
2021-04-05 16:48:22 +02:00
Hunter Parks
7df0413be4
Fixes #520 and #840 - locks cursor to screen when menu is not open
...
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
2021-04-05 16:37:40 +02:00
Monty
b8c474057c
More cheese is less cheese
...
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
Marcel
69891f0b70
Merge branch 'login-trim-username' into 'master'
...
login trim username, improve validation, social ordering #1040
Closes #1040
See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
Avi Weinstock
78f130a3b2
Add a cheese counter in the bag display.
2021-04-04 11:14:25 -04:00
Monty Marz
06bbb7f0ff
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
DaforLynx
6734198104
Adds on-hit combat sfx
2021-04-04 03:04:02 +00:00
Snowram
9a3f6d8261
Substitutes DPS for CR in item tooltip
2021-04-03 00:10:31 -04:00
Avi Weinstock
b7dbadc32f
Add colors for buy/sell tooltips based on site prices.
2021-04-02 17:44:02 -04:00
Marcel
42463d1fe0
Revert "Merge branch 'animtweaks' into 'master'"
...
This reverts merge request !2039
2021-04-01 18:45:03 +00:00
aljazerzen
08146f6a3a
login trim username, improve validation, social ordering
2021-04-01 16:43:27 +02:00
jshipsey
030e14f333
small anim tweaks
2021-04-01 03:08:33 -04:00
Avi Weinstock
0122dca3c3
Allow fast stacking into and out of a trade with {ctrl,shift} click.
...
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Marcel Märtens
ccb78eeb5c
move tracing code to own crate
2021-03-30 16:35:36 +02:00
Joshua Barretto
3c19713e63
Merge branch 'zesterer/sprite-text' into 'master'
...
Added text prompts to sprites
See merge request veloren/veloren!2034
2021-03-30 11:41:14 +00:00
Joshua Barretto
bed863c50c
Added indicator text to terrain sprites
2021-03-30 01:04:23 +01:00
Joshua Barretto
85237c7a32
Fixed training dummy hitbox
2021-03-29 21:52:05 +01:00
