juliancoffee
|
849ee4f18a
|
Fix find_root() search in case if .git isn't dir
|
2021-06-08 13:34:46 +03:00 |
|
Marcel
|
3520a3afed
|
Merge branch 'xMAC94x/hashbrown' into 'master'
switch to hashbrown 0.11 and specs 0.16.2
See merge request veloren/veloren!2390
|
2021-06-07 14:31:58 +00:00 |
|
Monty
|
7a0dd5ca10
|
3d icon shading
|
2021-06-07 14:27:49 +02:00 |
|
Marcel Märtens
|
4c29484f22
|
switch to hashbrown 0.11 and specs 0.16.2
|
2021-06-07 13:01:01 +02:00 |
|
Snowram
|
5728d08fce
|
Item tooltip refactor and fixed related to new stats
|
2021-06-07 11:06:32 +02:00 |
|
Sam
|
58bcf27105
|
Adressed comments on energy and armor functions.
|
2021-06-07 11:06:25 +02:00 |
|
Snowram
|
6ee751a9c6
|
Derive str from Material, better deserialization
|
2021-06-07 11:03:50 +02:00 |
|
jshipsey
|
0c550516a1
|
cave adjustments
|
2021-06-07 11:02:34 +02:00 |
|
jshipsey
|
1892554b21
|
comment addressing, cave tweaks
|
2021-06-07 11:01:46 +02:00 |
|
jshipsey
|
5883c8248e
|
tooltip work
|
2021-06-07 11:01:32 +02:00 |
|
jshipsey
|
63f6f313d0
|
migration
|
2021-06-07 11:01:04 +02:00 |
|
Snowram
|
afd43ba3d9
|
Split tags into material class and material
|
2021-06-07 11:00:57 +02:00 |
|
Snowram
|
44ba95a836
|
Add material and armor class tags
|
2021-06-07 11:00:31 +02:00 |
|
jshipsey
|
44cd8c1bf6
|
proper recipes, tanning racks, various fixes
|
2021-06-07 11:00:14 +02:00 |
|
jshipsey
|
9c96a8d941
|
crafting stations
|
2021-06-07 10:59:35 +02:00 |
|
jshipsey
|
7e6c01c9e9
|
cloth/metallic armor
|
2021-06-07 10:56:54 +02:00 |
|
Imbris
|
16168a6159
|
Remove unused velocity field in the Hud and remove unused fields from
the image slider widget code
|
2021-06-07 02:49:35 -04: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 |
|
Marcel
|
3b73986af2
|
Merge branch 'hqurve/crafting-sorting2' into 'master'
Widened recipe list in crafting menu and added quality indicators to names in the list
See merge request veloren/veloren!2378
|
2021-06-06 15:55:11 +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 |
|
Jonathan Berglin
|
9b064e289d
|
Extract 'create_unlock_skill_button' function from 'update' in diary.rs
|
2021-06-06 14:14:53 +00:00 |
|
Snowram
|
b1a2d0b698
|
Cyclops, basilisk, air balloon offsets
|
2021-06-06 14:12:08 +02:00 |
|
Samuel Keiffer
|
a57a8de23a
|
Merge branch 'sam/yeti' into 'master'
Yeti Rework
See merge request veloren/veloren!2359
|
2021-06-05 23:15:20 +00:00 |
|
Snowram
|
29d1d127d3
|
Yeti combat anims
|
2021-06-06 00:17:23 +02:00 |
|
João Capucho
|
b150a2ab3b
|
Fix scissor panics when window height is 1
|
2021-06-05 20:36:27 +01:00 |
|
Ben Wallis
|
4f2e60487d
|
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
|
619a190566
|
Added 60 FPS framerate cap for title/menu screens
|
2021-06-05 14:13:53 +01: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 |
|
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 |
|
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 |
|
Sam
|
75f5c0543b
|
Fmt and clippy from toolchain rebase.
|
2021-06-03 21:39:18 -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
|
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 |
|
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
|
22199a9980
|
Switch to using block_on directly from futures-executor instead of the umbrella crate
|
2021-06-03 14:28:28 -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
|
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 |
|