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,295 Commits 151 Branches 18 Tags 2.1 GiB
8d86f62f2e
Commit Graph

10295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DemonicOnPc
a74af55c46 Gemu's Revamped vox models added. 2021-10-26 05:28:05 -04:00
IsseW
50d37bc2d4 run clippy 2021-10-26 01:30:27 +02:00
IsseW
411acc73ff Edited all languages to fit new change 2021-10-26 01:27:03 +02:00
IsseW
3368f43a22 consider key layout 2021-10-26 00:42:30 +02:00
IsseW
6a85e231b4 Added part of tip 2021-10-26 00:15:09 +02:00
IsseW
047cda179f Added keybinding shortcut in loading tips 2021-10-25 23:53:27 +02:00
DemonicOnPc
8f26c451ae Added shrub density within specific regions 2021-10-25 16:20:49 -04:00
Joshua Barretto
8e8d1a6624 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
6362c0df32 Fixed non-character point lights 2021-10-25 12:00:02 +00:00
Justin Shipsey
8edd375efa 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
1e9f7f2f9d 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
b0b90744cf Add a range limit to trading 
Prevents initiating trades with client-side ghosts.
 2021-10-25 00:47:45 +00:00
Kemper
b85f535f3c 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
434913b946 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
15185ef55e 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
b96c6c94ab Adjust sand shark hitbox 2021-10-24 21:04:46 +00:00
Snowram
eeafa0e7fa 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
09028f3261 Add !health.is_dead() check to renderer 2021-10-24 22:28:23 +02:00
Q-I-U
64209967aa Prevent lantern from turning off on death 2021-10-24 20:45:57 +02:00
DemonicOnPc
b1476071b1 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
cf8d995af7 formatted some tooltips floats 2021-10-24 10:14:54 +02:00
Samuel Keiffer
5c99ca2a52 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
e6bfce99bb Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Samuel Keiffer
f5237e76ad 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
ec62ff3489 Giving T5 cultists maxed skillset 2021-10-23 20:48:07 +00:00
Samuel Keiffer
cd2f7ad83a 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
51f8aa06df DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00:00
socksonme
052e09039a Made the pushback cache require colliders 2021-10-19 15:05:30 +03:00
Samuel Keiffer
f92c6fbd49 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
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Marcel
f516ea6cce 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
515f16d84e update pt_br 20211019 2021-10-18 14:19:52 -03:00
Justin Shipsey
ee2c805cde 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
dd1d067fde Tiny useless changes 2021-10-18 14:33:31 +00:00
Samuel Keiffer
1e61a279cc 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
e6a4e53ef3 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
a1ce6520bf 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
ad0a6c7d1f + Adjusted Mino charge to have a higher bleed chance and slightly lower recovery rate. 2021-10-17 15:07:45 +02:00
Joshua Barretto
c397bfa69f 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
40073413ae Add hover effect to auto search in crafting menu 2021-10-17 15:27:27 +03:30
Joshua Barretto
1964adeeed 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
87293fb9df Fixed lantern lighting bug 2021-10-17 09:07:27 +01:00
Samuel Keiffer
0a6c393e4c Merge branch 'sam/minotaur-balance' into 'master' 
Minotaur balance

See merge request veloren/veloren!2937
 2021-10-17 01:57:37 +00:00
kaedr
cd5aa2d1d8 Fixed redundant to_string() call. 2021-10-16 20:41:13 -04:00
kaedr
c8a1d821e7 Added handling for connection errors that occur before client leaves login screen 2021-10-16 20:17:40 -04:00
kaedr
cc98ccc371 Added localization for server error message display on client 2021-10-16 20:17:38 -04:00
kaedr
eb02a4733d Fixed obfuscation of error messages caused by previous commits 2021-10-16 20:17:37 -04:00
Sam
6e82d67db5 "Balance" 2021-10-16 17:36:06 -04:00
Joshua Barretto
f6176df9a1 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
e325a4774e Added FUNDING.yml 2021-10-16 16:47:26 +00:00