Commit Graph

10495 Commits

Author SHA1 Message Date
Sam
696da74c94 Fixed falloff calculations 2021-10-29 17:37:05 -04:00
Sam
2b447852fd Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
juliancoffee
1dc53dad3a Make test-server compile again 2021-10-29 23:49:37 +03:00
Joshua Barretto
098c10eb39 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
15a8c31383 Hack to make salvage go away when leaving station. 2021-10-29 13:25:38 -04:00
tijnvdheuvel
05f943f09b You guessed it, yet another missed comma -,- Update sfx.ron 2021-10-29 14:57:36 +00:00
tijnvdheuvel
80438fa582 Fixed another missing comma sfx.ron 2021-10-29 14:28:59 +00:00
tijnvdheuvel
a36106eb22 Update mod.rs missed a comma 2021-10-29 13:09:21 +00:00
socksonme
2ef668a16c removed unnecessary self 2021-10-29 15:23:49 +03:00
socksonme
42ed5c43f5 fixed code quality 2021-10-29 15:01:21 +03:00
socksonme
584e379e40 Removed beams and shockwaves from phys.rs
calc_z_limit doesn't use an Opyion anymore, construct_spacial_grid also doesn't check for beams or shockwaves, collider_other in apply_pushback is also required now and resolve_e2e_pushback also doesn't use Options anymore.
2021-10-29 09:43:01 +03:00
tijnvdheuvel
3dbd553997 Fixed bug truffler quadruped small 2021-10-28 17:37:29 +00:00
tijnvdheuvel
d4df012835 Added mod.rs entries for truffler and Fungome 2021-10-28 13:48:22 +00:00
tijnvdheuvel
377afc410d Update sfx.ron 2021-10-28 13:34:46 +00:00
Samuel Keiffer
fef9fd5893 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
a602d4e373 Merge branch 'isse/remove-print' into 'master'
remove print

See merge request veloren/veloren!2969
2021-10-27 21:33:19 +00:00
Sam
ee2a7d625c Changelog 2021-10-27 17:02:36 -04:00
Snowram
02930dd2ed Uses a list for item tooltips 2021-10-27 17:02:36 -04:00
Sam
fbd742abdb 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
4b9e9c506b Fixed opening salvaging station not showing salvage text. 2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Monty Marz
a97cc95496 crafting station model, explanatory text part 1 2021-10-27 17:02:34 -04:00
Sam
5707377565 Changed tooltips to take iterator. Tooltips also show original item as well as salvage output. 2021-10-27 17:02:34 -04:00
Snowram
2bf16aab63 Make item tooltip accept multiple items for salvage 2021-10-27 17:02:33 -04:00
Sam
e28ca15059 Salvaging now requires a salvaging station. 2021-10-27 17:02:33 -04:00
Sam
6ff7317e05 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
9fc3a9bf01 Fixed item path of leather items under hide folder. 2021-10-27 17:02:32 -04:00
Monty Marz
7aae35f286 bench 2021-10-27 17:02:31 -04:00
Sam
5c3021bd0a Inventory now highlights salvageable items when in salvage mode. 2021-10-27 17:02:31 -04:00
Sam
356057afc4 Added comments in areas that were lacking. 2021-10-27 17:02:31 -04:00
Sam
794b072d3e Simple recipes now take a vec of slots to look in for the ingredients. 2021-10-27 17:02:30 -04:00
Sam
7a17863988 Salvage works by double clicking from inventory while salvage tab in crafting is open. 2021-10-27 17:02:30 -04:00
Sam
111abbc3bc Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
IsseW
2e27f7f84a remove print 2021-10-27 23:01:41 +02:00
Joshua Barretto
05c2bb5e35 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
30604788b9 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
034041fd4f 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
bd93e72f79 Merge branch 'sam/skill-nerfs' into 'master'
Skill nerfs

See merge request veloren/veloren!2964
2021-10-27 04:53:29 +00:00
Sam
c68618f20b Changelog 2021-10-26 22:49:21 -04:00
Sam
cac3f00250 Lengendary crit changes. 2021-10-26 20:55:32 -04:00
Samuel Keiffer
6a2a31e3dc 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
ff56804d8a Show energy reward and speed as percentages in item tooltips 2021-10-26 23:07:37 +00:00
Sam
4d4b7e846a Haha, nerfs go brr 2021-10-26 18:44:45 -04:00
tijnvdheuvel
6721375d75 Changed name of fungome SFX 2021-10-26 22:01:27 +00:00
tijnvdheuvel
016fce2c3c Update sfx.ron 2021-10-26 21:58:20 +00:00
tijnvdheuvel
f1850141b9 Added truffler calm SFX (a growl) 2021-10-26 17:42:23 +00:00
tijnvdheuvel
aadeb87005 Added truffler calm SFX 2021-10-26 17:41:37 +00:00
tijnvdheuvel
70d3f9fdc4 Added a fungomel calm utterance. 2021-10-26 17:32:41 +00:00
Joshua Barretto
37056e75f9 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