Samuel Keiffer
85b8d4e7c0
Merge branch 'sam/yeti' into 'master'
...
Yeti Rework
See merge request veloren/veloren!2359
2021-06-05 23:15:20 +00:00
Snowram
864f230a3c
Yeti combat anims
2021-06-06 00:17:23 +02:00
Sam
acf7ad27f1
Balance tweaks.
2021-06-05 17:15:04 -05:00
Ben Wallis
8c825305e9
Merge branch 'capucho/scissor-panic' into 'master'
...
Fix scissor panics when window height is 1
See merge request veloren/veloren!2379
2021-06-05 20:46:43 +00:00
João Capucho
a148d4d01a
Fix scissor panics when window height is 1
2021-06-05 20:36:27 +01:00
Sam
74b7039219
Yeti AI
2021-06-05 13:25:47 -05:00
Ben Wallis
7b8a398234
Merge branch 'xvar/title-screen-fps-cap' into 'master'
...
Added 60 FPS framerate cap for title/menu screens
See merge request veloren/veloren!2377
2021-06-05 14:00:57 +00:00
Ben Wallis
1a93e3d84f
Added 60 FPS framerate cap for title/menu screens
2021-06-05 14:13:53 +01:00
Marcel
01e2b69fda
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
e9a5fe1b4d
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
Sam
93f90d514c
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
81f7e690fd
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
a82984b925
Added base ability set
2021-06-04 18:17:14 -05:00
João Capucho
b647cd35f1
Don't draw when window size is minimized
2021-06-04 23:37:33 +01:00
Ben Wallis
059dfd2602
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
36c28af46d
Regenerate the swapchain if the frame is outdated
2021-06-04 20:37:39 +01:00
Samuel Keiffer
f574015c39
Merge branch 'juliancoffee/bow_tweaks' into 'master'
...
Bow Tweaks
See merge request veloren/veloren!2375
2021-06-04 18:33:35 +00:00
juliancoffee
554828e1a1
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
1015af13d4
update dependencies
2021-06-04 09:44:30 +02:00
Imbris
3dbfe57b04
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
aa127a9df6
Make docker-nightly job depend on the nightly air-linux job
2021-06-04 03:24:57 -04:00
Imbris
f2efdc97ae
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
bf3ee86425
Update docker cache for CI
2021-06-04 02:27:07 -04:00
Samuel Keiffer
e984ebc446
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
eaf87a53bb
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
f066f844b6
Fmt and clippy from toolchain rebase.
2021-06-03 21:39:18 -05:00
Sam
e835cb1392
Added kits for tiers 1 and 2
2021-06-03 21:39:17 -05:00
jshipsey
ca43a0058a
some animation
2021-06-03 21:39:17 -05:00
Sam
35876411cd
Fixed tests
2021-06-03 21:39:16 -05:00
Sam
5bf99eac11
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
ac2f097d80
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
c81e1534f7
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Marcel
59ae5ec573
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
55d04969a4
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
05cbaff682
build(nix): add new dependencies to nix build and dev env for wgpu
2021-06-04 00:08:02 +03:00
Imbris
61cec869c1
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
affb9730a8
use criterion groups and fix tracing to much on wgpu
2021-06-03 22:37:17 +02:00
Yusuf Bera Ertan
221e848b71
chore(deps): update nix flake deps
2021-06-03 23:33:13 +03:00
Imbris
e7a766b310
Merge branch 'imbris/wgpu-master-rebased' into 'master'
...
wgpu
See merge request veloren/veloren!1947
2021-06-03 19:58:48 +00:00
Imbris
6ffdad173d
Switch to using block_on directly from futures-executor instead of the umbrella crate
2021-06-03 14:28:28 -04:00
Imbris
f3cb08170c
Unhack the wgpu branch CI
2021-06-03 14:24:31 -04:00
Imbris
d6e5827b8b
Update changelog
2021-06-03 14:23:28 -04:00
Marcel
24c256b681
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
44d04aa074
change cidb settings
2021-06-03 17:26:09 +02:00
Imbris
2154893501
Avoid extra jobs on nightly builds
2021-06-03 04:10:22 -04:00
Imbris
be5ee8e205
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
923988da5f
set SHADERC_LIB_DIR to the location in the docker image where it is cached
2021-06-03 00:10:07 -04:00
Imbris
7fd952e139
Remove stabilized or_patterns feature
2021-06-03 00:10:07 -04:00
Imbris
538677263b
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-03 00:10:07 -04:00
Imbris
2b8eaae572
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
2021-06-03 00:10:06 -04:00
