Commit Graph

10091 Commits

Author SHA1 Message Date
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
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
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
Marcel
1e7436954e 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
05431ef391 Upd #2 - removed mixed up tabs and spaces 2021-10-12 19:18:11 +03:00
Joshua Barretto
3ba38f86ab 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
49c6156028 i18n: Revised catalan (Catalonia) translation 2021-10-12 15:16:25 +02:00
Limofeus
38f40ac7bc Upd #1 - Skills, Settings labels, Tools and Credits translations added 2021-10-12 16:09:55 +03:00
Joshua Barretto
99a83aba2b 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
Imbris
2b5bc54b6a Merge branch 'imbris/opt-phys-2.0' into 'master'
Make terrain physics faster with internal iteration

See merge request veloren/veloren!2915
2021-10-11 14:52:46 +00:00
Joshua Barretto
d83ffac369 Merge branch 'juliancoffee/fix_rtsim_names' into 'master'
Fix Traveller names

See merge request veloren/veloren!2916
2021-10-11 12:33:33 +00:00
juliancoffee
a4f882a8d6 Fix Traveller names
- Previously RtSim were created with automatic name for body generated
  from EntityConfig, not from RtSim body. Now RtSim body is set for
  EntityConfig.
2021-10-11 15:06:43 +03:00
Samuel Keiffer
68e7d37ffd Merge branch 'sam/wiki-all-entities' into 'master'
Csv export entity drops tool now has ability to export all entities at once.

See merge request veloren/veloren!2910
2021-10-10 16:56:46 +00:00
Sam
8791f994dc Now stores a column for entity path to more easily allow searching for what drops a particular item in the future
Fixed excel perceiving certain csv entries as a date
2021-10-10 12:37:16 -04:00
Marcel
06615c4fda Merge branch 'isse/crafted-from-item' into 'master'
use "input:____" for searching by recipe input

See merge request veloren/veloren!2893
2021-10-10 15:44:44 +00:00
Isidor Nielsen
17fefc8fd3 use "input:____" for searching by recipe input 2021-10-10 15:44:43 +00:00
Marcel
be557a7dfc Merge branch 'jtriantafylos/background_fps' into 'master'
Fixes #1350 - Allow players to cap the game FPS when unfocused

Closes #1350

See merge request veloren/veloren!2890
2021-10-10 15:33:38 +00:00
James Triantafylos
88216c8e9a Fixes #1350 - Allow players to cap the game FPS when unfocused 2021-10-10 15:33:31 +00:00