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,140 Commits 151 Branches 18 Tags 2.1 GiB
2ea0490a2b
Commit Graph

10140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Q-I-U
1b305dd617 Prevent lantern from turning off on death 2021-10-24 20:45:57 +02:00
antoniomuso
5622e2a5f5 formatted some tooltips floats 2021-10-24 10:14:54 +02:00
Samuel Keiffer
0e7bc21b6d Merge branch 'ubruntu/use-stealth-stat' into 'master' 
Use stealth stat on armors

See merge request veloren/veloren!2947
 2021-10-24 05:31:49 +00:00
ubruntu
a41fc4cba7 Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Samuel Keiffer
378ff033d5 Merge branch 'maxing_t4&t5_enemy_level' into 'master' 
Giving T5 cultists maxed skillset

See merge request veloren/veloren!2949
 2021-10-23 20:48:07 +00:00
Youssef Fahmy
5661b82de0 Giving T5 cultists maxed skillset 2021-10-23 20:48:07 +00:00
Samuel Keiffer
3a92ab8901 Merge branch 'doctorkompot/new_necklaces' into 'master' 
DoctorKompot - New Necklaces

See merge request veloren/veloren!2940
 2021-10-22 05:24:20 +00:00
Doctor Kompot
e916e32547 DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00: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
Marcel
3307c1da2f Merge branch 'update_pt_BR_20211019' into 'master' 
update pt_br 20211019

See merge request veloren/veloren!2942
 2021-10-18 19:05:48 +00:00
Nicolas Wildner
04c4347dcf update pt_br 20211019 2021-10-18 14:19:52 -03:00
Justin Shipsey
963f69758a Merge branch 'Tiny_changes' into 'master' 
Tiny useless changes

See merge request veloren/veloren!2941
 2021-10-18 14:33:31 +00:00
Youssef Fahmy
be4de64100 Tiny useless changes 2021-10-18 14:33:31 +00: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
Samuel Keiffer
b7da21f38d Merge branch 'minotaur_dash_balance' into 'master' 
Mino dash slight adjustment

See merge request veloren/veloren!2939
 2021-10-17 13:40:09 +00:00
UncomfySilence
ac1d91e69e + Adjusted Mino charge to have a higher bleed chance and slightly lower recovery rate. 2021-10-17 15:07:45 +02:00
Joshua Barretto
7adbc2f7b5 Merge branch 'socksonme/refactor_villageralarm' into 'master' 
Socksonme/refactor villageralarm

See merge request veloren/veloren!2931
 2021-10-17 12:47:19 +00:00
MohammadHasanKargar
a8836329bb Add hover effect to auto search in crafting menu 2021-10-17 15:27:27 +03:30
Joshua Barretto
ce21f0e94f Merge branch 'zesterer/tiny-fixes' into 'master' 
Fixed lantern lighting bug

See merge request veloren/veloren!2938
 2021-10-17 08:39:35 +00:00
Joshua Barretto
62731a767d Fixed lantern lighting bug 2021-10-17 09:07:27 +01:00
Samuel Keiffer
e04308730a Merge branch 'sam/minotaur-balance' into 'master' 
Minotaur balance

See merge request veloren/veloren!2937
 2021-10-17 01:57:37 +00:00
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
Sam
47031f5b16 "Balance" 2021-10-16 17:36:06 -04:00
Joshua Barretto
57b08b672a Merge branch 'zesterer-master-patch-32092' into 'master' 
Added FUNDING.yml

See merge request veloren/veloren!2936
 2021-10-16 17:13:26 +00:00
Joshua Barretto
8a3ed6261a Added FUNDING.yml 2021-10-16 16:47:26 +00:00
Joshua Barretto
8a5cb4ac83 Merge branch 'zesterer/tiny-fixes' into 'master' 
Tiny fixes

See merge request veloren/veloren!2926
 2021-10-16 16:25:59 +00:00
socksonme
c8576d35d4 Renamed emit_alarm to emit_scream 2021-10-16 19:11:57 +03:00
Joshua Barretto
1855d2dc27 Merge branch 'kalikatz/add_tools_to_sfx' into 'master' 
add pointers to sceptre and pickaxe pickup sounds

See merge request veloren/veloren!2934
 2021-10-16 16:04:20 +00:00
Joshua Barretto
3df0010ad7 Better ambiance slider 2021-10-16 15:12:07 +01:00