Marcel Märtens
c1740ed486
add todo for clippy exception
2021-06-08 15:45:46 +02: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
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
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
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 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
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
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
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
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
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
b55bc7b003
crafting item partial re-organization, armor recipes, some specific animal drops
2021-06-07 10:56:35 +02: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
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 Märtens
b48c3ca80c
adjust tracing
2021-06-06 19:31:25 +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
Snowram
b1a2d0b698
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
Sam
a73e7c78e0
Balance tweaks.
2021-06-05 17:15:04 -05:00
Sam
6d342537d6
Yeti AI
2021-06-05 13:25:47 -05:00
Sam
d5b25bd36b
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
6add5510a7
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
9c5ca3bba5
Added base ability set
2021-06-04 18:17:14 -05:00
Sam
0658510ba6
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
1ebe6461d4
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Sam
47d5ea69eb
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
d0bfcabd1c
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
07829fffab
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Marcel Märtens
5a517977df
use criterion groups and fix tracing to much on wgpu
2021-06-03 22:37:17 +02:00
Imbris
af951bc665
Fix ProfSpan constructor being private
2021-06-03 00:10:06 -04:00
