security-feed #5
No reviewers
Labels
No labels
No milestone
No project
No assignees
3 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
BUGJam/pounce-game!5
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "security-feed"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Thanks for the cool security feed camera and display feature!
Commit d94aeaeddd532992a1cb06cb994b25b0202db89e fails to load properly in the editor with this error message:
Somehow the file
security_monitor.gdwas 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.gdis in a state that can at least be parsed by the editor in each commit.Commit d94aeaeddd532992a1cb06cb994b25b0202db89e is missing the
.uidfiles for the.gdscripts. They were added later in 8f6de3ef919e48d2664567b0ad7223b0bb5c7568. Please move them from that later commit into the earlier commit where the.gdfiles are first added. Please make sure to always commit all.uidfiles together with their assets.This branch conflicts with the
devbranch 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 thedevbranch.Lastly, the
devbranch 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 ondev, after combining the commits that addedsecurity_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()Please remove the unused commented out code.
@ -0,0 +10,4 @@func _ready() -> void:if security_camera:call_deferred("_reparent_camera")Please use the
_reparent_camera.call_deferred()syntax instead. This allows the editor to show better syntax errors.The original feedback from @noahg looks to be fixed.
Not seeing errors/warnings with
security_monitor.gdwhen starting or playing the game.Other than conflict with test_map.tscn which has some good solutions above.
LGTM! 👍
@ -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"]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.
b6401c50d0toe795171cf2Looks good!