|
|
7e8bebdfa1
|
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 |
|
|
|
dd0368eed4
|
3d icon shading
|
2021-06-07 14:27:49 +02:00 |
|
|
|
7185dcee68
|
switch to hashbrown 0.11 and specs 0.16.2
|
2021-06-07 13:01:01 +02:00 |
|
|
|
279d3ade83
|
Item tooltip refactor and fixed related to new stats
|
2021-06-07 11:06:32 +02:00 |
|
|
|
0488b2fcd0
|
Adressed comments on energy and armor functions.
|
2021-06-07 11:06:25 +02:00 |
|
|
|
76ca99ece4
|
Derive str from Material, better deserialization
|
2021-06-07 11:03:50 +02:00 |
|
|
|
4deeb42155
|
cave adjustments
|
2021-06-07 11:02:34 +02:00 |
|
|
|
9034d0f25d
|
comment addressing, cave tweaks
|
2021-06-07 11:01:46 +02:00 |
|
|
|
0e269b59d7
|
tooltip work
|
2021-06-07 11:01:32 +02:00 |
|
|
|
5fdb2ac01d
|
migration
|
2021-06-07 11:01:04 +02:00 |
|
|
|
29a38e6d4f
|
Split tags into material class and material
|
2021-06-07 11:00:57 +02:00 |
|
|
|
3fa7d0b6d4
|
Add material and armor class tags
|
2021-06-07 11:00:31 +02:00 |
|
|
|
7a573efab7
|
proper recipes, tanning racks, various fixes
|
2021-06-07 11:00:14 +02:00 |
|
|
|
754b60d810
|
crafting stations
|
2021-06-07 10:59:35 +02:00 |
|
|
|
74fbe9a123
|
cloth/metallic armor
|
2021-06-07 10:56:54 +02:00 |
|
|
|
95bfcde6d1
|
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 |
|
|
|
336d83fc49
|
new bgs
|
2021-06-06 19:30:37 +02:00 |
|
|
|
521e1eacf3
|
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 |
|
|
|
45741b0dbd
|
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 |
|
|
|
39fc48ac17
|
Widened recipe list in crafting menu and added quality indicators to names in the list
|
2021-06-06 15:55:11 +00:00 |
|
|
|
38c0e02114
|
Extract 'create_unlock_skill_button' function from 'update' in diary.rs
|
2021-06-06 14:14:53 +00:00 |
|
|
|
edfe713076
|
Cyclops, basilisk, air balloon offsets
|
2021-06-06 14:12:08 +02:00 |
|
|
|
85b8d4e7c0
|
Merge branch 'sam/yeti' into 'master'
Yeti Rework
See merge request veloren/veloren!2359
|
2021-06-05 23:15:20 +00:00 |
|
|
|
864f230a3c
|
Yeti combat anims
|
2021-06-06 00:17:23 +02:00 |
|
|
|
a148d4d01a
|
Fix scissor panics when window height is 1
|
2021-06-05 20:36:27 +01:00 |
|
|
|
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 |
|
|
|
1a93e3d84f
|
Added 60 FPS framerate cap for title/menu screens
|
2021-06-05 14:13:53 +01:00 |
|
|
|
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 |
|
|
|
93f90d514c
|
Particles for ice spikes
|
2021-06-04 18:17:15 -05:00 |
|
|
|
81f7e690fd
|
Snowball attack.
|
2021-06-04 18:17:15 -05:00 |
|
|
|
a82984b925
|
Added base ability set
|
2021-06-04 18:17:14 -05:00 |
|
|
|
b647cd35f1
|
Don't draw when window size is minimized
|
2021-06-04 23:37:33 +01:00 |
|
|
|
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 |
|
|
|
36c28af46d
|
Regenerate the swapchain if the frame is outdated
|
2021-06-04 20:37:39 +01:00 |
|
|
|
f066f844b6
|
Fmt and clippy from toolchain rebase.
|
2021-06-03 21:39:18 -05:00 |
|
|
|
ca43a0058a
|
some animation
|
2021-06-03 21:39:17 -05:00 |
|
|
|
35876411cd
|
Fixed tests
|
2021-06-03 21:39:16 -05:00 |
|
|
|
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 |
|
|
|
c81e1534f7
|
First 3 abilities for tidal warrior functional. Added bubble particles.
|
2021-06-03 21:39:13 -05:00 |
|
|
|
05c699878f
|
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
|
2021-06-03 19:24:34 -04:00 |
|
|
|
05cbaff682
|
build(nix): add new dependencies to nix build and dev env for wgpu
|
2021-06-04 00:08:02 +03:00 |
|
|
|
6ffdad173d
|
Switch to using block_on directly from futures-executor instead of the umbrella crate
|
2021-06-03 14:28:28 -04:00 |
|
|
|
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 |
|
|
|
7fd952e139
|
Remove stabilized or_patterns feature
|
2021-06-03 00:10:07 -04:00 |
|
|
|
538677263b
|
Enable since naga currently has issues translating our SPIRV -> metal
|
2021-06-03 00:10:07 -04:00 |
|
|
|
2b8eaae572
|
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
|
2021-06-03 00:10:06 -04:00 |
|
|
|
8db11cce37
|
Use expect to document potential panic when starting a new frame recording, fix clippy warning
|
2021-06-03 00:10:06 -04:00 |
|
|
|
01aa6af1fd
|
Address various TODOs introduced in wgpu transition
|
2021-06-03 00:10:06 -04:00 |
|
|
|
8403e4c483
|
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 |
|
|
|
38d2d46165
|
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 |
|
