Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,497 Commits 151 Branches 18 Tags
Commit Graph

8497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
6d342537d6 Yeti AI 2021-06-05 13:25:47 -05:00
Sam
d5b25bd36b Particles for ice spikes 2021-06-04 18:17:15 -05:00
Sam
6add5510a7 Snowball attack. 2021-06-04 18:17:15 -05:00
Sam
9c5ca3bba5 Added base ability set 2021-06-04 18:17:14 -05: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
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
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
Avi Weinstock
75e4931cc3 Address MR 2253 review comments. 2021-06-03 00:10:06 -04:00
Avi Weinstock
a46b876437 Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it. 2021-06-03 00:10:06 -04:00
Avi Weinstock
c34116a835 Implement a Debug pipeline for hitboxes and pathfinding lines. 
- Implements mesh generation for cylinders and lines.
    - Implements an Id-allocator so that clients can mutate positions efficiently.
    - Is split into pipeline and scene modules.
    - Contains simple shaders that just pass through a position and color.
 2021-06-03 00:10:06 -04:00
Imbris
7c761147a4 Use profling to get spans from wgpu, update wpgu & its deps for various 
fixes
 2021-06-03 00:10:06 -04:00
Imbris
94ace54aec Update wgpu to fix dx11 issue 2021-06-03 00:10:06 -04:00
Imbris
5178e4b7a2 Remove weird syntax in cloud shader that was probably introduced when switching to textureLod 2021-06-03 00:10:06 -04:00
Imbris
56623b97e0 Make models require a non-zero amount of vertices 2021-06-03 00:10:06 -04:00
Imbris
1c48052898 Make shadow vert shaders always contain their content but ensure they are never used when shadow maps are disabled, remove uneeded shadow frag shader 2021-06-03 00:10:06 -04:00