Imbris
c34afaa258
Render the UIs
2021-04-22 18:59:43 -04:00
Imbris
7b86b0d236
Add generic Bound<T> type for grouping consts/other bindable things with bind groups
2021-04-22 18:59:43 -04:00
Imbris
42770c2f89
Render Ui
2021-04-22 18:59:43 -04:00
Imbris
03994495a8
Color!
2021-04-22 18:59:43 -04:00
Imbris
6ce8acbea9
fixed validation errors when creating pipelines
2021-04-22 18:59:43 -04:00
Imbris
cdb6bd56a1
No crash on startup
2021-04-22 18:59:43 -04:00
Imbris
366e8e8e04
Made shaders compile by adding locations and bindings and splitting textures and samplers out into two things and adding guards for double including shaders
2021-04-22 18:59:43 -04:00
Imbris
3f88fa54c7
Improve shader errors by showing shader file name, reduce repetitive shader construction code
2021-04-22 18:59:42 -04:00
Imbris
df87b0cf8a
migrate cloud pipeline, migrate iced renderer, rebase fixes
2021-04-22 18:59:42 -04:00
Imbris
4fb189c388
Make compile through various changes, update wgpu to latest git
2021-04-22 18:59:42 -04:00
Capucho
3f85a8a8cf
More fixes
2021-04-22 18:59:42 -04:00
Capucho
9000b756a8
Switched from zerocopy to bytemuck
...
Fixing errors
2021-04-22 18:59:42 -04:00
Capucho
acd13b87f3
Made the layouts more compact
2021-04-22 18:59:42 -04:00
Capucho
54010cb441
Finished porting all pipelines
2021-04-22 18:59:42 -04:00
Capucho
2f72227c13
Began porting pipeline creation
2021-04-22 18:59:42 -04:00
Capucho
5f9c5b83d7
ported all pipelines
2021-04-22 18:59:42 -04:00
Capucho
9370ffad33
Ported most of the textures and models related methods
2021-04-22 18:59:42 -04:00
Capucho
b75277850b
Started the report of wgpu
2021-04-22 18:59:42 -04:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
Joshua Barretto
f987f4d628
Fixed broken crafting sprite requirement
2021-04-22 12:30:48 +01:00
jshipsey
19ce4ad531
comments
2021-04-22 00:04:39 -04:00
jshipsey
2f523f5aa0
formatting
2021-04-22 00:04:39 -04:00
jshipsey
0962fe72f2
fix for 1h on back
2021-04-22 00:04:39 -04:00
jshipsey
9d82b20891
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Imbris
1af4a04231
Revert "Merge branch 'revert-b10718c5' into 'master'"
...
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223
Merge branch 'zesterer/lanterns' into 'master'
...
Made characters carry lanterns higher when possible
See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Joshua Barretto
81ba200e48
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
Joshua Barretto
2c95165c82
Improvements to lantern holding when sitting
2021-04-21 16:54:03 +01:00
Joshua Barretto
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Imbris
fd672980c4
Revert "Merge branch 'imbris/agent-opt' into 'master'"
...
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Imbris
26222a0a2d
Rename common-sys to common-systems and rearrange common-state slightly
2021-04-20 15:25:04 -04:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Joshua Barretto
70c345eee9
Made crafting UI check exact crafting sprite
2021-04-20 15:23:52 +01:00
Monty Marz
abacdfc719
clippy
2021-04-20 02:48:17 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Joshua Barretto
1a0f6f03ef
Prevent crafting without station
2021-04-20 02:46:05 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944
Added crafting stations
2021-04-20 02:45:59 +02:00
Marcel Märtens
5862920f32
seperate sys/state
2021-04-20 01:30:17 +02:00
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
Samuel Keiffer
bf6c22462f
Merge branch 'xvar/inventory-sorting' into 'master'
...
Implemented inventory sorting
See merge request veloren/veloren!2141
2021-04-17 22:57:56 +00:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Yusuf Bera Ertan
62844d816a
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
198545f219
build: use git keyboard-keynames to fix nix build error
2021-04-17 21:37:22 +03:00
Imbris
30e34aad44
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
2021-04-16 21:58:59 -04: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
Justin Shipsey
803e67b1fb
Merge branch 'slipped/changes' into 'master'
...
combat tweaks
See merge request veloren/veloren!2131
2021-04-15 17:36:19 +00:00
jshipsey
8f20d17c9a
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63
combat tweaks
2021-04-15 11:43:52 -04: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
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
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
