jshipsey
18e9b5b890
recipes, re-organization, cleanup
2021-06-07 10:58:05 +02:00
jshipsey
74fbe9a123
cloth/metallic armor
2021-06-07 10:56:54 +02:00
jshipsey
1b575a5a04
crafting item partial re-organization, armor recipes, some specific animal drops
2021-06-07 10:56:35 +02:00
jshipsey
ffc9a0ae22
more drops, armors
2021-06-07 10:56:16 +02:00
jshipsey
f387b8d259
hides/leathers
2021-06-07 10:56:04 +02:00
jshipsey
451ccf8d73
more meat
2021-06-07 10:55:50 +02:00
jshipsey
ca907f1b87
added some meat
2021-06-07 10:55:34 +02:00
Marcel
af874af771
Merge branch 'imbris/small-fixes' into 'master'
...
Remove unused fields from UI stuff
Closes #1012
See merge request veloren/veloren!2388
2021-06-07 08:37:11 +00:00
Marcel
27e505e79d
Merge branch 'xMAC94x/log_spam' into 'master'
...
XMAC94x/log spam
See merge request veloren/veloren!2385
2021-06-07 07:55:27 +00:00
Imbris
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
Marcel
bb0bb38108
Merge branch 'pfau/loading_screen_bgs' into 'master'
...
Add 0.10 login background and new loading screens
See merge request veloren/veloren!2386
2021-06-06 18:17:42 +00:00
Marcel Märtens
26160df8e5
adjust tracing
2021-06-06 19:31:25 +02:00
Monty
336d83fc49
new bgs
2021-06-06 19:30:37 +02:00
Marcel
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
Marcel
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
hqurve
39fc48ac17
Widened recipe list in crafting menu and added quality indicators to names in the list
2021-06-06 15:55:11 +00:00
Ben Wallis
efbfc20c04
Merge branch 'Extract-unlock-skill-from-diary-update' into 'master'
...
Extract 'unlock_skill' function from 'update'
See merge request veloren/veloren!2383
2021-06-06 14:14:53 +00:00
Jonathan Berglin
38c0e02114
Extract 'create_unlock_skill_button' function from 'update' in diary.rs
2021-06-06 14:14:53 +00:00
Snowram
edfe713076
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
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
