security-feed #5

Merged
noahg merged 5 commits from security-feed into dev 2026-03-01 21:56:21 +00:00
Member
No description provided.
noahg requested changes 2026-02-26 00:33:31 +00:00
Dismissed
noahg left a comment
Member

Thanks for the cool security feed camera and display feature!

Commit d94aeaeddd532992a1cb06cb994b25b0202db89e fails to load properly in the editor with this error message:

Failed to load script "res://dev/andy/security_cam_feed/security_monitor.gd" with error "Parse error".

Somehow the file security_monitor.gd was only partially staged in the above commit and the remainder of it was committed later in 1736330dfa72fce45c3fca29a7df52abba44c8bf.

Please rebase and fixup 1736330dfa72fce45c3fca29a7df52abba44c8bf into d94aeaeddd532992a1cb06cb994b25b0202db89e so that security_monitor.gd is in a state that can at least be parsed by the editor in each commit.

Commit d94aeaeddd532992a1cb06cb994b25b0202db89e is missing the .uid files for the .gd scripts. They were added later in 8f6de3ef919e48d2664567b0ad7223b0bb5c7568. Please move them from that later commit into the earlier commit where the .gd files are first added. Please make sure to always commit all .uid files together with their assets.

This branch conflicts with the dev branch because b6401c50d0b1d43cc467901f41cd2fbbd90fc700 modifies a scene in another dev's subfolder. Please either replace that change with a test scene in your own dev folder or rebase and resolve the conflict with the existing changes in the dev branch.

Lastly, the dev branch added a fix for the code formatter settings so that it uses tabs instead of spaces as advised by the Godot style guide. While rebasing on dev, after combining the commits that added security_monitor.gd, the combined commit will need to be edited and the scripts will need to be reformatted to match the corrected formatter settings.

I can assist with walking you through these steps if you would like.

Thanks for the cool security feed camera and display feature! Commit d94aeaeddd532992a1cb06cb994b25b0202db89e fails to load properly in the editor with this error message: ``` Failed to load script "res://dev/andy/security_cam_feed/security_monitor.gd" with error "Parse error". ``` Somehow the file `security_monitor.gd` was only partially staged in the above commit and the remainder of it was committed later in 1736330dfa72fce45c3fca29a7df52abba44c8bf. Please rebase and fixup 1736330dfa72fce45c3fca29a7df52abba44c8bf into d94aeaeddd532992a1cb06cb994b25b0202db89e so that `security_monitor.gd` is in a state that can at least be parsed by the editor in each commit. Commit d94aeaeddd532992a1cb06cb994b25b0202db89e is missing the `.uid` files for the `.gd` scripts. They were added later in 8f6de3ef919e48d2664567b0ad7223b0bb5c7568. Please move them from that later commit into the earlier commit where the `.gd` files are first added. Please make sure to always commit all `.uid` files together with their assets. This branch conflicts with the `dev` branch because b6401c50d0b1d43cc467901f41cd2fbbd90fc700 modifies a scene in another dev's subfolder. Please either replace that change with a test scene in your own dev folder or rebase and resolve the conflict with the existing changes in the `dev` branch. Lastly, the `dev` branch added a fix for the code formatter settings so that it uses tabs instead of spaces as advised by the Godot style guide. While rebasing on `dev`, after combining the commits that added `security_monitor.gd`, the combined commit will need to be edited and the scripts will need to be reformatted to match the corrected formatter settings. I can assist with walking you through these steps if you would like.
@ -0,0 +10,4 @@
#if view_world:
#security_cam.show()
#else:
#security_cam.hide()
Member

Please remove the unused commented out code.

Please remove the unused commented out code.
a_kimb0 marked this conversation as resolved
@ -0,0 +10,4 @@
func _ready() -> void:
if security_camera:
call_deferred("_reparent_camera")
Member

Please use the _reparent_camera.call_deferred() syntax instead. This allows the editor to show better syntax errors.

Please use the `_reparent_camera.call_deferred()` syntax instead. This allows the editor to show better syntax errors.
a_kimb0 marked this conversation as resolved
Member

The original feedback from @noahg looks to be fixed.
Not seeing errors/warnings with security_monitor.gd when starting or playing the game.

Other than conflict with test_map.tscn which has some good solutions above.
LGTM! 👍

The original feedback from @noahg looks to be fixed. Not seeing errors/warnings with `security_monitor.gd` when starting or playing the game. Other than conflict with test_map.tscn which has some good solutions above. LGTM! 👍
noahg requested changes 2026-03-01 07:28:38 +00:00
Dismissed
@ -8,2 +8,2 @@
[ext_resource type="PackedScene" uid="uid://dtjmea8nge4un" path="res://dev/nate/laser_emitter.tscn" id="5_pt7wq"]
[ext_resource type="Script" uid="uid://scochyj2eksr" path="res://dev/nate/simple_path_follow.gd" id="6_bu33n"]
[ext_resource type="PackedScene" uid="uid://ckfqs3x1p0fvw" path="res://dev/nate/laser_emitter.tscn" id="5_pt7wq"]
[ext_resource type="Script" path="res://dev/nate/simple_path_follow.gd" id="6_bu33n"]
Member

On closer inspection it appears that the changes to lines 8-9 are making breaking changes that are unnecessary and unrelated to the purpose of this PR. When you're rebasing this branch and resolving the merge conflicts please drop these changes.

On closer inspection it appears that the changes to lines 8-9 are making breaking changes that are unnecessary and unrelated to the purpose of this PR. When you're rebasing this branch and resolving the merge conflicts please drop these changes.
a_kimb0 marked this conversation as resolved
a_kimb0 force-pushed security-feed from b6401c50d0 to e795171cf2 2026-03-01 21:54:16 +00:00 Compare
noahg requested review from noahg 2026-03-01 21:55:12 +00:00
noahg approved these changes 2026-03-01 21:55:28 +00:00
noahg left a comment
Member

Looks good!

Looks good!
noahg deleted branch security-feed 2026-03-01 21:56:22 +00:00
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
BUGJam/pounce-game!5
No description provided.