-
Notifications
You must be signed in to change notification settings - Fork 545
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into topic/random-spawner-track
- Loading branch information
Showing
3,528 changed files
with
441,036 additions
and
230,641 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
FROM ubuntu:latest | ||
LABEL org.opencontainers.image.authors="CandiceJoy <candice@candicejoy.com>" | ||
LABEL author="CandiceJoy" | ||
LABEL description="GZDoom compilation image (Designed for GZDoom 4.11pre)" | ||
LABEL verion="4.11pre" | ||
|
||
# Update these as needed | ||
ENV GZ_ZMUSIC_URL="https://github.com/coelckers/ZMusic.git" | ||
ENV GZ_ZMUSIC_COMMIT="75d2994b4b1fd6891b20819375075a2976ee34de" | ||
ENV GZ_PACKAGES="build-essential git cmake libsdl2-dev libvpx-dev" | ||
|
||
# Update package lists and install package-based build dependencies | ||
RUN apt-get update; apt-get install -y $GZ_PACKAGES | ||
|
||
# Install ZMusic | ||
RUN git clone $GZ_ZMUSIC_URL; git reset --hard $GZ_ZMUSIC_COMMIT; cd ZMusic; cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; make; make install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"build":{ "dockerfile": "GZDoom.dockerfile" }, | ||
"name": "GZDoom", | ||
"features": { | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,124 @@ | ||
name: Bug Report | ||
description: File a Bug report | ||
title: '[BUG] ' | ||
labels: bug | ||
#assignees: 'anonymous@temp' | ||
|
||
body: | ||
- type: markdown | ||
attributes: | ||
value: | | ||
## Please fill out forms as cleanly as possible. | ||
#### Make sure that you have | ||
* properly edited & filled in the title of this bug report | ||
- type: input | ||
id: version | ||
attributes: | ||
label: GZDoom version | ||
description: | | ||
What version are you using? | ||
Run `gzdoom --version` or check in the console in game. | ||
Make sure to update to latest [release](https://github.com/coelckers/gzdoom/releases) version and test again before continuing. | ||
placeholder: "ex: GZDoom 4.0.0, Git version, Branch, other" | ||
validations: | ||
required: false | ||
- type: dropdown | ||
id: gameid | ||
attributes: | ||
label: Which game are you running with GZDoom? | ||
multiple: false | ||
options: | ||
- Doom | ||
- Doom 2 | ||
- Heretic | ||
- Hexen | ||
- Strife | ||
- Other | ||
validations: | ||
required: false | ||
- type: dropdown | ||
id: OS | ||
attributes: | ||
label: What Operating System are you using? | ||
multiple: false | ||
options: | ||
- Windows 11 | ||
- Windows 10 | ||
- Windows 8 | ||
- Windows 7 | ||
- Windows Other | ||
- Mac OS | ||
- Linux x86 | ||
- Linux x86_64 | ||
- Linux ARM (Raspberry Pi) | ||
- Other | ||
validations: | ||
required: false | ||
- type: input | ||
id: os_detail | ||
attributes: | ||
label: Please describe your specific OS version | ||
description: Other details | ||
placeholder: "Windows 11 Home/Pro/Server/etc, Mac OSX version, Debian 10/11/etc, Ubuntu 18/20/etc, Arch, etc." | ||
validations: | ||
required: false | ||
- type: input | ||
id: hardware | ||
attributes: | ||
label: Relevant hardware info | ||
description: Hardware | ||
placeholder: "CPU, GPU, device brand/model: e.g. Intel, AMD, Nvidia, etc" | ||
validations: | ||
required: false | ||
- type: checkboxes | ||
id: checked | ||
attributes: | ||
label: Have you checked that no other similar issue already exists? | ||
description: Searched issues before creating report? | ||
options: | ||
- label: I have searched and not found similar issues. | ||
required: true | ||
- type: textarea | ||
id: description | ||
attributes: | ||
label: A clear and concise description of what the bug is. | ||
description: Describe what happens, what software were you running? _Include a small mod demonstrating the bug, or a screenshot if possible_ | ||
placeholder: "How & When does this occur?" | ||
validations: | ||
required: true | ||
- type: textarea | ||
id: steps | ||
attributes: | ||
label: Steps to reproduce the behaviour. | ||
description: How can we reproduce this? | ||
placeholder: "Explain how to reproduce" | ||
value: | | ||
Explain how to reproduce | ||
1. | ||
2. | ||
3. | ||
validations: | ||
required: false | ||
- type: textarea | ||
id: config_file | ||
attributes: | ||
label: Your configuration | ||
description: | | ||
Share the config file(s) you've been using to run the program. (`gzdoom.ini`) | ||
Please avoid pasting the full config, _use attachments or links_ in a [Gist](https://gist.github.com/) | ||
placeholder: "example: cl_autorun=true" | ||
render: ini # syntax highlighting | ||
validations: | ||
required: false | ||
- type: textarea | ||
id: log | ||
attributes: | ||
label: Provide a Log | ||
description: Please avoid pasting the full log, _use attachments or links_ in a [Gist](https://gist.github.com/) | ||
placeholder: "Copy & paste error log section or provide link" | ||
validations: | ||
required: false | ||
- type: markdown | ||
attributes: | ||
value: | | ||
* Make sure you have properly filled in the title of this bug report |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
name: Feature Request | ||
description: Suggest an idea (a new feature or other improvement) for this project | ||
title: '[Feature] ' | ||
labels: enhancement | ||
#assignees: 'anonymous@temp' | ||
|
||
body: | ||
- type: markdown | ||
attributes: | ||
value: | | ||
## Please fill out forms as cleanly as possible. | ||
#### Make sure that you have | ||
* properly edited & filled in the title of this bug report | ||
- type: input | ||
id: version | ||
attributes: | ||
label: GZDoom version | ||
description: | | ||
What version are you using? | ||
Run `gzdoom --version` or check in the console in game. | ||
Make sure to update to latest [release](https://github.com/coelckers/gzdoom/releases) version and test again before continuing. | ||
placeholder: "ex: GZDoom 4.0.0, Git version, Branch, other" | ||
validations: | ||
required: false | ||
- type: dropdown | ||
id: gameid | ||
attributes: | ||
label: Which game are you running with GZDoom? | ||
multiple: false | ||
options: | ||
- Doom | ||
- Doom 2 | ||
- Heretic | ||
- Hexen | ||
- Strife | ||
- Other | ||
validations: | ||
required: false | ||
- type: dropdown | ||
id: OS | ||
attributes: | ||
label: What Operating System are you using? | ||
multiple: false | ||
options: | ||
- Windows 11 | ||
- Windows 10 | ||
- Windows 8 | ||
- Windows 7 | ||
- Windows Other | ||
- Mac OS | ||
- Linux x86 | ||
- Linux x86_64 | ||
- Linux ARM (Raspberry Pi) | ||
- Other | ||
validations: | ||
required: false | ||
- type: input | ||
id: other | ||
attributes: | ||
label: If Other OS, please describe | ||
description: Other details | ||
placeholder: "Windows, Mac OSX version, Debian, Ubuntu, Arch, etc." | ||
validations: | ||
required: false | ||
- type: input | ||
id: hardware | ||
attributes: | ||
label: Relevant hardware info | ||
description: Hardware | ||
placeholder: "CPU, GPU, device brand/model: e.g. Intel, AMD, Nvidia, etc" | ||
validations: | ||
required: false | ||
- type: textarea | ||
id: related | ||
attributes: | ||
label: Is your feature request related to a problem? Please describe. | ||
description: Related | ||
placeholder: "Ex. I'm always frustrated when" | ||
validations: | ||
required: true | ||
- type: textarea | ||
id: solution | ||
attributes: | ||
label: Describe the solution you'd like | ||
placeholder: "Ex. How can we make it better?" | ||
validations: | ||
required: false | ||
- type: textarea | ||
id: alternative | ||
attributes: | ||
label: Describe alternatives you've considered | ||
description: A clear and concise description of any alternative solutions or features you've considered. | ||
placeholder: "Similar idea or software" | ||
validations: | ||
required: false | ||
- type: textarea | ||
id: additional | ||
attributes: | ||
label: Add any other context or screenshots about the feature request here. | ||
description: Screenshots or Links? | ||
placeholder: "Ex. Screenshot or Link" | ||
validations: | ||
required: false | ||
- type: markdown | ||
attributes: | ||
value: | | ||
* Make sure you have properly filled in the title of this feature request |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
name: Continuous Integration | ||
|
||
on: [push, pull_request] | ||
|
||
jobs: | ||
build-appimage: | ||
name: Linux Clang 12 | AppImage | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Install GZDoom dependencies | ||
run: | | ||
sudo apt-get update | ||
sudo apt-get install clang-12 libsdl2-dev libvpx-dev libwebp-dev cmake -y | ||
- name: Install appimage-builder dependencies | ||
run: | | ||
sudo apt-get install binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf -y | ||
sudo apt-get install python3-pip python3-setuptools squashfs-tools strace util-linux zsync -y | ||
sudo apt-get install imagemagick-6.q16hdri -y | ||
- name: Install appimage-builder | ||
run: | | ||
python3 -m pip install --upgrade pip | ||
pip install appimage-builder | ||
- name: Build zmusic dependency | ||
run: | | ||
git clone -b 1.1.12 https://github.com/ZDoom/ZMusic.git zmusic_build | ||
mkdir ./zmusic_build/build | ||
cd ./zmusic_build/build | ||
cmake -DCMAKE_BUILD_TYPE=Release .. | ||
cmake --build . | ||
cd ../../ | ||
mkdir -p ./AppDir/zmusic/lib | ||
mkdir ./AppDir/zmusic/include | ||
mv ./zmusic_build/build/source/libzmusic* ./AppDir/zmusic/lib/ | ||
mv ./zmusic_build/include/zmusic.h ./AppDir/zmusic/include/ | ||
- name: Configure | ||
run: cmake -B AppDir -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH=`pwd`/AppDir/zmusic -DPK3_QUIET_ZIPDIR=ON -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 . | ||
- name: Build | ||
shell: bash | ||
run: | | ||
export MAKEFLAGS=--keep-going | ||
cmake --build AppDir --config Release --parallel `nproc` | ||
cp ./AppDir/zmusic/lib/* ./AppDir/ | ||
mkdir -p ./AppDir/usr/share/icons | ||
convert ./src/win32/icon1.ico[0] -flatten ./AppDir/usr/share/icons/game_icon.png | ||
- name: Build AppImage | ||
run: | | ||
appimage-builder --skip-tests | ||
- uses: actions/upload-artifact@v2 | ||
with: | ||
name: AppImage | ||
path: './*.AppImage*' |
Oops, something went wrong.