juliancoffee
32e81f5d06
Add warnings about non-existent items in /kit
2021-06-11 01:33:47 +03:00
juliancoffee
2764dfbdc8
add new armour and legendary weapons to /kit
2021-06-11 01:33:18 +03:00
juliancoffee
67a03d9cd1
add temporary "middle" skill preset
2021-06-11 01:31:46 +03:00
Marcel
84a809df82
Merge branch 'jvck10-master-patch-73738' into 'master'
...
Small fixes to pt_br language.
See merge request veloren/veloren!2410
2021-06-09 20:01:49 +00:00
Marcel
efe7b628b4
Merge branch 'swilliams/more-collision-balancing' into 'master'
...
Fixed biped_small and humanoid hitboxes
See merge request veloren/veloren!2411
2021-06-09 15:44:00 +00:00
João Victor Cardoso Kdouk
38ab1e20dc
Small fixes to pt_br language.
2021-06-09 14:36:10 +00:00
Scott Williams
3ac5f9a027
Fixed biped_small and humanoid hitboxes
2021-06-09 15:23:10 +01:00
Marcel
8792c18dea
Merge branch 'tygyh/Extract-get-duration-image-from-update' into 'master'
...
Extract 'get_duration_image' function from 'update'
See merge request veloren/veloren!2407
2021-06-09 14:08:38 +00:00
Marcel
326daaab7b
Merge branch 'tygyh/Extract-create-new-text-from-update' into 'master'
...
Tygyh/extract create new text from update
See merge request veloren/veloren!2408
2021-06-09 14:08:34 +00:00
Dr. Dystopia
fc33e42c23
Extract 'create_new_text' function from 'update'
2021-06-09 13:35:41 +02:00
Dr. Dystopia
5e37995e7f
Extract 'get_duration_image' function from 'update'
2021-06-09 13:09:31 +02:00
Marcel
1104dfc983
Merge branch 'aweinstock/recipe-graphviz' into 'master'
...
Add graphviz diagram generator for crafting recipes.
See merge request veloren/veloren!2401
2021-06-09 09:14:13 +00:00
Marcel
6928271319
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
207e10d890
NPC Hitbox Adjustments
2021-06-09 08:08:41 +00:00
Marcel
2c2d86a658
Merge branch 'slipped/smallfixes' into 'master'
...
small tweaks
See merge request veloren/veloren!2405
2021-06-09 07:39:01 +00:00
jshipsey
7c1798d71a
small tweaks
...
t
2021-06-09 01:58:08 -04:00
Forest Anderson
b0cebd745c
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
c7fbe0580b
Fix
2021-06-08 20:12:42 -05:00
Marcel
0090347b08
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
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
Avi Weinstock
e9202024d7
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
22ac7745b2
Add graphviz diagram generator for crafting recipes.
2021-06-08 14:42:51 -04: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
