Filip Bengtsson
57ee1ec2dd
Translate most of gameinput.ron
2021-06-05 23:08:59 +02:00
Filip Bengtsson
c0925c8c0d
Translate esc_menu.ron
2021-06-05 23:04:55 +02:00
Filip Bengtsson
acf02ad8cc
Translate most of common.ron
2021-06-05 23:03:48 +02:00
Filip Bengtsson
2a4787bccf
Translate char_selection.ron
2021-06-05 22:45:55 +02:00
Filip Bengtsson
7928569c44
Translate buff.ron
2021-06-05 22:28:01 +02:00
Filip Bengtsson
cf3cfb41df
Translate _manifest.ron
2021-06-05 14:26:00 +02:00
Filip Bengtsson
7101d0576e
Copy files from English
2021-06-05 13:26:41 +02:00
Marcel
a083305d21
Merge branch 'xMAC94x/update_deps' into 'master'
...
update dependencies
See merge request veloren/veloren!2374
2021-06-05 11:10:22 +00:00
Ben Wallis
caa546cc45
Merge branch 'capucho/wgpu-outdated-swapchain' into 'master'
...
Rebuild swapchain on Outdate error
See merge request veloren/veloren!2376
2021-06-05 10:27:32 +00:00
João Capucho
a65650389e
Don't draw when window size is minimized
2021-06-04 23:37:33 +01:00
Ben Wallis
033f275a56
Merge branch 'hqurve/fix-lootscrller' into 'master'
...
Fixed loot scroller collisions and cleaned up previous changes
See merge request veloren/veloren!2358
2021-06-04 20:00:18 +00:00
João Capucho
70f3b1a9a2
Regenerate the swapchain if the frame is outdated
2021-06-04 20:37:39 +01:00
Samuel Keiffer
42115bae3b
Merge branch 'juliancoffee/bow_tweaks' into 'master'
...
Bow Tweaks
See merge request veloren/veloren!2375
2021-06-04 18:33:35 +00:00
juliancoffee
267409ef4a
Bow Tweaks
...
- M1 (charged) got faster charge, but lesser damage and energy regen
- M2 (repeater) got faster charge, but lesser damage and max speed
- S1 (shotgun) got less energy cost
2021-06-04 20:58:08 +03:00
Marcel Märtens
e33bd39f34
update dependencies
2021-06-04 09:44:30 +02:00
Imbris
eb179fb90c
Merge branch 'imbris/fix-publish' into 'master'
...
Make docker-nightly job depend on the nightly air-linux job
See merge request veloren/veloren!2373
2021-06-04 07:29:20 +00:00
Imbris
2ffeaab2fe
Make docker-nightly job depend on the nightly air-linux job
2021-06-04 03:24:57 -04:00
Imbris
f466c807b2
Merge branch 'imbris/update-ci-cache' into 'master'
...
Imbris/update ci cache
See merge request veloren/veloren!2372
2021-06-04 07:02:06 +00:00
Imbris
4a1218ecdd
Update docker cache for CI
2021-06-04 02:27:07 -04:00
Samuel Keiffer
66d72df5b6
Merge branch 'sam/tidal-warrior' into 'master'
...
Tidal Warrior Rework
See merge request veloren/veloren!2340
2021-06-04 03:52:49 +00:00
Sam
0658510ba6
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
75f5c0543b
Fmt and clippy from toolchain rebase.
2021-06-03 21:39:18 -05:00
Sam
7f942864de
Added kits for tiers 1 and 2
2021-06-03 21:39:17 -05:00
jshipsey
a4d95fdd13
some animation
2021-06-03 21:39:17 -05:00
Sam
571599ff63
Fixed tests
2021-06-03 21:39:16 -05:00
Sam
1ebe6461d4
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Sam
47d5ea69eb
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
d0bfcabd1c
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Marcel
acf0094504
Merge branch 'xMAC94x/cleanupbenches' into 'master'
...
use criterion groups and fix tracing to much on wgpu
See merge request veloren/veloren!2369
2021-06-03 21:43:46 +00:00
Marcel
30e6b2e0d0
Merge branch 'yusdacra/chore/nix' into 'master'
...
Update Nix deps, add new build and runtime deps to make it work with wgpu
See merge request veloren/veloren!2370
2021-06-03 21:12:19 +00:00
Yusuf Bera Ertan
18c05cddfc
build(nix): add new dependencies to nix build and dev env for wgpu
2021-06-04 00:08:02 +03:00
Imbris
03a89bbfcf
Merge branch 'imbris/nightly-ci-improvement' into 'master'
...
Avoid extra jobs on nightly builds
See merge request veloren/veloren!2367
2021-06-03 20:54:16 +00:00
Marcel Märtens
5a517977df
use criterion groups and fix tracing to much on wgpu
2021-06-03 22:37:17 +02:00
Yusuf Bera Ertan
de4320c9b0
chore(deps): update nix flake deps
2021-06-03 23:33:13 +03:00
Imbris
57637f3f0a
Merge branch 'imbris/wgpu-master-rebased' into 'master'
...
wgpu
See merge request veloren/veloren!1947
2021-06-03 19:58:48 +00:00
Imbris
22199a9980
Switch to using block_on directly from futures-executor instead of the umbrella crate
2021-06-03 14:28:28 -04:00
Imbris
72bc86f5cb
Unhack the wgpu branch CI
2021-06-03 14:24:31 -04:00
Imbris
b5296bdf12
Update changelog
2021-06-03 14:23:28 -04:00
Marcel
a3524ea7c5
Merge branch 'xMAC94x/switch_cidb' into 'master'
...
change cidb settings
See merge request veloren/veloren!2368
2021-06-03 18:05:44 +00:00
Marcel Märtens
afeedb412e
change cidb settings
2021-06-03 17:26:09 +02:00
Imbris
d98420cd3b
Avoid extra jobs on nightly builds
2021-06-03 04:10:22 -04:00
Imbris
9dd7bcbd0d
Properly calculate the necessary length of the index buffers for checks that ensure they are large enough
2021-06-03 00:45:11 -04:00
Imbris
898a267763
set SHADERC_LIB_DIR to the location in the docker image where it is cached
2021-06-03 00:10:07 -04:00
Imbris
7856c51320
Remove stabilized or_patterns feature
2021-06-03 00:10:07 -04:00
Imbris
6c61c9495e
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-03 00:10:07 -04:00
Imbris
b9a55961c5
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
2021-06-03 00:10:06 -04:00
Imbris
6f280c650b
Use expect to document potential panic when starting a new frame recording, fix clippy warning
2021-06-03 00:10:06 -04:00
Imbris
308cbbb998
Address various TODOs introduced in wgpu transition
2021-06-03 00:10:06 -04:00
Imbris
156888e965
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-06-03 00:10:06 -04:00
Joshua Yanovski
71e80faf33
Fix shadows for wgpu.
...
In the process, we also fix our n_e / f_e calculation to actually
compute plane intersections properly.
2021-06-03 00:10:06 -04:00
