Capucho
c159346489
Shader fixes
2021-04-25 08:13:19 -04:00
Capucho
a6d5d6df7c
Update dependencies
2021-04-25 08:13:19 -04:00
Imbris
48b8ec5d49
Almost make clouds/postproccess run
2021-04-25 08:13:19 -04:00
Imbris
4667512b5a
Render the UIs
2021-04-25 08:13:19 -04:00
Imbris
49cb1520ca
Add generic Bound<T> type for grouping consts/other bindable things with bind groups
2021-04-25 08:13:18 -04:00
Imbris
455082a7af
Render Ui
2021-04-25 08:12:52 -04:00
Imbris
90a1371673
Color!
2021-04-25 08:11:37 -04:00
Imbris
0f569266aa
fixed validation errors when creating pipelines
2021-04-25 08:11:37 -04:00
Imbris
53b3bd7e2c
No crash on startup
2021-04-25 08:11:37 -04:00
Imbris
612e4fe823
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-25 08:11:37 -04:00
Imbris
73f5c571d5
Improve shader errors by showing shader file name, reduce repetitive shader construction code
2021-04-25 08:11:37 -04:00
Imbris
c5235590e3
migrate cloud pipeline, migrate iced renderer, rebase fixes
2021-04-25 08:11:37 -04:00
Imbris
27bea8379b
Make compile through various changes, update wgpu to latest git
2021-04-25 08:11:37 -04:00
Capucho
81148b3664
More fixes
2021-04-25 08:11:37 -04:00
Capucho
801dec8ebe
Switched from zerocopy to bytemuck
...
Fixing errors
2021-04-25 08:11:37 -04:00
Capucho
03f8531945
Made the layouts more compact
2021-04-25 08:11:37 -04:00
Capucho
f7ae702410
Finished porting all pipelines
2021-04-25 08:11:37 -04:00
Capucho
574a930864
Began porting pipeline creation
2021-04-25 08:11:37 -04:00
Capucho
5d487b2299
ported all pipelines
2021-04-25 08:11:37 -04:00
Capucho
27f0afc786
Ported most of the textures and models related methods
2021-04-25 08:11:37 -04:00
Capucho
56428a2c4e
Started the report of wgpu
2021-04-25 08:11:37 -04:00
juliancoffee
8fd1037bf3
Update doc-strings
2021-04-25 09:12:15 +03:00
Snowram
c16ec43938
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
0f6b902924
Idle, run, vel/ori aware fly anims
2021-04-25 02:14:49 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Samuel Keiffer
e4324a3481
Merge branch 'ygor/skillbar-account-for-skillset' into 'master'
...
Make skillbar buttons account for energy cost reduction
See merge request veloren/veloren!2185
2021-04-24 19:32:19 +00:00
Ada Lovegirls
01c30868eb
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee
Merge branch 'xvar/server-version-check' into 'master'
...
Added client/server version mismatch warnings
See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f
Added client/server version mismatch message when a network error is encountered during client init.
...
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
Ygor Souza
4f71c621f4
Make skillbar buttons account for energy cost reduction
...
Previously, the buttons would compare the current energy to the base
cost of the ability, so they would sometimes be grayed out while the
ability was usable. Now they ajust the ability with the character
skillset before getting the energy cost for the purposes of setting
the skillbar icon color.
2021-04-24 03:45:58 +02:00
juliancoffee
dc8d306890
Fix off-by-one error in localization tests
...
BlameHunk lines start counting from 1, not 0. Comparing with `line + 1`
fix this.
2021-04-23 14:11:44 +03: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
