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,175 Commits 151 Branches 18 Tags 2.1 GiB
973b408ba1
Commit Graph

10175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
IsseW
b7ec72f4c8 remove print 2021-10-27 23:01:41 +02:00
Joshua Barretto
7f3506bde0 Merge branch 'kemper/aim-fireballs-at-feet' into 'master' 
Aim fireballs at target’s feet

See merge request veloren/veloren!2968
 2021-10-27 20:25:57 +00:00
Joshua Barretto
577d6f1f1e Merge branch 'isse/loading-tip-fixes' into 'master' 
Loading screen tip fixes

See merge request veloren/veloren!2961
 2021-10-27 20:08:46 +00:00
Kemper
2a1f0f2674 Aim fireballs at feet 
AI aims fireballs at the target’s feet, for a slight improvement
in splash damage.
 2021-10-27 19:50:50 +00:00
Samuel Keiffer
74706cabad Merge branch 'sam/skill-nerfs' into 'master' 
Skill nerfs

See merge request veloren/veloren!2964
 2021-10-27 04:53:29 +00:00
Sam
e2be47cda6 Changelog 2021-10-26 22:49:21 -04:00
Sam
7989b66922 Lengendary crit changes. 2021-10-26 20:55:32 -04:00
Samuel Keiffer
bee1f75748 Merge branch 'kemper/energy-reward-percentage' into 'master' 
Show energy reward and speed as percentages in item tooltips

See merge request veloren/veloren!2946
 2021-10-26 23:55:34 +00:00
Kemper
7d991077e4 Show energy reward and speed as percentages in item tooltips 2021-10-26 23:07:37 +00:00
Sam
0261e8b5cf Haha, nerfs go brr 2021-10-26 18:44:45 -04:00
Joshua Barretto
687b24d28d Merge branch 'demonic/shrubs' into 'master' 
Added new Spots, Shrubs and Ships.

See merge request veloren/veloren!2953
 2021-10-26 10:06:14 +00:00
DemonicOnPc
54c5a45004 Gemu's Revamped vox models added. 2021-10-26 05:28:05 -04:00
IsseW
2ea0490a2b run clippy 2021-10-26 01:30:27 +02:00
IsseW
81b7caa8bb Edited all languages to fit new change 2021-10-26 01:27:03 +02:00
IsseW
296a1d754e consider key layout 2021-10-26 00:42:30 +02:00
IsseW
c9812448e6 Added part of tip 2021-10-26 00:15:09 +02:00
IsseW
b7c6b2111b Added keybinding shortcut in loading tips 2021-10-25 23:53:27 +02:00
DemonicOnPc
fdc61caf8f Added shrub density within specific regions 2021-10-25 16:20:49 -04:00
Joshua Barretto
3ff8cda84a Merge branch 'zesterer-master-patch-82733' into 'master' 
Fixed non-character point lights

See merge request veloren/veloren!2959
 2021-10-25 13:44:24 +00:00
Joshua Barretto
c09c3a231a Fixed non-character point lights 2021-10-25 12:00:02 +00:00
Justin Shipsey
769c2e901c Merge branch 'kemper/orichalcum-cape-cloth' into 'master' 
Moonweave ingredient to craft orichalcum cape

See merge request veloren/veloren!2957
 2021-10-25 05:57:43 +00:00
Justin Shipsey
fe0e0d45af Merge branch 'kemper/trade-range-limit' into 'master' 
Add a range limit to trading

See merge request veloren/veloren!2958
 2021-10-25 05:57:40 +00:00
Kemper
c0f9b19928 Add a range limit to trading 
Prevents initiating trades with client-side ghosts.
 2021-10-25 00:47:45 +00:00
Kemper
1f29597cb9 Add moonweave to the orichalcum cape recipe 
So that the ingredients include some cloth since it’s a cape.
 2021-10-24 23:43:24 +00:00
Justin Shipsey
80908f969a Merge branch 'kemper/sand-shark-hitbox' into 'master' 
Better sand shark hitbox

See merge request veloren/veloren!2956
 2021-10-24 22:03:08 +00:00
Forest Anderson
d5eb5b475f Merge branch 'master' into 'master' 
Fixes #819 - Prevent lantern from turning off on death

Closes #819

See merge request veloren/veloren!2955
 2021-10-24 21:16:34 +00:00
Kemper
beb2cad73a Adjust sand shark hitbox 2021-10-24 21:04:46 +00:00
Snowram
209485aa97 Merge branch 'tooltips-formated-floats' into 'master' 
formatted some tooltips floats

Closes #1377

See merge request veloren/veloren!2952
 2021-10-24 21:01:21 +00:00
Q-I-U
fe76156432 Add !health.is_dead() check to renderer 2021-10-24 22:28:23 +02:00