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,596 Commits 151 Branches 18 Tags
Commit Graph

8596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
26f101b994 Added default values to every armor item. 2021-06-07 10:59:15 +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
9379c2a2e7 icon work, more models 2021-06-07 10:58:27 +02:00
Sam
1a4b39e283 Recipe book fix 2021-06-07 10:58:07 +02:00
jshipsey
edd9e447ff recipes, re-organization, cleanup 2021-06-07 10:58:05 +02:00
jshipsey
7e6c01c9e9 cloth/metallic armor 2021-06-07 10:56:54 +02:00
jshipsey
b55bc7b003 crafting item partial re-organization, armor recipes, some specific animal drops 2021-06-07 10:56:35 +02:00
jshipsey
6d2e3e6f8c more drops, armors 2021-06-07 10:56:16 +02:00
jshipsey
77a1f779be hides/leathers 2021-06-07 10:56:04 +02:00
jshipsey
04bec5f7f3 more meat 2021-06-07 10:55:50 +02:00
jshipsey
d0134ebf82 added some meat 2021-06-07 10:55:34 +02:00