diff --git a/.devcontainer/GZDoom.dockerfile b/.devcontainer/GZDoom.dockerfile new file mode 100644 index 0000000000..da2440913d --- /dev/null +++ b/.devcontainer/GZDoom.dockerfile @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000000..9bcbdd2f9f --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,6 @@ +{ + "build":{ "dockerfile": "GZDoom.dockerfile" }, + "name": "GZDoom", + "features": { + } +} diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000000..7ed0af7ce6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -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 diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 0000000000..60c7440fe5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -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 diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml new file mode 100644 index 0000000000..885c329210 --- /dev/null +++ b/.github/workflows/appimage.yml @@ -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*' diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml new file mode 100644 index 0000000000..aa323c9399 --- /dev/null +++ b/.github/workflows/continuous_integration.yml @@ -0,0 +1,128 @@ +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: -DCMAKE_TOOLCHAIN_FILE=build/vcpkg/scripts/buildsystems/vcpkg.cmake + build_type: Release + + - name: Visual Studio 2022 + os: windows-2022 + extra_options: -DCMAKE_TOOLCHAIN_FILE=build/vcpkg/scripts/buildsystems/vcpkg.cmake + build_type: Debug + + - name: Visual Studio 2019 + os: windows-2019 + extra_options: -DCMAKE_TOOLCHAIN_FILE=build/vcpkg/scripts/buildsystems/vcpkg.cmake + build_type: Release + + - name: macOS + os: macos-12 + deps_cmdline: brew install libvpx webp + build_type: Release + + - name: macOS + os: macos-12 + extra_options: -G Xcode -DDYN_OPENAL=OFF + deps_cmdline: brew install libvpx webp + build_type: Debug + + - name: Linux GCC 9 + os: ubuntu-22.04 + extra_options: -DCMAKE_C_COMPILER=gcc-9 -DCMAKE_CXX_COMPILER=g++-9 + deps_cmdline: sudo apt update && sudo apt install libsdl2-dev libvpx-dev libgtk2.0-dev libwebp-dev + build_type: RelWithDebInfo + + - name: Linux GCC 12 + os: ubuntu-22.04 + extra_options: -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 + deps_cmdline: sudo apt update && sudo apt install libsdl2-dev libvpx-dev libgtk-3-dev libwebp-dev + build_type: MinSizeRel + + - name: Linux Clang 11 + os: ubuntu-22.04 + extra_options: -DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11 -DDYN_OPENAL=OFF + deps_cmdline: sudo apt update && sudo apt install clang-11 libsdl2-dev libvpx-dev libopenal-dev libwebp-dev + build_type: Debug + + - name: Linux Clang 15 + os: ubuntu-22.04 + extra_options: -DCMAKE_C_COMPILER=clang-15 -DCMAKE_CXX_COMPILER=clang++-15 + deps_cmdline: sudo apt update && sudo apt install clang-15 libsdl2-dev libvpx-dev libwebp-dev + build_type: Release + + steps: + - uses: actions/checkout@v4 + + - name: Install Dependencies + shell: bash + run: | + if [[ -n "${{ 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 [[ -n "${ZMUSIC_PACKAGE}" ]]; then + cd build + wget -q "https://github.com/coelckers/gzdoom/releases/download/ci_deps/${ZMUSIC_PACKAGE}" + tar -xf "${ZMUSIC_PACKAGE}" + fi + + - name: Setup vcpkg + uses: lukka/run-vcpkg@v11 + if: runner.os == 'Windows' + with: + vcpkgDirectory: '${{ github.workspace }}/build/vcpkg' + vcpkgGitCommitId: '2c401863dd54a640aeb26ed736c55489c079323b' + + - name: Configure + shell: bash + run: | + 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@v3 + 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 diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml new file mode 100644 index 0000000000..6f9ebcc3bd --- /dev/null +++ b/AppImageBuilder.yml @@ -0,0 +1,45 @@ +# appimage-builder recipe see https://appimage-builder.readthedocs.io for details +version: 1 +AppDir: + path: ./AppDir + app_info: + id: com.GZDoom.app + name: GZDoom + icon: game_icon.png + version: latest + exec: ./gzdoom + exec_args: $@ + apt: + arch: amd64 + allow_unauthenticated: true + sources: + - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy main restricted + - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted + include: [] + files: + include: [] + exclude: + - usr/share/man + - usr/share/doc/*/README.* + - usr/share/doc/*/changelog.* + - usr/share/doc/*/NEWS.* + - usr/share/doc/*/TODO.* + test: + fedora-30: + image: appimagecrafters/tests-env:fedora-30 + command: ./AppRun + debian-stable: + image: appimagecrafters/tests-env:debian-stable + command: ./AppRun + archlinux-latest: + image: appimagecrafters/tests-env:archlinux-latest + command: ./AppRun + centos-7: + image: appimagecrafters/tests-env:centos-7 + command: ./AppRun + ubuntu-xenial: + image: appimagecrafters/tests-env:ubuntu-xenial + command: ./AppRun +AppImage: + arch: x86_64 + update-information: guess diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b4c0792d2..94101d28a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOS set(VCPKG_TARGET_TRIPLET "x64-windows-static") endif() -project(VkDoom) +project(GZDoom) if (WIN32 AND VCPKG_TOOLCHAIN) option(LIBVPX_VCPKG "Use libvpx from vcpkg" OFF) @@ -155,7 +155,7 @@ IF( NOT CMAKE_BUILD_TYPE ) ENDIF() set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created." ) -set( ZDOOM_EXE_NAME "vkdoom" CACHE FILEPATH "Name of the executable to create" ) +set( ZDOOM_EXE_NAME "gzdoom" CACHE FILEPATH "Name of the executable to create" ) if( MSVC ) # Allow the user to use ZDOOM_OUTPUT_DIR as a single release point. # Use zdoom, zdoomd, zdoom64, and zdoomd64 for the binary names diff --git a/README.md b/README.md index a0ea1d01ce..7268877ea3 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,28 @@ -## Welcome to VkDoom! +# Welcome to GZDoom! -VkDoom is a source port based on the DOOM engine with a focus on Vulkan and modern computers. +[![Continuous Integration](https://github.com/ZDoom/gzdoom/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/ZDoom/gzdoom/actions/workflows/continuous_integration.yml) -Please see license files for individual contributor licenses. +## GZDoom is a modder-friendly OpenGL and Vulkan source port based on the DOOM engine -Visit our [website](https://vkdoom.org) for more details. +Copyright (c) 1998-2023 ZDoom + GZDoom teams, and contributors + +Doom Source (c) 1997 id Software, Raven Software, and contributors + +Please see license files for individual contributor licenses + +Special thanks to Coraline of the EDGE team for allowing us to use her [README.md](https://github.com/3dfxdev/EDGE/blob/master/README.md) as a template for this one. ### Licensed under the GPL v3 ##### https://www.gnu.org/licenses/quick-guide-gplv3.en.html +--- + +## How to build GZDoom + +To build GZDoom, please see the [wiki](https://zdoom.org/wiki/) and see the "Programmer's Corner" on the bottom-right corner of the page to build for your platform. + +# Resources +- https://zdoom.org/ - Home Page +- https://forum.zdoom.org/ - Forum +- https://zdoom.org/wiki/ - Wiki +- https://dsc.gg/zdoom - Discord Server +- https://docs.google.com/spreadsheets/d/1pvwXEgytkor9SClCiDn4j5AH7FedyXS-ocCbsuQIXDU/edit?usp=sharing - Translation sheet (Google Docs) diff --git a/src/am_map.cpp b/src/am_map.cpp index 856ec7e049..4c4f29cbe7 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -132,8 +132,8 @@ struct islope_t CVAR(Bool, am_textured, true, CVAR_ARCHIVE) CVAR(Float, am_linealpha, 1.0f, CVAR_ARCHIVE) -CVAR(Int, am_linethickness, 2, CVAR_ARCHIVE) -CVAR(Int, am_lineantialiasing, 1, CVAR_ARCHIVE) +CVAR(Int, am_linethickness, 1, CVAR_ARCHIVE) +CVAR(Int, am_lineantialiasing, 0, CVAR_ARCHIVE) CVAR(Bool, am_thingrenderstyles, true, CVAR_ARCHIVE) CVAR(Int, am_showsubsector, -1, 0); diff --git a/src/common/platform/win32/i_mainwindow.cpp b/src/common/platform/win32/i_mainwindow.cpp index d043417c04..7b7b086a52 100644 --- a/src/common/platform/win32/i_mainwindow.cpp +++ b/src/common/platform/win32/i_mainwindow.cpp @@ -55,7 +55,7 @@ void MainWindow::Create(const FString& caption, int x, int y, int width, int hei WS_EX_APPWINDOW, WinClassName, wcaption.c_str(), - WS_OVERLAPPEDWINDOW/* | WS_VISIBLE*/ | WS_CLIPCHILDREN, + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN, x, y, width, height, (HWND)NULL, (HMENU)NULL, diff --git a/src/common/rendering/hwrenderer/data/hw_cvars.cpp b/src/common/rendering/hwrenderer/data/hw_cvars.cpp index 94f65e1429..0b3e634b38 100644 --- a/src/common/rendering/hwrenderer/data/hw_cvars.cpp +++ b/src/common/rendering/hwrenderer/data/hw_cvars.cpp @@ -120,7 +120,7 @@ CUSTOM_CVARD(Float, gl_texture_filter_anisotropic, 8.f, CVAR_ARCHIVE | CVAR_GLOB screen->SetTextureFilterMode(); } -CUSTOM_CVARD(Int, gl_texture_filter, 6, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "changes the texture filtering settings") +CUSTOM_CVARD(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "changes the texture filtering settings") { if (self < 0 || self > 6) self=4; screen->SetTextureFilterMode(); diff --git a/src/common/startscreen/endoom.cpp b/src/common/startscreen/endoom.cpp index d5e371a528..4a7565dbc6 100644 --- a/src/common/startscreen/endoom.cpp +++ b/src/common/startscreen/endoom.cpp @@ -67,7 +67,7 @@ // PUBLIC DATA DEFINITIONS ------------------------------------------------- -CUSTOM_CVAR(Int, showendoom, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) +CUSTOM_CVAR(Int, showendoom, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) { if (self < 0) self = 0; else if (self > 2) self=2; diff --git a/src/common/statusbar/base_sbar.cpp b/src/common/statusbar/base_sbar.cpp index 3b1029c651..95719632bb 100644 --- a/src/common/statusbar/base_sbar.cpp +++ b/src/common/statusbar/base_sbar.cpp @@ -59,8 +59,8 @@ IMPLEMENT_CLASS(DHUDFont, false, false); CVAR(Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE); CVAR(Int, crosshairhealth, 2, CVAR_ARCHIVE); -CVARD(Float, crosshairscale, 0.2f, CVAR_ARCHIVE, "changes the size of the crosshair"); -CVAR(Bool, crosshairgrow, true, CVAR_ARCHIVE); +CVARD(Float, crosshairscale, 0.3f, CVAR_ARCHIVE, "changes the size of the crosshair"); +CVAR(Bool, crosshairgrow, false, CVAR_ARCHIVE); CUSTOM_CVARD(Float, hud_scalefactor, 1.f, CVAR_ARCHIVE, "changes the hud scale") { diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp index d6f387046f..51c6e0dc02 100644 --- a/src/d_netinfo.cpp +++ b/src/d_netinfo.cpp @@ -54,7 +54,7 @@ static FRandom pr_pickteam ("PickRandomTeam"); -CVAR (Float, autoaim, 0.f, CVAR_USERINFO | CVAR_ARCHIVE); +CVAR (Float, autoaim, 35.f, CVAR_USERINFO | CVAR_ARCHIVE); CVAR (String, name, "Player", CVAR_USERINFO | CVAR_ARCHIVE); CVAR (Color, color, 0x40cf00, CVAR_USERINFO | CVAR_ARCHIVE); CVAR (Int, colorset, 0, CVAR_USERINFO | CVAR_ARCHIVE); diff --git a/src/g_game.cpp b/src/g_game.cpp index 8a20b76a54..9f3611a30e 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -201,7 +201,7 @@ int lookspeed[2] = {450, 512}; #define SLOWTURNTICS 6 -CVAR (Bool, cl_run, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always run? +CVAR (Bool, cl_run, true, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always run? CVAR (Bool, freelook, true, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always mlook? CVAR (Bool, lookstrafe, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always strafe with mouse? CVAR (Float, m_forward, 1.f, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) diff --git a/src/g_level.cpp b/src/g_level.cpp index 5231baab52..557662f434 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -1854,7 +1854,11 @@ void FLevelLocals::Init() flags |= info->flags; flags2 |= info->flags2; flags3 |= info->flags3; +#ifdef UNFRIEBDLY_OPTIONS vkdflags |= info->vkdflags; +#else + vkdflags = 0; +#endif levelnum = info->levelnum; Music = info->Music; musicorder = info->musicorder; diff --git a/src/posix/osx/zdoom.icns b/src/posix/osx/zdoom.icns index ad89dfc506..a0df7f5f79 100644 Binary files a/src/posix/osx/zdoom.icns and b/src/posix/osx/zdoom.icns differ diff --git a/src/version.h b/src/version.h index d4257ef084..d583b93dbe 100644 --- a/src/version.h +++ b/src/version.h @@ -41,25 +41,25 @@ const char *GetVersionString(); /** Lots of different version numbers **/ -#define VERSIONSTR "1.0pre" +#define VERSIONSTR "5.0pre" // The version as seen in the Windows resource -#define RC_FILEVERSION 1,0,9999,0 -#define RC_PRODUCTVERSION 1,0,9999,0 +#define RC_FILEVERSION 5,0,9999,0 +#define RC_PRODUCTVERSION 5,0,9999,0 #define RC_PRODUCTVERSION2 VERSIONSTR // These are for content versioning. -#define VER_MAJOR 1 +#define VER_MAJOR 5 #define VER_MINOR 0 #define VER_REVISION 0 // These are for zscript versioning. -#define ZSCRIPT_VER_MAJOR 4 -#define ZSCRIPT_VER_MINOR 12 +#define ZSCRIPT_VER_MAJOR 5 +#define ZSCRIPT_VER_MINOR 0 #define ZSCRIPT_VER_REVISION 0 -// This should always refer to the VkDoom version a derived port is based on and not reflect the derived port's version number! -#define ENG_MAJOR 1 +// This should always refer to the GZDoom version a derived port is based on and not reflect the derived port's version number! +#define ENG_MAJOR 5 #define ENG_MINOR 0 #define ENG_REVISION 0 @@ -97,16 +97,16 @@ const char *GetVersionString(); #define SAVEVER 4560 // This is so that derivates can use the same savegame versions without worrying about engine compatibility -#define GAMESIG "VKDOOM" -#define BASEWAD "vkdoom.pk3" +#define GAMESIG "GZDOOM" +#define BASEWAD "gzdoom.pk3" #define OPTIONALWAD "game_support.pk3" #define GZDOOM 1 #define VR3D_ENABLED // More stuff that needs to be different for derivatives. -#define GAMENAME "VKDoom" -#define WGAMENAME L"VKDoom" -#define GAMENAMELOWERCASE "vkdoom" +#define GAMENAME "GZDoom" +#define WGAMENAME L"GZDoom" +#define GAMENAMELOWERCASE "gzdoom" //#define FORUM_URL "http://forum.zdoom.org/" //#define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2" diff --git a/src/win32/icon1.ico b/src/win32/icon1.ico index bf8c00ce14..4ecc356eb8 100644 Binary files a/src/win32/icon1.ico and b/src/win32/icon1.ico differ diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc index b7c9c6acd2..6f58ad11d9 100644 --- a/src/win32/zdoom.rc +++ b/src/win32/zdoom.rc @@ -172,7 +172,7 @@ CAPTION "Welcome" FONT 10, "Segoe UI", 400, 0, 0x0 BEGIN ICON IDI_ICON1,IDC_STATIC,16,10,18,15 - LTEXT "Welcome to VkDoom!",IDC_STATIC,50,8,180,8 + LTEXT "Welcome to GZDoom!",IDC_STATIC,50,8,180,8 LTEXT "",IDC_WELCOME_VERSION,50,18,180,8 GROUPBOX "IWAD selection",IDC_STATIC,8,32,256,117 LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,16,44,190,8 diff --git a/wadsrc/static/graphics/bootlogo.png b/wadsrc/static/graphics/bootlogo.png index dda16fa046..6bba40e22f 100644 Binary files a/wadsrc/static/graphics/bootlogo.png and b/wadsrc/static/graphics/bootlogo.png differ