Commit Graph

10520 Commits

Author SHA1 Message Date
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
Joshua Barretto
94b0288180 Merge branch 'zesterer/tiny-fixes' into 'master'
Tiny fixes

See merge request veloren/veloren!2926
2021-10-16 16:25:59 +00:00
socksonme
8099b516a9 Renamed emit_alarm to emit_scream 2021-10-16 19:11:57 +03:00
Joshua Barretto
2b74071cdb 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
ef33b2e3ab Better ambiance slider 2021-10-16 15:12:07 +01:00
Joshua Barretto
3322eeb365 Aurora light tint 2021-10-16 14:32:18 +01:00
Joshua Barretto
c4efb5fc68 Better moonlight, added aurora light 2021-10-16 14:31:46 +01:00
Joshua Barretto
53185639a0 Better aurora 2021-10-16 14:31:46 +01:00
Joshua Barretto
b1a1cdde34 Fixed 'Empty' collectable sprite 2021-10-16 14:31:46 +01:00
Joshua Barretto
3357008601 Merge branch 'zesterer/small-fixes' into 'master'
Caverns

See merge request veloren/veloren!2763
2021-10-16 09:33:57 +00:00
Samuel Keiffer
2c9736268d 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
c5c70f6945 Correctly took dot product, switched to square root of dot product 2021-10-15 22:41:53 -04:00
Kali
8446fb9383 add pointers to sceptre and pickaxe pickup sounds 2021-10-15 15:40:18 -07:00
Joshua Barretto
f9b661fc61 Corrected historical typo 2021-10-15 22:47:43 +01:00
Sam
7b2ade34c4 Removed angle between with dot product in handle_orientation. 2021-10-15 17:26:10 -04:00
MohammadHasanKargar
1d7ba57de7 Add auto searching in crafting menu 2021-10-15 23:57:04 +03:30
socksonme
2b36a957ac small code quality change 2021-10-15 23:23:45 +03:00
socksonme
c631341da9 Refactored SoundKind and UtteranceKind 2021-10-15 22:49:25 +03:00
Joshua Yanovski
045621993a Merge branch 'imbris/opt-character-behavior' into 'master'
NaNs!!!

See merge request veloren/veloren!2930
2021-10-15 17:46:23 +00:00
Imbris
f61d742d29 Fix NaNs 2021-10-15 13:17:13 -04:00
Imbris
76ad9f8f88 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
f2d921c6b8 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
e67c688c11 Add test for Ori::angle_between 2021-10-15 12:02:53 -04:00
Joshua Yanovski
a8fada63bc Merge branch 'imbris/opt-character-behavior' into 'master'
Optimize parts of the character behavior system

See merge request veloren/veloren!2924
2021-10-15 15:55:04 +00:00
MohammadHasanKargar
c82b3859e0 Deleting extra grasses on the air 2021-10-15 19:09:36 +03:30
Imbris
c412a96d6a Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well) 2021-10-15 03:20:40 -04:00