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
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
3d81411652
Deleting extra grasses on the air
2021-10-15 19:09:36 +03:30
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
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
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
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
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
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
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
253a18dbfe
Add more profiling outputs to the .gitignore
2021-10-15 01:23:00 -04:00
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
54411e5a7f
Kaedr/pretty printing error messages
2021-10-14 18:37:51 +00:00
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
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
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
6df744b0ff
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 10:02:28 -04:00
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
05431ef391
Upd #2 - removed mixed up tabs and spaces
2021-10-12 19:18:11 +03:00
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
49c6156028
i18n: Revised catalan (Catalonia) translation
2021-10-12 15:16:25 +02:00
38f40ac7bc
Upd #1 - Skills, Settings labels, Tools and Credits translations added
2021-10-12 16:09:55 +03:00
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
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
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
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
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
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
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
17fefc8fd3
use "input:____" for searching by recipe input
2021-10-10 15:44:43 +00:00
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
88216c8e9a
Fixes #1350 - Allow players to cap the game FPS when unfocused
2021-10-10 15:33:31 +00:00
f96a8a11ab
Remove dead commented code, updated changelog, commented profiling spans
...
(but left in for easy reuse later), fix clippy complaint
2021-10-10 03:09:03 -04:00
8837dc81d5
Rearrange iteration pattern so that x is in the inner loop in the default for_each_in (no or little perf change)
2021-10-10 02:42:07 -04:00
34beb11557
Switch to for loops in default for_each_in (small perf increase), add inline to sprite methods (no perf change)
2021-10-10 02:42:07 -04:00
6fb2e66dc1
Remove custom for_each_in from Chonk
2021-10-10 02:42:07 -04:00
fb68bb3870
Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation
2021-10-10 02:42:07 -04:00
3e84bb0669
Try marking VolGrid2d::for_each_in and friends as inlineable
2021-10-10 02:42:07 -04:00
81d426f7a0
Try marking Chonk::for_each_in and related functions as inlineable
2021-10-10 02:42:07 -04:00
685bcb5c62
simplify water/walls check code, interally iterate in chonks (but not
...
chunks)
2021-10-10 02:42:06 -04:00
77a1fc26bd
Refactor some of the terrain collision code, failed pre-emptive liquid check experiment
2021-10-10 02:42:06 -04:00
3f3eb637c4
Do iteration check for snapping after checking the other conditions
2021-10-10 02:42:06 -04:00
bfece25bba
Convert water/walls check to the new iteration function
2021-10-10 02:42:06 -04:00
c22636a4b8
Initial iterator optimization by using internal iteration at the vol_grid level, water/walls not switched over yet
2021-10-10 02:42:06 -04:00
ab92c4d52f
Make merchants send the player a trade request when interacted with
2021-10-09 21:14:01 +02:00
af18c2590d
Merge branch 'ubruntu/group-loot-notifications' into 'master'
...
Groups can see what each member picks up
See merge request veloren/veloren!2906
2021-10-09 10:50:02 +00:00
ba9923c049
Groups can see what each member picks up
2021-10-09 10:50:01 +00:00
2bdb052360
Merge branch 'imbris/dedup-chunk-gen-attempt' into 'master'
...
More robustly avoid duplicate chunk generation
See merge request veloren/veloren!2912
2021-10-08 22:00:50 +00:00
343a64e1b6
Merge branch 'devrique/add-catalan-catalonia' into 'master'
...
Add catalan (Catalonia) language translation
See merge request veloren/veloren!2894
2021-10-08 20:42:46 +00:00
dc1495afa8
Merge branch 'CapsizeGlimmer/centering-cursor-error-spam' into 'master'
...
Prevent "Error setting/centering cursor position" message spam
See merge request veloren/veloren!2902
2021-10-08 20:29:25 +00:00
