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,539 Commits 151 Branches 18 Tags
Commit Graph

1882 Commits

Author SHA1 Message Date
jshipsey
ab09814bd9 cave changes 2021-06-07 10:59:44 +02:00
jshipsey
9c96a8d941 crafting stations 2021-06-07 10:59:35 +02:00
Sam
868b5b00aa Removed armor stat hackery. 
Added new armor stats to remaining armor items.
Fixed broken tests.
 2021-06-07 10:59:26 +02:00
Sam
26f101b994 Added default values to every armor item. 2021-06-07 10:59:15 +02:00
Sam
ae60bbf683 Crit power stat now functional, added comments on each stat field to better describe what the stat does and what values should be used. 2021-06-07 10:58:42 +02:00
Sam
4b91bea700 Energy recovery stat functional. 2021-06-07 10:58:32 +02:00
jshipsey
9379c2a2e7 icon work, more models 2021-06-07 10:58:27 +02:00
Sam
1a4b39e283 Recipe book fix 2021-06-07 10:58:07 +02:00
jshipsey
edd9e447ff recipes, re-organization, cleanup 2021-06-07 10:58:05 +02:00
jshipsey
7e6c01c9e9 cloth/metallic armor 2021-06-07 10:56:54 +02:00
jshipsey
b55bc7b003 crafting item partial re-organization, armor recipes, some specific animal drops 2021-06-07 10:56:35 +02:00
jshipsey
6d2e3e6f8c more drops, armors 2021-06-07 10:56:16 +02:00
jshipsey
77a1f779be hides/leathers 2021-06-07 10:56:04 +02:00
jshipsey
04bec5f7f3 more meat 2021-06-07 10:55:50 +02:00
jshipsey
d0134ebf82 added some meat 2021-06-07 10:55:34 +02:00
Monty
82440de48f new bgs 2021-06-06 19:30:37 +02:00
Marcel
3182724b66 Merge branch 'aweinstock/add-models-20210603' into 'master' 
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.

See merge request veloren/veloren!2371
 2021-06-06 16:56:21 +00:00
hqurve
8da6cbe414 Widened recipe list in crafting menu and added quality indicators to names in the list 2021-06-06 15:55:11 +00:00
Snowram
b1a2d0b698 Cyclops, basilisk, air balloon offsets 2021-06-06 14:12:08 +02:00
Snowram
29d1d127d3 Yeti combat anims 2021-06-06 00:17:23 +02:00
Sam
a73e7c78e0 Balance tweaks. 2021-06-05 17:15:04 -05:00
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
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
Sam
0658510ba6 Final tweaks. 2021-06-03 21:39:47 -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
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
Avi Weinstock
07829fffab Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. 2021-06-03 19:24:34 -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
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
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
5178e4b7a2 Remove weird syntax in cloud shader that was probably introduced when switching to textureLod 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
Imbris
78a646a3eb Properly account for negative sun_dir.z in pow use in sky shaders 2021-06-03 00:10:06 -04:00
Imbris
5007a6bf5a Add localization text for GPU timing checkbox 2021-06-03 00:10:06 -04:00
Imbris
c0be83c956 Remove commented out sprite code, including the code for getting verts for sprites with a texture rather than a storage buffer 2021-06-03 00:10:06 -04:00
Imbris
1f6c2eb12f Remove unused waves texture 2021-06-03 00:10:05 -04:00
Imbris
00df6a12ae Remove unused shadow bind group from the cloud pipeline 2021-06-03 00:10:05 -04:00
Imbris
596553d375 Comment out lod depth tweaks not designed for reverse depth, convert waves image to rgba before constructing a texture, misc fix after rebase 2021-06-02 23:59:50 -04:00
Synis
b79281b7ec Fix missing include 2021-06-02 23:59:50 -04:00
Imbris
e97f818fbb Cloud and sprite shader fixes after rebase 2021-06-02 23:59:50 -04:00
Imbris
42f24818a2 Fix dx12 shader issues 2021-06-02 23:59:50 -04:00
Imbris
f927dfb1c6 Implement screenshots 2021-06-02 23:59:50 -04:00