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
10,204 Commits 151 Branches 18 Tags 2.1 GiB
81cbcdb412
Commit Graph

10204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oolnokk
81cbcdb412 Changes to formatting 2021-10-31 23:49:46 -04:00
Oolnokk
bdd15d79eb Changes to formatting 2021-10-31 23:44:29 -04:00
Oolnokk
45486aa9c2 2 new beards, four new hairstyles and 1 new eye option for dwarf males 2021-10-31 22:58:25 -04:00
Samuel Keiffer
2ee11de6c7 Merge branch 'sam/potion-tweaks' into 'master' 
Potion tweaks

See merge request veloren/veloren!2976
 2021-10-31 21:12:08 +00:00
Sam
d834a01e35 Addressed review feedback. 2021-10-31 16:39:47 -04:00
Samuel Keiffer
12e2556aa9 Merge branch 'slipped/tweaks' into 'master' 
hats

See merge request veloren/veloren!2966
 2021-10-31 05:35:11 +00:00
jshipsey
508a50ef55 changelog 2021-10-31 01:19:21 -04:00
jshipsey
19449efedd adjust models, last fixes 2021-10-30 23:42:18 -04:00
Justin Shipsey
c6aac9a51e Delete frame-trace_1635388024283.json 2021-10-30 23:42:17 -04:00
jshipsey
c77000b5ff more hats 2021-10-30 23:42:17 -04:00
jshipsey
124cb5d305 good hat rendering 2021-10-30 23:42:16 -04:00
jshipsey
4fd276890e switch to new matcell variant 2021-10-30 23:42:15 -04:00
jshipsey
68df9322db simple hats 2021-10-30 23:42:15 -04:00
jshipsey
7580b7cf9e support for hollow voxels ty zesterer 2021-10-30 23:42:14 -04:00
jshipsey
fee25d7d8f headbands 2021-10-30 23:42:13 -04:00
Justin Shipsey
b2b873bc55 Merge branch 'evelyntsmg/more_gliders' into 'master' 
Add new gliders

See merge request veloren/veloren!2785
 2021-10-30 20:48:04 +00:00
Evelyn
462c16bd29 Add new gliders 2021-10-30 20:48:04 +00:00
Marcel
544fa423ba Merge branch 'juliancoffee/fix_testserver' into 'master' 
Make test-server compile again

See merge request veloren/veloren!2974
 2021-10-30 09:27:27 +00:00
Sam
30f8042760 Merchants now have less potion stock. 2021-10-29 19:58:38 -04:00
Sam
83d8ea869b Being knocked out of item use or sprite interact states forces a poise state. 2021-10-29 19:24:40 -04:00
Samuel Keiffer
00d0544e19 Merge branch 'sam/explosions' into 'master' 
Staff Rebalancing

See merge request veloren/veloren!2970
 2021-10-29 22:20:53 +00:00
Sam
d1408395a4 Addressed review, changelog. 2021-10-29 17:57:00 -04:00
Sam
9095c207d8 All aspects of an attack now scale with the modifier. 2021-10-29 17:37:12 -04:00
Sam
f7db48a5ec Fixed buff applied. 2021-10-29 17:37:10 -04:00
Sam
bddba87c4e Buffed staff firebomb a little. 2021-10-29 17:37:07 -04:00
Sam
48522a14c1 Fixed falloff calculations 2021-10-29 17:37:05 -04:00
Sam
3bfff6cf18 Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
juliancoffee
874a579818 Make test-server compile again 2021-10-29 23:49:37 +03:00
Joshua Barretto
ca0fdd6238 Merge branch 'sam/salvage-ui-fix' into 'master' 
Fix salvage

See merge request veloren/veloren!2972
 2021-10-29 20:22:51 +00:00
Sam
973b408ba1 Hack to make salvage go away when leaving station. 2021-10-29 13:25:38 -04:00
Samuel Keiffer
23054b2e6a Merge branch 'sam/crafting-tweaks' into 'master' 
Better salvaging and other crafting tweaks

See merge request veloren/veloren!2903
 2021-10-27 21:33:21 +00:00
Marcel
ed0009873b Merge branch 'isse/remove-print' into 'master' 
remove print

See merge request veloren/veloren!2969
 2021-10-27 21:33:19 +00:00
Sam
9b07ebe458 Changelog 2021-10-27 17:02:36 -04:00
Snowram
7238c54a95 Uses a list for item tooltips 2021-10-27 17:02:36 -04:00
Sam
3f92f0ea8b Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure. 2021-10-27 17:02:36 -04:00
Sam
e70230819d Fixed opening salvaging station not showing salvage text. 2021-10-27 17:02:35 -04:00
Monty Marz
d089a5d239 text and alignment WIP 2021-10-27 17:02:35 -04:00
Monty Marz
a8718d50c9 crafting station model, explanatory text part 1 2021-10-27 17:02:34 -04:00
Sam
430c34b462 Changed tooltips to take iterator. Tooltips also show original item as well as salvage output. 2021-10-27 17:02:34 -04:00
Snowram
154dec2b4f Make item tooltip accept multiple items for salvage 2021-10-27 17:02:33 -04:00
Sam
67b19f5474 Salvaging now requires a salvaging station. 2021-10-27 17:02:33 -04:00
Sam
b4b6eeb0d1 Added function that returns the output of salvaging an item when result just needs to be checked. 2021-10-27 17:02:32 -04:00
Sam
26dfd961a8 Fixed item path of leather items under hide folder. 2021-10-27 17:02:32 -04:00
Monty Marz
c7b6c7c3b4 bench 2021-10-27 17:02:31 -04:00
Sam
dc24801ca1 Inventory now highlights salvageable items when in salvage mode. 2021-10-27 17:02:31 -04:00
Sam
b924ae9f54 Added comments in areas that were lacking. 2021-10-27 17:02:31 -04:00
Sam
404ff2918e Simple recipes now take a vec of slots to look in for the ingredients. 2021-10-27 17:02:30 -04:00
Sam
899f4db654 Salvage works by double clicking from inventory while salvage tab in crafting is open. 2021-10-27 17:02:30 -04:00
Sam
cb5630b69c Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
Sam
db0c636e16 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00