diff --git a/.devcontainer/GZDoom.dockerfile b/.devcontainer/GZDoom.dockerfile deleted file mode 100644 index da2440913..000000000 --- a/.devcontainer/GZDoom.dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:latest -LABEL org.opencontainers.image.authors="CandiceJoy " -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 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 9bcbdd2f9..000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build":{ "dockerfile": "GZDoom.dockerfile" }, - "name": "GZDoom", - "features": { - } -} diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 7ed0af7ce..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,124 +0,0 @@ -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 diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml deleted file mode 100644 index 60c7440fe..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ /dev/null @@ -1,107 +0,0 @@ -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 diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml deleted file mode 100644 index 06ca3423f..000000000 --- a/.github/workflows/continuous_integration.yml +++ /dev/null @@ -1,135 +0,0 @@ -name: Continuous Integration - -on: [push, pull_request] - -jobs: - build: - name: ${{ matrix.config.name }} | ${{ matrix.config.build_type }} - runs-on: ${{ matrix.config.os }} - strategy: - fail-fast: false - matrix: - config: - - { - name: "Visual Studio 2022", - os: windows-2022, - extra_options: "-A x64", - build_type: "Release" - } - - { - name: "Visual Studio 2019", - os: windows-2019, - extra_options: "-A x64", - build_type: "Release" - } - - { - name: "Visual Studio 2019", - os: windows-2019, - extra_options: "-A x64", - build_type: "Debug" - } - - { - name: "macOS", - os: macos-12, - deps_cmdline: "brew install libvpx", - build_type: "Release" - } - - { - name: "macOS", - os: macos-12, - extra_options: "-G Xcode -DDYN_OPENAL=OFF", - deps_cmdline: "brew install libvpx fluidsynth mpg123 libsndfile", - build_type: "Debug" - } - - { - name: "Linux GCC 7", - os: ubuntu-20.04, - extra_options: "-DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7", - deps_cmdline: "sudo apt update && sudo apt install g++-7 libsdl2-dev libvpx-dev libgtk2.0-dev", - build_type: "RelWithDebInfo" - } - - { - name: "Linux GCC 11", - os: ubuntu-20.04, - extra_options: "-DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11", - deps_cmdline: "sudo apt update && sudo apt install g++-11 libsdl2-dev libvpx-dev libgtk-3-dev", - build_type: "MinSizeRel" - } - - { - name: "Linux Clang 6", - os: ubuntu-20.04, - extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DDYN_OPENAL=OFF", - deps_cmdline: "sudo apt update && sudo apt install clang-6.0 libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev", - build_type: "Debug" - } - - { - name: "Linux Clang 12", - os: ubuntu-20.04, - extra_options: "-DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12", - deps_cmdline: "sudo apt update && sudo apt install clang-12 libsdl2-dev libvpx-dev", - build_type: "Release" - } - - steps: - - uses: actions/checkout@v1 - - - name: Install Dependencies - shell: bash - run: | - if [[ ! -z "${{ matrix.config.deps_cmdline }}" ]]; then - eval ${{ matrix.config.deps_cmdline }} - fi - mkdir build - if [[ "${{ runner.os }}" == 'macOS' ]]; then - export ZMUSIC_PACKAGE=zmusic-1.1.9-macos.tar.xz - elif [[ "${{ runner.os }}" == 'Linux' ]]; then - export ZMUSIC_PACKAGE=zmusic-1.1.9-linux.tar.xz - fi - if [[ ! -z "${ZMUSIC_PACKAGE}" ]]; then - cd build - wget -q "https://github.com/coelckers/gzdoom/releases/download/ci_deps/${ZMUSIC_PACKAGE}" - tar -xf "${ZMUSIC_PACKAGE}" - fi - - - name: Configure - shell: bash - run: | - if [[ "${{ runner.os }}" == 'Windows' ]]; then - # Remove Strawberry Perl from PATH environment variable to avoid usage of libraries it provides - export PATH=`echo $PATH | tr ":" "\n" | grep -v "Strawberry" | tr "\n" ":"` - fi - cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DCMAKE_PREFIX_PATH=`pwd`/build/zmusic -DPK3_QUIET_ZIPDIR=ON ${{ matrix.config.extra_options }} . - - - name: Build - shell: bash - run: | - export MAKEFLAGS=--keep-going - cmake --build build --config ${{ matrix.config.build_type }} --parallel 3 - - - name: Create Package - if: runner.os == 'Windows' # Remove to make packages of all targets - shell: bash - run: | - cd build - mkdir package - if [[ "${{ runner.os }}" == 'Windows' ]]; then - cp ${{ matrix.config.build_type }}/gzdoom.exe ${{ matrix.config.build_type }}/*.pk3 package - elif [[ "${{ runner.os }}" == 'macOS' ]]; then - cp -r gzdoom.app package - elif [[ "${{ runner.os }}" == 'Linux' ]]; then - cp gzdoom *.pk3 package - fi - - - name: Upload Package - if: runner.os == 'Windows' # Remove to store packages of all targets - uses: actions/upload-artifact@v1 - with: - path: build/package - name: ${{ matrix.config.name }} ${{ matrix.config.build_type }} - - - name: List Build Directory - if: always() - shell: bash - run: | - git status - ls -lR build