Marcel
ee5d55f773
Merge branch 'swilliams/collision-balance' into 'master'
...
NPC Hitbox Adjustments
See merge request veloren/veloren!2403
2021-06-09 08:08:44 +00:00
Scott Williams
2a161abd0a
NPC Hitbox Adjustments
2021-06-09 08:08:41 +00:00
Marcel
8a599a37d8
Merge branch 'slipped/smallfixes' into 'master'
...
small tweaks
See merge request veloren/veloren!2405
2021-06-09 07:39:01 +00:00
jshipsey
7cb5323eb6
small tweaks
...
t
2021-06-09 01:58:08 -04:00
Forest Anderson
e6493fbb2f
Merge branch 'sam/minotaur-anim-fix' into 'master'
...
Minotaur Anim Fix
See merge request veloren/veloren!2404
2021-06-09 01:59:54 +00:00
Sam
a5aef59ac5
Fix
2021-06-08 20:12:42 -05:00
Marcel
d16fcbc410
Merge branch 'juliancoffee/asset_tweak_fix' into 'master'
...
serialize AssetTweakWrapper<T>, not just T
See merge request veloren/veloren!2402
2021-06-08 22:39:55 +00:00
juliancoffee
44e4fd874f
add asset_tweaks to unittests on CI
2021-06-08 23:00:59 +03:00
juliancoffee
1dd621a56f
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
Avi Weinstock
b5ae6227c0
Run clippy for graphviz target in CI and add instructions on how to consume the output.
2021-06-08 15:08:14 -04:00
Avi Weinstock
b5b7de9532
Add graphviz diagram generator for crafting recipes.
2021-06-08 14:42:51 -04:00
Marcel
08862a1ebd
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
37c508d05d
add todo for clippy exception
2021-06-08 15:45:46 +02:00
Marcel
dc4bd0de75
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
cb7a41c72d
put serde behind feature gate
2021-06-08 14:03:15 +03:00
juliancoffee
df2c3a4950
Fix find_root() search in case if .git isn't dir
2021-06-08 13:34:46 +03:00
juliancoffee
8f86f474e8
place asset_tweak behind a feature
2021-06-08 13:34:41 +03:00
juliancoffee
3c34301947
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
832a7d89f4
add assets/tweak directory to .gitignore
2021-06-08 13:31:27 +03:00
juliancoffee
7533f4d17b
add asset_tweak_or_create that will create file
2021-06-08 13:31:27 +03:00
juliancoffee
8a157b8410
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
39ea9d3aa3
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
eecb561838
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
b3956517fc
suppress recipes with no cost
2021-06-08 09:17:04 +02:00
jshipsey
fe1cbec37c
various fixes to items
2021-06-07 21:21:12 -04:00
Marcel
d9f3789079
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
3077e539eb
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
3cbf84ddb1
Restore collision data for airships, and add the test that would have caught this.
2021-06-07 18:09:09 -04:00
Christof Petig
c0f952030c
Enable spinning flax (recipe got overwritten by linen from linen items)
2021-06-07 23:40:25 +02:00
Marcel
4147665cbb
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
df16c20eb4
Require all commands to succeed in server-cli Dockerfile
2021-06-07 13:31:01 -04:00
Marcel
7e8bebdfa1
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
32336be160
Merge branch 'fix' into 'master'
...
mig fix
See merge request veloren/veloren!2393
2021-06-07 13:59:57 +00:00
Marcel
a02f4bea18
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
acf9111141
mig fix
2021-06-07 08:32:59 -04:00
Monty
dd0368eed4
3d icon shading
2021-06-07 14:27:49 +02:00
Marcel Märtens
7185dcee68
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 13:01:01 +02:00
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
