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
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
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
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
Imbris
aa1ffa9f61
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
b0bd8cdb45
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
252b5af96f
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
457ed6ac64
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
43e743c2bc
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
d515b42eac
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
d0cc636402
Add more profiling outputs to the .gitignore
2021-10-15 01:23:00 -04:00
Joshua Barretto
df64cc9494
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
e01ce2dcf4
Kaedr/pretty printing error messages
2021-10-14 18:37:51 +00:00
Samuel Keiffer
67616d2db0
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
42bb4bee15
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
4b3b2f2079
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
1e3b0dcd16
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 10:02:28 -04:00
Marcel
430ee87620
Merge branch 'Limofeus/russian_translation_updates' into 'master'
...
Limofeus/russian translation updates
See merge request veloren/veloren!2920
2021-10-12 17:15:49 +00:00
Limofeus
df1aab877b
Upd #2 - removed mixed up tabs and spaces
2021-10-12 19:18:11 +03:00
Joshua Barretto
afc14bb220
Merge branch 'devrique/catalan-language-corrections' into 'master'
...
i18n: Revised catalan (Catalonia) translation
See merge request veloren/veloren!2918
2021-10-12 14:23:17 +00:00
GLawrence29
e1ea1193c2
i18n: Revised catalan (Catalonia) translation
2021-10-12 15:16:25 +02:00
Limofeus
a2d0911355
Upd #1 - Skills, Settings labels, Tools and Credits translations added
2021-10-12 16:09:55 +03:00
Joshua Barretto
4bae3a4b62
Merge branch 'make-merchants-send-trade-on-iteraction' into 'master'
...
Make merchants send the player a trade request when interacted with
Closes #1368
See merge request veloren/veloren!2914
2021-10-11 16:45:18 +00:00
