Skip to content

Commit

Permalink
Merge branch 'stable-candidate'
Browse files Browse the repository at this point in the history
  • Loading branch information
EttyKitty committed Jan 11, 2025
2 parents 5ec8e91 + a7ead39 commit ad540e7
Show file tree
Hide file tree
Showing 1,374 changed files with 40,455 additions and 22,308 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gamemaker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
$CommitHash = git rev-parse --short HEAD

try {
$Version = "${{ github.ref_name }}".Replace("/", "-")
$Version = "${{ github.ref_name }}".Split('/')[-1]
} catch {
# If no tags exist, use the commit hash as the version
Write-Warning "No tags found, using commit hash as version."
$Version = $CommitHash
}

if ("${{ inputs.development }}" -eq "true") {
$suffix = "$Version-$BuildDate"
$suffix = "dev-$Version-$BuildDate"
} else {
$suffix = $Version
}
Expand Down
35 changes: 34 additions & 1 deletion .github/workflows/release_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
push:
branches:
- release/0.9

jobs:
build_needed:
name: Build needed?
Expand All @@ -23,7 +24,7 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: true

- name: Check commit
id: commit_check
run: |
Expand Down Expand Up @@ -61,6 +62,8 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: true
fetch-depth: 0

- name: Check if a dev release exists
id: check_release
run: |
Expand All @@ -74,18 +77,48 @@ jobs:
continue-on-error: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- id: get_commit_sha
name: Get commit SHA of the last nightly release
if: steps.check_release.outputs.release_exists
run: |
$prev_sha = git rev-parse dev/${{ github.ref_name }}
echo "prev_SHA=$prev_sha" >> $env:GITHUB_ENV
- name: Update tag pointing to the previous nightly release
if: steps.check_release.outputs.release_exists
run: |
# Get the SHA from the environment variable
$sha = $env:prev_SHA
# Construct the URL properly
$url = "https://api.github.com/repos/$env:GITHUB_REPOSITORY/git/refs/tags/dev-old/$env:GITHUB_REF_NAME"
# Create the JSON payload for the PATCH request
$data = @{
sha = $sha
} | ConvertTo-Json

# Use curl to send the PATCH request with proper headers and data
curl --fail-with-body -X PATCH `
-H "Authorization: Bearer ${{ secrets.WORKFLOW_TOKEN }}" `
-H "Accept: application/vnd.github.v3+json" `
-d $data `
$url

- id: delete_release_tag
name: Delete the existing dev tag and release
if: steps.check_release.outputs.release_exists
run: |
gh release delete dev/${{ github.ref_name }} -y --cleanup-tag
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download built file artifact
uses: actions/download-artifact@v4
with:
name: built-file
path: ./build_output

- id: create_release
name: Create a release and upload the build
uses: softprops/[email protected]
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@

# Gamemaker stuff
ChapterMaster.resource_order

tmp/
stitch.config.json
252 changes: 219 additions & 33 deletions ChapterMaster.yyp

Large diffs are not rendered by default.

Binary file added datafiles/images/creation/chapters/icons/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/17.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/18.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/21.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added datafiles/images/creation/chapters/icons/9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added datafiles/images/creation/chapters/splash/22.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed datafiles/images/creation/creation_icons.png
Diff not rendered.
Binary file removed datafiles/images/creation/existing8.png
Diff not rendered.
Binary file removed datafiles/images/creation/lamenters_alternate.png
Diff not rendered.
File renamed without changes
File renamed without changes
Binary file modified datafiles/images/title_splash.png
Binary file added datafiles/images/ui/force/1.png
Binary file added datafiles/images/ui/force/10.png
Binary file added datafiles/images/ui/force/11.png
Binary file added datafiles/images/ui/force/12.png
Binary file added datafiles/images/ui/force/13.png
Binary file added datafiles/images/ui/force/15.png
Binary file added datafiles/images/ui/force/2.png
Binary file added datafiles/images/ui/force/3.png
Binary file added datafiles/images/ui/force/30.png
Binary file added datafiles/images/ui/force/4.png
Binary file added datafiles/images/ui/force/5.png
Binary file added datafiles/images/ui/force/6.png
Binary file added datafiles/images/ui/force/7.png
Binary file added datafiles/images/ui/force/8.png
Binary file added datafiles/images/ui/force/9.png
Binary file added datafiles/images/ui/planet/1.png
Binary file added datafiles/images/ui/planet/10.png
Binary file added datafiles/images/ui/planet/11.png
Binary file added datafiles/images/ui/planet/12.png
Binary file added datafiles/images/ui/planet/13.png
Binary file added datafiles/images/ui/planet/14.png
Binary file added datafiles/images/ui/planet/15.png
Binary file added datafiles/images/ui/planet/16.png
Binary file added datafiles/images/ui/planet/17.png
Binary file added datafiles/images/ui/planet/2.png
Binary file added datafiles/images/ui/planet/3.png
Binary file added datafiles/images/ui/planet/4.png
Binary file added datafiles/images/ui/planet/5.png
Binary file added datafiles/images/ui/planet/6.png
Binary file added datafiles/images/ui/planet/7.png
Binary file added datafiles/images/ui/planet/8.png
Binary file added datafiles/images/ui/planet/9.png
Loading

0 comments on commit ad540e7

Please sign in to comment.