juliancoffee
1d5c35a48b
add asset_tweaks to unittests on CI
2021-06-08 23:00:59 +03:00
juliancoffee
6ffbbe85bd
serialize AssetTweakWrapper<T>, not just T
...
asset_tweak::tweak_expect_or_create works by writing default data to
file and then read it as asset.
the problem is that it was writing T, and read AssetTweakWrapper<T>
which are different types.
Tests didn't handle case when you will load data back so bug was hidden.
2021-06-08 22:39:51 +03:00
Marcel
a47aeb79be
Merge branch 'xMAC94x/todo' into 'master'
...
add todo for clippy exception
See merge request veloren/veloren!2400
2021-06-08 14:24:41 +00:00
Marcel Märtens
c1740ed486
add todo for clippy exception
2021-06-08 15:45:46 +02:00
Marcel
ccf6f9023e
Merge branch 'juliancoffee/asset_tweak' into 'master'
...
tweak_expect function to tweak values from .ron
See merge request veloren/veloren!2391
2021-06-08 11:37:01 +00:00
juliancoffee
e5d2c66cb8
put serde behind feature gate
2021-06-08 14:03:15 +03:00
juliancoffee
849ee4f18a
Fix find_root() search in case if .git isn't dir
2021-06-08 13:34:46 +03:00
juliancoffee
8c28e29056
place asset_tweak behind a feature
2021-06-08 13:34:41 +03:00
juliancoffee
7eacee7a85
More tests, support only assets/tweak directory
...
- Use `serial_test` because tests can't run in parallel as both of them
are accessing fs.
- Take only filename, use hardcoded `assets/tweak` to keep it simple and
support .gitignore
2021-06-08 13:31:27 +03:00
juliancoffee
13ff935657
add assets/tweak directory to .gitignore
2021-06-08 13:31:27 +03:00
juliancoffee
932ff7d42b
add asset_tweak_or_create that will create file
2021-06-08 13:31:27 +03:00
juliancoffee
beeea5830b
New tweak_expect fn to tweak values from .ron
...
- Function to tweak values via temporary hot-reloaded .ron files
2021-06-08 13:31:27 +03:00
Marcel
b023f73500
Merge branch 'xMAC94x/ci_bin_features' into 'master'
...
Add bot tests to CI
See merge request veloren/veloren!2326
2021-06-08 10:04:17 +00:00
Marcel
e3725cdd16
Merge branch 'slipped/meatfollowup' into 'master'
...
various fixes to items
See merge request veloren/veloren!2399
2021-06-08 09:57:31 +00:00
Christof Petig
3b9a57ffd2
suppress recipes with no cost
2021-06-08 09:17:04 +02:00
jshipsey
9d03211a1a
various fixes to items
2021-06-07 21:21:12 -04:00
Marcel
debd786b95
Merge branch 'aweinstock/unghost-ships' into 'master'
...
Restore collision data for airships, and add the test that would have caught this.
See merge request veloren/veloren!2397
2021-06-07 23:25:19 +00:00
Marcel
3106509020
Merge branch 'christof/spinning_flax' into 'master'
...
Enable spinning flax (recipe got overwritten by linen from linen items)
See merge request veloren/veloren!2396
2021-06-07 22:43:17 +00:00
Avi Weinstock
35cd81d97e
Restore collision data for airships, and add the test that would have caught this.
2021-06-07 18:09:09 -04:00
Christof Petig
a2f12c94bb
Enable spinning flax (recipe got overwritten by linen from linen items)
2021-06-07 23:40:25 +02:00
Marcel
346199a39a
Merge branch 'imbris/fix-dockerfile' into 'master'
...
Require all commands to succeed in server-cli Dockerfile
See merge request veloren/veloren!2394
2021-06-07 21:05:09 +00:00
Imbris
df2ad92ad3
Require all commands to succeed in server-cli Dockerfile
2021-06-07 13:31:01 -04:00
Marcel
3520a3afed
Merge branch 'xMAC94x/hashbrown' into 'master'
...
switch to hashbrown 0.11 and specs 0.16.2
See merge request veloren/veloren!2390
2021-06-07 14:31:58 +00:00
Marcel
06cb832f96
Merge branch 'fix' into 'master'
...
mig fix
See merge request veloren/veloren!2393
2021-06-07 13:59:57 +00:00
Marcel
a03aee95f7
Merge branch 'pfau/icon_shading' into 'master'
...
better icon shading
See merge request veloren/veloren!2392
2021-06-07 12:56:49 +00:00
jshipsey
5ef6bff0f2
mig fix
2021-06-07 08:32:59 -04:00
Monty
7a0dd5ca10
3d icon shading
2021-06-07 14:27:49 +02:00
Marcel Märtens
4c29484f22
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 13:01:01 +02:00
Marcel Märtens
c339c57fa3
--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
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
