Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,654 Commits 151 Branches 18 Tags 2.1 GiB
4167621f5d
Commit Graph

8654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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