Marcel
|
c70183328a
|
Merge branch 'imbris/648-cleanup' into 'master'
Make handling of shortcut keywords for commands clearer and revise a TODO...
Closes #648
See merge request veloren/veloren!2387
|
2021-06-07 10:27:54 +00:00 |
|
Marcel
|
6048d847dd
|
Merge branch 'xMAC94x/fix_swedish' into 'master'
fix swedish ron files
See merge request veloren/veloren!2389
|
2021-06-07 10:06:16 +00:00 |
|
Marcel Märtens
|
2aea36227f
|
fix swedish ron files
|
2021-06-07 12:02:02 +02:00 |
|
Marcel
|
69593c234f
|
Merge branch 'master' into 'master'
Update Swedish translation
See merge request veloren/veloren!2380
|
2021-06-07 09:42:09 +00:00 |
|
Marcel
|
85b19f3878
|
Merge branch 'meat' into 'master'
meat, new armors, cave overhaul
Closes #731
See merge request veloren/veloren!2258
|
2021-06-07 09:40:46 +00:00 |
|
Marcel Märtens
|
b84dd087d1
|
put ron behind a cargo feature as its only used in a bin and fix a logical merge conflict, overwriting with edfe713076
|
2021-06-07 11:13:55 +02:00 |
|
jshipsey
|
9817bc59d7
|
changelog
|
2021-06-07 11:06:39 +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
|
b03af3b712
|
finalize stats
t
|
2021-06-07 11:02:03 +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
|
7da7c56260
|
armor stats on chest
|
2021-06-07 11:00:05 +02:00 |
|
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 |
|
Imbris
|
96b7f027e3
|
Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes
|
2021-06-06 23:45:51 -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 |
|
Filip Bengtsson
|
f2dd0d0297
|
Missed strings
|
2021-06-06 17:48:09 +02: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 |
|