Commit Graph

10206 Commits

Author SHA1 Message Date
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
Joshua Yanovski
25530fb85c 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
3d81411652 Deleting extra grasses on the air 2021-10-15 19:09:36 +03:30
Imbris
1ad6b5adb4 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
Imbris
4ea6842932 Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans 2021-10-15 01:38:56 -04:00
Imbris
0b115af398 Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion 2021-10-15 01:23:00 -04:00
Imbris
54ed63e359 Add alias for running the server with tracy with the releasedebuginfo profile, this is potentially useful for some of Tracy's source view features 2021-10-15 01:23:00 -04:00
Imbris
7b35f14043 Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new) 2021-10-15 01:23:00 -04:00
Imbris
33af9a8bbd Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between 2021-10-15 01:23:00 -04:00
Imbris
4330a8c24b Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir 2021-10-15 01:23:00 -04:00
Imbris
253a18dbfe Add more profiling outputs to the .gitignore 2021-10-15 01:23:00 -04:00
Joshua Barretto
9b9076ac4f Merge branch 'kaedr/pretty_printing_error_messages' into 'master'
Kaedr/pretty printing error messages

See merge request veloren/veloren!2923
2021-10-14 18:37:52 +00:00
Henry Corse
54411e5a7f Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Samuel Keiffer
c94dec5275 Merge branch 'sam/cultist-shift' into 'master'
Squashed tiers a little

See merge request veloren/veloren!2922
2021-10-13 17:47:24 +00:00
Sam
da375b3fdf Minotaur and cultist dungeons now offer roughly equiovalent loot.
Minotaur now drops tier 5 weapons and armor instead of tier 4
Mindflayer now drops cultist weapons and armor instead of tier 5
Melee legendaries moved to minotaur
Mindflayer now lonly drops ranged legendaries
2021-10-13 12:24:10 -04:00
Samuel Keiffer
1c3eaa6e50 Merge branch 'sam/small-fix' into 'master'
Small block fix

See merge request veloren/veloren!2921
2021-10-13 14:30:12 +00:00
Sam
6df744b0ff Fix block energy cost being multiplied by 10 and also slightly reduce it. 2021-10-13 10:02:28 -04:00