Commit Graph

10122 Commits

Author SHA1 Message Date
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
Joshua Barretto
6dac045d2f Aurora light tint 2021-10-16 14:32:18 +01:00
Joshua Barretto
11e1fdf798 Better moonlight, added aurora light 2021-10-16 14:31:46 +01:00
Joshua Barretto
14249b5e65 Better aurora 2021-10-16 14:31:46 +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
Samuel Keiffer
d58038efc6 Merge branch 'sam/remove-angle-between' into 'master'
Removed angle between with dot product in handle_orientation.

See merge request veloren/veloren!2933
2021-10-16 04:42:29 +00:00
Sam
72dc5960d6 Correctly took dot product, switched to square root of dot product 2021-10-15 22:41:53 -04:00
Kali
d862959d2d add pointers to sceptre and pickaxe pickup sounds 2021-10-15 15:40:18 -07:00
Joshua Barretto
653769651f Corrected historical typo 2021-10-15 22:47:43 +01:00
Sam
c7381d13cd Removed angle between with dot product in handle_orientation. 2021-10-15 17:26:10 -04:00
MohammadHasanKargar
02da0b3928 Add auto searching in crafting menu 2021-10-15 23:57:04 +03:30
socksonme
ea11cb388e small code quality change 2021-10-15 23:23:45 +03:00
socksonme
092720346e Refactored SoundKind and UtteranceKind 2021-10-15 22:49:25 +03:00
Joshua Yanovski
5674449a37 Merge branch 'imbris/opt-character-behavior' into 'master'
NaNs!!!

See merge request veloren/veloren!2930
2021-10-15 17:46:23 +00:00
Imbris
fc97e72bf4 Fix NaNs 2021-10-15 13:17:13 -04:00
Imbris
5c1a36ad92 Merge branch 'imbris/opt-character-behavior' into 'master'
Add test for Ori::angle_between

See merge request veloren/veloren!2927
2021-10-15 16:51:37 +00:00
Samuel Keiffer
190a380f5f Merge branch 'MHK/Tiny_fixe_in_settlement_generation' into 'master'
Deleting extra grasses on the air

See merge request veloren/veloren!2928
2021-10-15 16:40:26 +00:00
Imbris
4183fb2551 Add test for Ori::angle_between 2021-10-15 12:02:53 -04:00