Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Entity Base: Add remote triggerable #1436

Merged
merged 5 commits into from
Mar 4, 2024
Merged

Entity Base: Add remote triggerable #1436

merged 5 commits into from
Mar 4, 2024

Conversation

ZenBre4ker
Copy link
Contributor

This PR aims to gather the focussed markers and enables a clientside remote trigger to placeable entities.

Shall further enable the removal of radio tabs in shop.
Hopefully can be used for a radar as well, if we make it placeable for example.

@ZenBre4ker ZenBre4ker requested a review from TimGoll February 25, 2024 13:59
@ZenBre4ker ZenBre4ker self-assigned this Feb 25, 2024
@ZenBre4ker ZenBre4ker added the type/feature New functionality label Feb 25, 2024
@TimGoll
Copy link
Member

TimGoll commented Feb 25, 2024

Overall I really like this feature, I'm not so sure on its implementation though

Copy link
Contributor Author

@ZenBre4ker ZenBre4ker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I'm gonna put this to draft again. As it was mainly a quick way to get remote use to work. But I will try to work on a proper implementation in GM:KeyRelease instead and combine it with weapon pickup and bodysearch to be client-authorative and just checked by the server if it is generally possible.

@ZenBre4ker ZenBre4ker marked this pull request as draft February 27, 2024 19:17
@ZenBre4ker ZenBre4ker added the status/waiting Depends on another Pull Request to be merged before label Feb 28, 2024
@ZenBre4ker
Copy link
Contributor Author

This shall be based on #1447 instead of this unrelated hook.

@ZenBre4ker ZenBre4ker force-pushed the remote_triggerable branch from bb659f3 to c71a1cb Compare March 3, 2024 11:24
@ZenBre4ker ZenBre4ker changed the base branch from master to rework_use_key_handling March 3, 2024 11:24
@ZenBre4ker
Copy link
Contributor Author

Updated and waiting for #1447

@ZenBre4ker ZenBre4ker added this to the v0.14.0b milestone Mar 3, 2024
Base automatically changed from rework_use_key_handling to master March 3, 2024 17:03
@ZenBre4ker ZenBre4ker force-pushed the remote_triggerable branch from 9f80588 to f77b943 Compare March 3, 2024 17:09
@ZenBre4ker ZenBre4ker force-pushed the remote_triggerable branch from f77b943 to 1f90813 Compare March 3, 2024 17:45
@ZenBre4ker ZenBre4ker removed the status/waiting Depends on another Pull Request to be merged before label Mar 3, 2024
@ZenBre4ker
Copy link
Contributor Author

Next one is directly ready 😆

@ZenBre4ker ZenBre4ker marked this pull request as ready for review March 3, 2024 17:53
Copy link
Member

@TimGoll TimGoll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like it much more then the previous implementation. Some minor things. Also I'm wondering if we should use your current method for the focus detection, or if we should just add sorting so we can ditch that part of the code

lua/ttt2/libraries/marker_vision.lua Show resolved Hide resolved
Copy link
Member

@Histalek Histalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ZenBre4ker ZenBre4ker merged commit 9aee0a9 into master Mar 4, 2024
6 checks passed
@ZenBre4ker ZenBre4ker deleted the remote_triggerable branch March 4, 2024 21:18
ZenBre4ker added a commit that referenced this pull request Mar 6, 2024
Before this you had to navigate to the shop tabs to use it, which is
really unintuitive and currently blocks our idea to do a new shop.

![grafik](https://github.com/TTT-2/TTT2/assets/72046466/cf56c6e4-3d36-4e77-9ea8-94eceba39173)

Now you can use the 'Use'-Key from any distance on the focussed radio
marker

![grafik](https://github.com/TTT-2/TTT2/assets/72046466/7c4d6c30-d48b-40c1-b799-934fd09d7aad)
and get the following new UI, which triggers the sounds in the same way
as before

![grafik](https://github.com/TTT-2/TTT2/assets/72046466/a9fa7cd5-e929-4878-9e54-3f63aba65737)

This will be waiting for the approval of the remote trigger feature in
#1436

---------

Co-authored-by: Tim Goll <github@timgoll.de>
Co-authored-by: Histalek <16392835+Histalek@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/feature New functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants