Commit Graph

7868 Commits

Author SHA1 Message Date
a6d5d6df7c Update dependencies 2021-04-25 08:13:19 -04:00
48b8ec5d49 Almost make clouds/postproccess run 2021-04-25 08:13:19 -04:00
4667512b5a Render the UIs 2021-04-25 08:13:19 -04:00
49cb1520ca Add generic Bound<T> type for grouping consts/other bindable things with bind groups 2021-04-25 08:13:18 -04:00
455082a7af Render Ui 2021-04-25 08:12:52 -04:00
90a1371673 Color! 2021-04-25 08:11:37 -04:00
0f569266aa fixed validation errors when creating pipelines 2021-04-25 08:11:37 -04:00
53b3bd7e2c No crash on startup 2021-04-25 08:11:37 -04:00
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
73f5c571d5 Improve shader errors by showing shader file name, reduce repetitive shader construction code 2021-04-25 08:11:37 -04:00
c5235590e3 migrate cloud pipeline, migrate iced renderer, rebase fixes 2021-04-25 08:11:37 -04:00
27bea8379b Make compile through various changes, update wgpu to latest git 2021-04-25 08:11:37 -04:00
81148b3664 More fixes 2021-04-25 08:11:37 -04:00
801dec8ebe Switched from zerocopy to bytemuck
Fixing errors
2021-04-25 08:11:37 -04:00
03f8531945 Made the layouts more compact 2021-04-25 08:11:37 -04:00
f7ae702410 Finished porting all pipelines 2021-04-25 08:11:37 -04:00
574a930864 Began porting pipeline creation 2021-04-25 08:11:37 -04:00
5d487b2299 ported all pipelines 2021-04-25 08:11:37 -04:00
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
3eb06c6971 Merge branch 'juliancoffee/refactor_localization' into 'master'
Update doc-strings in voxygen/i18n

See merge request veloren/veloren!2194
2021-04-25 09:32:39 +00:00
8fd1037bf3 Update doc-strings 2021-04-25 09:12:15 +03:00
79cb7a5826 Merge branch 'snowram/bird-large' into 'master'
Large bird skeleton

See merge request veloren/veloren!2121
2021-04-25 03:34:12 +00: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
0cf7e7114f Phoenix AI pass 2021-04-25 04:07:11 +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
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +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
aa6145c9b5 Merge branch 'ada/english-fallback' into 'master'
Add option to load English string as fallback if string missing

See merge request veloren/veloren!1791
2021-04-24 14:39:35 +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
ff445d3306 Merge branch 'holychowders/fix_grammatical_error' into 'master'
Fix grammatical error in NPC message

See merge request veloren/veloren!2191
2021-04-24 06:12:42 +00:00
516f2fec4a Fix grammatical error in NPC message 2021-04-23 22:43:37 -07: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
fef68ad2a1 Merge branch 'ygor/fix-staff-shockwave-infinite-range' into 'master'
Fix fire shockwave infinite vertical range

Closes #1038

See merge request veloren/veloren!2189
2021-04-24 01:38:14 +00:00
71b8426592 Add basic distance check to shockwave hit test
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.

This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
2021-04-24 03:09:45 +02:00
4d0aa9c3ad Merge branch 'juliancoffee/update-uk_UA' into 'master'
update uk_UA localization

See merge request veloren/veloren!2186
2021-04-23 21:30:46 +00:00
4e7aba5b3f update uk_UA localization 2021-04-23 21:30:46 +00:00
0f5d289ecb Merge branch 'xMAC94x/quickfix_for_airshipper' into 'master'
xMac94x/quickfix for airshipper

See merge request veloren/veloren!2188
2021-04-23 18:52:21 +00:00
a610db5cfc have a seperate stage for scheduled builds 2021-04-23 17:48:02 +02:00
1489fccbe3 Merge branch 'juliancoffee/fix_localization_tests' into 'master'
Fix off-by-one error in localization tests

See merge request veloren/veloren!2187
2021-04-23 11:42:00 +00: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
8828691935 Merge branch 'update_pt_BR_20210422' into 'master'
update pt_br 20210422

See merge request veloren/veloren!2182
2021-04-23 01:00:41 +00:00