jshipsey
287ec0ffe9
more loot tables, overworld ores, more items
2021-06-07 11:00:00 +02:00
jshipsey
df3fa8b073
ore deposits, flower drops
2021-06-07 10:59:50 +02:00
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
d7a7e01f16
Fixed csv tools
2021-06-07 10:58:47 +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
da65a1c166
Max energy stat functional.
2021-06-07 10:58:37 +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
Marcel
6c21e52e49
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
eeed5fd2df
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
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
Marcel
a3cc752bbf
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
b48c3ca80c
adjust tracing
2021-06-06 19:31:25 +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
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
Ben Wallis
15a9df880f
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
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
Sam
a73e7c78e0
Balance tweaks.
2021-06-05 17:15:04 -05:00
Ben Wallis
a6a340af69
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
b150a2ab3b
Fix scissor panics when window height is 1
2021-06-05 20:36:27 +01:00
Sam
6d342537d6
Yeti AI
2021-06-05 13:25:47 -05: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
Marcel
a083305d21
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
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
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
Marcel Märtens
e33bd39f34
update dependencies
2021-06-04 09:44:30 +02:00
