Snowram
|
3fa7d0b6d4
|
Add material and armor class tags
|
2021-06-07 11:00:31 +02:00 |
|
jshipsey
|
7a573efab7
|
proper recipes, tanning racks, various fixes
|
2021-06-07 11:00:14 +02:00 |
|
jshipsey
|
1a5717e957
|
armor stats on chest
|
2021-06-07 11:00:05 +02:00 |
|
jshipsey
|
8acd3832e3
|
more loot tables, overworld ores, more items
|
2021-06-07 11:00:00 +02:00 |
|
jshipsey
|
05de96c94b
|
ore deposits, flower drops
|
2021-06-07 10:59:50 +02:00 |
|
jshipsey
|
1c17d8fe5e
|
cave changes
|
2021-06-07 10:59:44 +02:00 |
|
jshipsey
|
754b60d810
|
crafting stations
|
2021-06-07 10:59:35 +02:00 |
|
Sam
|
2a07fad802
|
Removed armor stat hackery.
Added new armor stats to remaining armor items.
Fixed broken tests.
|
2021-06-07 10:59:26 +02:00 |
|
Sam
|
ff66e34be5
|
Added default values to every armor item.
|
2021-06-07 10:59:15 +02:00 |
|
Sam
|
fa0fe38699
|
Fixed csv tools
|
2021-06-07 10:58:47 +02:00 |
|
Sam
|
855384fbeb
|
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
|
c3b834ec15
|
Max energy stat functional.
|
2021-06-07 10:58:37 +02:00 |
|
Sam
|
6790b71d53
|
Energy recovery stat functional.
|
2021-06-07 10:58:32 +02:00 |
|
jshipsey
|
58bd51a9e8
|
icon work, more models
|
2021-06-07 10:58:27 +02:00 |
|
Sam
|
f2233d5b5d
|
Recipe book fix
|
2021-06-07 10:58:07 +02:00 |
|
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 |
|