Marcel Märtens
|
846df3a18a
|
--all-targets does not run targets that needs some features which are not provided. --all-features is NOT possible as we have some features which are conflicting.
The only possibility is to manually add the features we need to check in CI to the clippy query
|
2021-06-07 12:29:08 +02:00 |
|
Marcel
|
f2eedf81f4
|
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
|
19c1ba47ad
|
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
|
e96dc21d30
|
fix swedish ron files
|
2021-06-07 12:02:02 +02:00 |
|
Marcel
|
97b7c8d68a
|
Merge branch 'master' into 'master'
Update Swedish translation
See merge request veloren/veloren!2380
|
2021-06-07 09:42:09 +00:00 |
|
Marcel
|
f0ce7d587b
|
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
|
b1c2a1bde0
|
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
|
670845e6f5
|
changelog
|
2021-06-07 11:06:39 +02:00 |
|
Snowram
|
279d3ade83
|
Item tooltip refactor and fixed related to new stats
|
2021-06-07 11:06:32 +02:00 |
|
Sam
|
0488b2fcd0
|
Adressed comments on energy and armor functions.
|
2021-06-07 11:06:25 +02:00 |
|
Snowram
|
76ca99ece4
|
Derive str from Material, better deserialization
|
2021-06-07 11:03:50 +02:00 |
|
jshipsey
|
4deeb42155
|
cave adjustments
|
2021-06-07 11:02:34 +02:00 |
|
jshipsey
|
1d23b7aebf
|
finalize stats
t
|
2021-06-07 11:02:03 +02:00 |
|
jshipsey
|
9034d0f25d
|
comment addressing, cave tweaks
|
2021-06-07 11:01:46 +02:00 |
|
jshipsey
|
0e269b59d7
|
tooltip work
|
2021-06-07 11:01:32 +02:00 |
|
jshipsey
|
5fdb2ac01d
|
migration
|
2021-06-07 11:01:04 +02:00 |
|
Snowram
|
29a38e6d4f
|
Split tags into material class and material
|
2021-06-07 11:00:57 +02:00 |
|
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 |
|
Imbris
|
0b92c72096
|
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
|
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 |
|
Filip Bengtsson
|
172c96d83d
|
Missed strings
|
2021-06-06 17:48:09 +02:00 |
|