Skip to content

Commit

Permalink
Merge branch 'SuperTux:master' into wind_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
biggeryetbetter authored May 24, 2024
2 parents d61abb8 + b902362 commit 6092b69
Show file tree
Hide file tree
Showing 108 changed files with 13,201 additions and 7,312 deletions.
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

80 changes: 80 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: Bug Report
description: File a report for unexpected behavior in SuperTux.
title: "[Bug]: "
labels: ["type:bug"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: supertux-version
attributes:
label: SuperTux Version
description: The version of SuperTux, shown at the bottom-left corner on the title screen.
placeholder: ex. v0.6.3-1236-g7451121dd
validations:
required: true
- type: input
id: system-info
attributes:
label: System Information
description: Details about your operating system (such as Linux distribution or Windows version) and CPU architecture (ex. 64-bit or 32-bit).
placeholder: ex. Windows 11 64-bit
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: Expected Behavior
description: What did you expect to happen?
placeholder: Describe the behavior you expected in detail.
validations:
required: true
- type: textarea
id: actual-behavior
attributes:
label: Actual Behavior
description: Instead, what actually happened?
placeholder: Describe the actual behavior in detail.
validations:
required: true
- type: textarea
id: steps-to-reproduce
attributes:
label: Steps To Reproduce Actual Behavior
description: A clear and concise description of how the actual behavior was achieved, since starting up the game.
placeholder: |
Describe the steps leading to the actual behavior, preferably with a numerated list.
1. ...
2. ...
3. ...
validations:
required: true
- type: textarea
id: additional-info
attributes:
label: Additional Information
description: Include any additional information regarding the bug.
placeholder: You can also leave this empty.
validations:
required: false
- type: checkboxes
id: guidelines
attributes:
label: Guidelines For Reporting Issues
description: "Before submitting this issue, make sure you have done the following:"
options:
- label: I have read <https://github.com/SuperTux/supertux/blob/master/CONTRIBUTING.md#bug-reports>.
required: true
- label: I have verified this isn't an issue that's already been reported.
required: true
- label: I have verified this isn't a [discussion](https://github.com/SuperTux/supertux/discussions), or an issue about a crash or a feature request, but rather an actual bug ─ that is, the game did something not intended.
required: true
- label: I have verified this issue is **not** about wrong translations (use Transifex for those), or anything unsupported (e.g. third-party add-ons).
required: true
- label: In this report, I have only included details about **one** (1) bug.
required: true
- label: If I make a mistake while submitting this report, I agree to use the "Edit" feature to correct it, instead of closing this issue and opening a new one.
required: true
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Create a Discussion
url: https://github.com/SuperTux/supertux/discussions/new/choose
about: If you're looking for something else, create a Discussion, assuming this hasn't been reported there before.
76 changes: 76 additions & 0 deletions .github/ISSUE_TEMPLATE/crash.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Crash Report
description: File a report for a crash in SuperTux.
title: "[Crash]: "
labels: ["type:crash"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this crash report!
- type: input
id: supertux-version
attributes:
label: SuperTux Version
description: The version of SuperTux, shown at the bottom-left corner on the title screen.
placeholder: ex. v0.6.3-1236-g7451121dd
validations:
required: true
- type: input
id: system-info
attributes:
label: System Information
description: Details about your operating system (such as Linux distribution or Windows version) and CPU architecture (ex. 64-bit or 32-bit).
placeholder: ex. Windows 11 64-bit
validations:
required: true
- type: textarea
id: steps-to-reproduce
attributes:
label: Steps To Reproduce Crash
description: A clear and concise description of how the crash was achieved, since starting up the game.
placeholder: |
Describe the steps, leading to the crash, preferably with a numerated list.
1. ...
2. ...
3. ...
validations:
required: true
- type: textarea
id: debug-stacktrace
attributes:
label: Debugging Information (Stacktrace)
description: Include a stacktrace, leading to the crash. This can be obtained via a debugging utility.
placeholder: |
Paste the full stacktrace here.
You can leave this empty, in case a stacktrace can't be obtained (for example, if the game freezes).
render: shell
validations:
required: false
- type: textarea
id: additional-info
attributes:
label: Additional Information
description: Include any additional information, regarding the crash.
placeholder: You can also leave this empty.
validations:
required: false
- type: checkboxes
id: guidelines
attributes:
label: Guidelines For Reporting Issues
description: "Before submitting this issue, make sure you have done the following:"
options:
- label: I have read <https://github.com/SuperTux/supertux/blob/master/CONTRIBUTING.md#bug-reports>.
required: true
- label: I have verified this isn't an issue that's already been reported.
required: true
- label: I have verified this isn't a [discussion](https://github.com/SuperTux/supertux/discussions), or an issue about unintended behavior or a feature request, but rather an actual crash ─ that is, the game closed unexpectedly.
required: true
- label: I have verified this issue is **not** about wrong translations (use Transifex for those), or anything unsupported (e.g. third-party add-ons).
required: true
- label: In this report, I have only included details about **one** (1) crash.
required: true
- label: If I make a mistake while submitting this report, I agree to use the "Edit" feature to correct it, instead of closing this issue and opening a new one.
required: true
52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Feature Requests
description: File a request for a feature you want to see in SuperTux!
title: "[Feature Request]: "
labels: ["type:idea"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this feature request!
- type: textarea
id: feature-details
attributes:
label: Feature Details
description: How would your feature work?
placeholder: A clear and concise description of the way the feature would function.
validations:
required: true
- type: textarea
id: feature-purpose
attributes:
label: Feature Purpose
description: What purpose would your feature serve, towards improving the SuperTux experience?
placeholder: A list of one or multiple example use-cases or positive outcomes from your feature being in SuperTux.
validations:
required: true
- type: textarea
id: feature-screenshots
attributes:
label: Concept Screenshots
description: Include any concept screenshots of the way your feature would look in-game, to help others grasp your idea better.
placeholder: |
To attach image files, click this area to highlight it, and then drag the files in.
You can also leave this empty.
validations:
required: false
- type: checkboxes
id: guidelines
attributes:
label: Guidelines For Reporting Issues
description: "Before submitting this issue, make sure you have done the following:"
options:
- label: I have read <https://github.com/SuperTux/supertux/blob/master/CONTRIBUTING.md#bug-reports>.
required: true
- label: I have verified this isn't a request that's already been submitted as an issue.
required: true
- label: I have verified this isn't a [discussion](https://github.com/SuperTux/supertux/discussions), or an issue with the game, but rather an actual feature request - a currently non-existent, but desired feature.
required: true
- label: In this request, I have only included details about **one** (1) desired feature.
required: true
- label: If I make a mistake while submitting this request, I agree to use the "Edit" feature to correct it, instead of closing this issue and opening a new one.
required: true
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand Down Expand Up @@ -137,13 +137,13 @@ jobs:
mv SuperTux*.apk upload/apk/
cd ..
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: "SuperTux-android-aab"
path: build.android/upload/aab
if-no-files-found: error

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: "SuperTux-android-apk"
path: build.android/upload/apk
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/bsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
vm_os: [freebsd]
build_type: [Debug, Release]
# FreeBSD does not have glbinding
# glbinding: [ON, OFF]
# glbiactions/checkout@v4

runs-on: macos-10.15
steps:
Expand Down Expand Up @@ -80,3 +80,4 @@ jobs:
make -j3 VERBOSE=1
make install DESTDIR="/tmp/supertux" VERBOSE=1
./test_supertux2
actions/checkout@v4
12 changes: 6 additions & 6 deletions .github/workflows/gnulinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
# Fetch the whole tree so git describe works
fetch-depth: 0
Expand Down Expand Up @@ -224,35 +224,35 @@ jobs:
run: ../.ci_scripts/package.sh

- name: Upload AppImage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-appimage"
path: build/upload/*.AppImage
if-no-files-found: ignore

- name: Upload source
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: "source"
path: build/upload/*Source.tar.gz
if-no-files-found: ignore

- name: Upload coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: "coverage"
path: build/coverage/*
if-no-files-found: ignore

- name: Upload documentation
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: "documentation"
path: build/docs/doxygen/html/*
if-no-files-found: ignore

- name: Upload tar archives
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-tgz"
path: build/upload/*Linux.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
lint_cppcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# The apt version of Cppcheck is outdated and apparently there are no
# alternative up-to-date precompiled versions for Ubuntu,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
# Fetch the whole tree so git describe works
fetch-depth: 0
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
working-directory: build
run: ../.ci_scripts/package.sh

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: "${{ matrix.os }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-dmg"
path: build/upload/*.dmg
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scripting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Checkout the wiki repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: SuperTux/wiki
path: wiki
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout SuperTux repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: 'SuperTux/supertux'
fetch-depth: 1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-touch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
# Fetch the whole tree so git describe works
fetch-depth: 0
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
run: |
~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: "clickable-${{ matrix.arch }}-${{ matrix.build_type }}-${{ matrix.opengl }}-click"
path: build.clickable/*.click
Expand Down
Loading

0 comments on commit 6092b69

Please sign in to comment.