Skip to content

Merge development into main #1126

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.

Sign up for GitHub

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

Merged
EttyKitty merged 3 commits into from
Feb 12, 2026
Merged

Merge development into main #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8fd30f
refactor: Ruin rewards; Move to json
EttyKitty Feb 12, 2026
aea6ab2
fix: Broken enemy "melee" weapons
EttyKitty Feb 12, 2026
b706257
ci: Enable auto incremental review for coderabbit
EttyKitty Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .coderabbit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ reviews:
- When any script or sprite `.yy` files are created, their paths should be added to the
project `.yyp` file, otherwise they'll fail.
auto_review:
auto_incremental_review: false
auto_incremental_review: true
finishing_touches:
docstrings:
enabled: false
Expand Down
1 change: 1 addition & 0 deletions ChapterMaster.yyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
{"$GMIncludedFile":"","%Name":"mobility.json","CopyToMask":-1,"filePath":"datafiles/data","name":"mobility.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"psychic_disciplines.json","CopyToMask":-1,"filePath":"datafiles/data","name":"psychic_disciplines.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"psychic_powers.json","CopyToMask":-1,"filePath":"datafiles/data","name":"psychic_powers.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"ruins_loot.json","CopyToMask":-1,"filePath":"datafiles/data","name":"ruins_loot.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"ships.json","CopyToMask":-1,"filePath":"datafiles/data","name":"ships.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"technologies.json","CopyToMask":-1,"filePath":"datafiles/data","name":"technologies.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"traits.json","CopyToMask":-1,"filePath":"datafiles/data","name":"traits.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
Expand Down
Loading
Loading