Commit Graph

3185 Commits

Author SHA1 Message Date
27f0afc786 Ported most of the textures and models related methods 2021-04-25 08:11:37 -04:00
56428a2c4e Started the report of wgpu 2021-04-25 08:11:37 -04:00
8fd1037bf3 Update doc-strings 2021-04-25 09:12:15 +03:00
c16ec43938 Body specific beam offsets 2021-04-25 04:07:12 +02:00
8f54a0bf31 More phoenix AI work
More phoenix AI work
2021-04-25 04:07:12 +02:00
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
ab26efa970 Improves bird_large anims 2021-04-25 04:07:09 +02:00
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
0f6b902924 Idle, run, vel/ori aware fly anims 2021-04-25 02:14:49 +02:00
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
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
01c30868eb Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
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
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
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
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
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
f987f4d628 Fixed broken crafting sprite requirement 2021-04-22 12:30:48 +01:00
19ce4ad531 comments 2021-04-22 00:04:39 -04:00
2f523f5aa0 formatting 2021-04-22 00:04:39 -04:00
0962fe72f2 fix for 1h on back 2021-04-22 00:04:39 -04:00
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
1af4a04231 Revert "Merge branch 'revert-b10718c5' into 'master'"
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
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
81ba200e48 Improve dynamic light reflection for hill climbing 2021-04-21 17:10:53 +01:00
2c95165c82 Improvements to lantern holding when sitting 2021-04-21 16:54:03 +01:00
ed7cc12213 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
fd672980c4 Revert "Merge branch 'imbris/agent-opt' into 'master'"
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
26222a0a2d Rename common-sys to common-systems and rearrange common-state slightly 2021-04-20 15:25:04 -04:00
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
70c345eee9 Made crafting UI check exact crafting sprite 2021-04-20 15:23:52 +01:00
abacdfc719 clippy 2021-04-20 02:48:17 +02:00
a4d56e7843 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
1a0f6f03ef Prevent crafting without station 2021-04-20 02:46:05 +02:00
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
5598d07944 Added crafting stations 2021-04-20 02:45:59 +02:00
5862920f32 seperate sys/state 2021-04-20 01:30:17 +02:00
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
7a9876760b Voxygen: Allow zoom on minimap with kbd 2021-04-19 20:26:54 +01:00
f23b515dd8 Voxygen: Add master volume sliders to the settings 2021-04-19 19:58:14 +01:00
7589331785 Voxygen: Add support for map zoom with keybind 2021-04-19 11:56:58 +01:00
fd302b6975 Voxygen: Add inactive window volume 2021-04-19 10:24:31 +01:00
1d605c2dc8 Voxygen: Update ambient channels volume 2021-04-19 10:24:28 +01:00
05279872ce Voxygen: Use the master volume setting 2021-04-19 10:20:42 +01:00
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
26c2738dc2 Voxygen: Stop ambient sounds on logout 2021-04-18 21:35:43 +01:00
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
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