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

3914 Commits

Author SHA1 Message Date
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
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
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
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
7d991077e4 Show energy reward and speed as percentages in item tooltips 2021-10-26 23:07:37 +00: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
IsseW
2ea0490a2b run clippy 2021-10-26 01:30:27 +02:00
IsseW
296a1d754e consider key layout 2021-10-26 00:42:30 +02:00
IsseW
b7c6b2111b Added keybinding shortcut in loading tips 2021-10-25 23:53:27 +02:00
Joshua Barretto
c09c3a231a Fixed non-character point lights 2021-10-25 12:00:02 +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
Q-I-U
fe76156432 Add !health.is_dead() check to renderer 2021-10-24 22:28:23 +02:00
DemonicOnPc
86bf9d43cb Added new Spots, Shrubs and Ships. 
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.

Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs

Galleon ship added
 2021-10-24 08:10:44 -04:00
antoniomuso
5622e2a5f5 formatted some tooltips floats 2021-10-24 10:14:54 +02:00
Samuel Keiffer
4de3013878 Merge branch 'ubruntu/sneakwield-state' into 'master' 
Sneak with weapons drawn

See merge request veloren/veloren!2917
 2021-10-18 20:27:02 +00:00
Bryant Deters
3f48604db5 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Samuel Keiffer
ff8a32a87c Merge branch 'kaedr/pretty_printing_error_messages' into 'master' 
Fixed obfuscation of error messages caused by previous MR (pretty printing error messages)

See merge request veloren/veloren!2935
 2021-10-18 03:35:03 +00:00
Samuel Keiffer
56e1af0a13 Merge branch 'MHK/auto_search_in_crafting_menu' into 'master' 
Add auto searching in crafting menu

See merge request veloren/veloren!2932
 2021-10-17 15:16:21 +00:00
MohammadHasanKargar
a8836329bb Add hover effect to auto search in crafting menu 2021-10-17 15:27:27 +03:30
kaedr
9e7cb219b8 Fixed redundant to_string() call. 2021-10-16 20:41:13 -04:00
kaedr
c21a67a140 Added handling for connection errors that occur before client leaves login screen 2021-10-16 20:17:40 -04:00
kaedr
84eb999143 Added localization for server error message display on client 2021-10-16 20:17:38 -04:00
kaedr
8b9e32b93f Fixed obfuscation of error messages caused by previous commits 2021-10-16 20:17:37 -04:00
Joshua Barretto
3df0010ad7 Better ambiance slider 2021-10-16 15:12:07 +01:00
Joshua Barretto
6dac045d2f Aurora light tint 2021-10-16 14:32:18 +01:00
Joshua Barretto
6ef4825b2d Fixed 'Empty' collectable sprite 2021-10-16 14:31:46 +01:00
Joshua Barretto
2da9f7994f Merge branch 'zesterer/small-fixes' into 'master' 
Caverns

See merge request veloren/veloren!2763
 2021-10-16 09:33:57 +00:00
MohammadHasanKargar
02da0b3928 Add auto searching in crafting menu 2021-10-15 23:57:04 +03:30
Henry Corse
54411e5a7f Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Marcel
06615c4fda Merge branch 'isse/crafted-from-item' into 'master' 
use "input:____" for searching by recipe input

See merge request veloren/veloren!2893
 2021-10-10 15:44:44 +00:00
Isidor Nielsen
17fefc8fd3 use "input:____" for searching by recipe input 2021-10-10 15:44:43 +00:00
Marcel
be557a7dfc Merge branch 'jtriantafylos/background_fps' into 'master' 
Fixes #1350 - Allow players to cap the game FPS when unfocused

Closes #1350

See merge request veloren/veloren!2890
 2021-10-10 15:33:38 +00:00
James Triantafylos
88216c8e9a Fixes #1350 - Allow players to cap the game FPS when unfocused 2021-10-10 15:33:31 +00:00
Monty Marz
265db2ba7f cavern sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
b12494d72b More cavern details 2021-10-10 13:41:56 +01:00
Joshua Barretto
7453368595 Performance improvements for terrain watcher 2021-10-10 13:41:56 +01:00
Joshua Barretto
6e76fddc44 Added caverns, fixed chunk load performance issue 2021-10-10 13:41:56 +01:00
CapsizeGlimmer
b0eb684d31 Prevent "Error setting/centering cursor position" message spam 2021-10-06 21:25:14 +00:00
Imbris
58c690f1d2 Remove map drag from the settings file since it is always reset when closing the map leaving little reason to persist it 2021-10-06 02:13:02 -04:00
Imbris
2983ab60ed Make map icons fade out quickly when near the edge of the map display 2021-10-06 01:37:11 -04:00
Treeco
fa2486b3d6 Various map UI fixes for large worlds 
changes `zoom` such that 1.0 means 1 Conrod unit = 1 chunk, rather than 1.0 meaning fully zoomed out
 2021-10-06 02:26:58 +01:00
Marcel
9579acc3ae Merge branch 'imbris/fix-reset-scissor' into 'master' 
Make sure ui draw commands are cleared if the renderer's resolution changes

Closes #1362

See merge request veloren/veloren!2898
 2021-10-05 06:11:01 +00:00
ubruntu
e80079ed99 Interactable campfires 2021-10-05 00:55:29 +00:00
Joshua Barretto
59c8ee3c70 Added sail boat 2021-10-05 00:02:03 +01:00
Imbris
25ec696ad1 Make sure ui draw commands are cleared if the renderer's resolution changes 2021-10-04 18:58:28 -04:00