BUGJam/pounce-game
28
0
Fork 0
Code Issues Pull requests 1 Projects 1 Releases 2 Packages Wiki Activity Actions

Sync Dev with Main #2

Closed
devonereynolds wants to merge 0 commits from dev into main
pull from: dev
merge into: BUGJam:main
Conversation 1 Commits - Files changed - +48364 -192
devonereynolds commented 2026-02-18 06:08:27 +00:00
Member
Copy link

Please test the game for breaking changes before merging into main

Please test the game for breaking changes before merging into `main`
This will allow the team to all use the same formatter settings without having to manually set these options per user and per machine.
Reviewed-on: #4
Co-authored-by: Nate Moore <nate@moore.codes>
Co-committed-by: Nate Moore <nate@moore.codes>
This reverts commit fa1b91aef4.

This commit went about making the change incorrectly by removing the project overrides instead of just updating them.
This is incorrect because it leaves open the possibility for individual conflicting editor formatter settings.
There still needs to be a project override, but with the setting explicitly set to false instead.

Also, this commit changed more than just not using spaces. It mistakenly removed the lint line length and lint ignored rules settings from the project editor settings overrides.
It may have looked like an error because they are explicitly set to the default values, but these do need to be explicitly set as project overrides to ensure each team member is using the same settings and cannot have different, conflicting editor formatter settings.
If the team wants to change these settings, we can update their project editor settings overrides.
Initially the team was provided settings for the formatter that had it configured to use spaces.
Project editor settings overrides were then added to match the provided settings to keep the team in sync.
However, the official Godot style guide says to use tabs, and the team wants to switch back to tabs for consistency.
https://docs.godotengine.org/en/stable/tutorials/scripting/gdscript/gdscript_styleguide.html#encoding-and-special-characters

Turned off the formatter use spaces setting by updating the project override so that the team still keeps their editor formatter settings in sync.
Removed the project override for the formatter indent size setting because it is ignored when using tabs.
Reference:
https://github.com/github/gitignore/blob/main/Godot.gitignore
As of Godot 4.2 the editor has a Windows-specific workaround for loading extension libraries.
Before the extension library is loaded the Godot editor creates a temp copy of the extension library `.dll` file with a `~` prefix (e.g. `example.dll` => `~example.dll`).
When the extension library is unloaded the Godot editor deletes the temp copy.
These copied `~*.dll` files are temporary and should be ignored.

References:

Godot 4.2 changelog
https://godotengine.org/article/godot-4-2-arrives-in-style/#gdextension

Godot PR #80188 GDExtension: Copy DLL to a temp file before opening
https://github.com/godotengine/godot/pull/80188
viewport
pounce_tools: Makes a debug menu in the top right, to be expanded as needed
DebugWatcher: Autoload for easy realtime monitoring with `DebugWatcher.add( node, 'property_to_watch' )`
Reviewed-on: #3
Reviewed-by: xury <Xury.Greer@Gmail.com>
Reviewed-by: a_kimb0 <ndbkim@gmail.com>
- [x] Add museum level w/ basic CSG
- [x] Fix up character camera controls
- [x] Add some robots and lasers to museum level
- [x] When a robot touches you, show a game over screen
- [x] Grab a "diamond"
- [x] Exit the map while holding the diamond and see a success screen

Reviewed-on: #6
This reverts commit 44e5d5c83bdae9ef3aba59812702c8eb741d9843.
(cherry picked from commit 375d5172d3bbd07f204fde53a4725d45719d7509)
(cherry picked from commit 0805f011cbc1fe52bd77b9522bd82a88dfdc0d13)
feat: add quit game action with esc key
feat: add quit game action with esc key
open a PR against the addon repo)
Per-user entries can be added as the startup level by opening `ignore/debug_config.tres` and populating `start_level_choices` (don't forget to save this node)
Enable/disable the pounce_tools plugin (or reload current project) to reflect those changes.
https://github.com/limbonaut/limboai/releases/tag/v1.7.0
Reviewed-on: #5
Reviewed-by: noahg <Noah.Greer@Gmail.com>
This reverts commit f0cfa760c6.
Reviewed-on: #11
Reviewed-by: noahg <Noah.Greer@Gmail.com>
Reviewed-on: #12
Reviewed-by: noahg <Noah.Greer@Gmail.com>
Adds the ability to push/pull "movable" objects around.

Co-authored-by: paco-orwin <wayoftheguitar@gmail.com>
Co-authored-by: Nate <nate@moore.codes>
Reviewed-on: #14
Reviewed-by: Nate <nate@moore.codes>
Co-authored-by: paco <pat@patcorwin.com>
Co-committed-by: paco <pat@patcorwin.com>
devonereynolds commented 2026-03-04 07:01:21 +00:00
Author
Member
Copy link

Preferring to create a release branch from dev over a PR to merge into main.
Closing PR.

Preferring to create a release branch from dev over a PR to merge into main. Closing PR.
devonereynolds closed this pull request 2026-03-04 07:01:22 +00:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
xury
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
devonereynolds
16 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!2
No description provided.