reference commit documenting the changes to current vkDoom master

# Conflicts: # .github/workflows/continuous_integration.yml
2024-11-24 13:01:48 +00:00 · 2023-09-17 21:17:23 +02:00 · 2023-09-17 21:17:23 +02:00 · c29c888950
commit c29c888950
parent cfea7404cf
37 changed files with 106 additions and 616 deletions
--- a/.devcontainer/GZDoom.dockerfile
+++ b/.devcontainer/GZDoom.dockerfile
@ -1,16 +0,0 @@
-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
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -1,6 +0,0 @@
-{
-  "build":{ "dockerfile": "GZDoom.dockerfile" },
-  "name": "GZDoom",
-  "features": {
-  }
-}
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -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
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -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
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@ -1,53 +0,0 @@
-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*'
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@ -1,128 +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: -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
--- a/AppImageBuilder.yml
+++ b/AppImageBuilder.yml
@ -1,45 +0,0 @@
-# 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
--- 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(GZDoom)
+project(VkDoom)

 if (WIN32 AND VCPKG_TOOLCHAIN)
 	option(LIBVPX_VCPKG "Use libvpx from vcpkg" OFF)
--- a/README.md
+++ b/README.md
@ -1,28 +1,10 @@
-# Welcome to GZDoom!
+## Welcome to VkDoom!

-[![Continuous Integration](https://github.com/ZDoom/gzdoom/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/ZDoom/gzdoom/actions/workflows/continuous_integration.yml)
+VkDoom is a source port based on the DOOM engine with a focus on Vulkan and modern computers.

-## GZDoom is a modder-friendly OpenGL and Vulkan source port based on the DOOM engine
+Please see license files for individual contributor licenses.

-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.
+Visit our [website](https://vkdoom.org) for more details.

 ### 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)
--- a/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h
+++ b/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h
@ -121,7 +121,6 @@ for user-defined purpose without allocating any real GPU memory.
 See documentation chapter: \ref statistics.
 */

-
 #ifdef __cplusplus
 #include <cstdio>
 extern "C" {
--- a/soundfont/vkdoom.sf2
+++ b/soundfont/vkdoom.sf2
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -1338,7 +1338,7 @@ endif()

 add_custom_command(TARGET zdoom POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
-	${CMAKE_SOURCE_DIR}/soundfont/gzdoom.sf2 $<TARGET_FILE_DIR:zdoom>/soundfonts/gzdoom.sf2
+	${CMAKE_SOURCE_DIR}/soundfont/vkdoom.sf2 $<TARGET_FILE_DIR:zdoom>/soundfonts/vkdoom.sf2
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
 	${CMAKE_SOURCE_DIR}/fm_banks/GENMIDI.GS.wopl $<TARGET_FILE_DIR:zdoom>/fm_banks/GENMIDI.GS.wopl
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
@ -1377,7 +1377,7 @@ if( APPLE )
 	set_target_properties(zdoom PROPERTIES
 		LINK_FLAGS "${LINK_FRAMEWORKS}"
 		MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/posix/osx/zdoom-info.plist"
-		XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.drdteam.gzdoom"
+		XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.vkdoom.vkdoom"
 		XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" )

 	# Dymanic libraries like libvulkan.dylib or libMoltenVK.dylib will be loaded by dlopen()
--- 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, 1, CVAR_ARCHIVE)
-CVAR(Int, am_lineantialiasing, 0, CVAR_ARCHIVE)
+CVAR(Int, am_linethickness, 2, CVAR_ARCHIVE)
+CVAR(Int, am_lineantialiasing, 1, CVAR_ARCHIVE)
 CVAR(Bool, am_thingrenderstyles, true, CVAR_ARCHIVE)
 CVAR(Int, am_showsubsector, -1, 0);

@ -1547,13 +1547,11 @@ void DAutomap::Ticker ()
 	if (!automapactive)
 		return;

-#ifdef UNFRIENDLY_OPTIONS
-	if ((primaryLevel->flags9 & LEVEL9_NOAUTOMAP))
+	if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOAUTOMAP))
 	{
 		AM_ToggleMap();
 		return;
 	}
-#endif

 	amclock++;
 }
@ -3457,10 +3455,8 @@ void AM_ToggleMap()
 	if (!primaryLevel || !primaryLevel->automap)
 		return;

-#ifdef UNFRIENDLY_OPTIONS
-	if (!automapactive && (primaryLevel->flags9 & LEVEL9_NOAUTOMAP))
+	if (!automapactive && (primaryLevel->vkdflags & VKDLEVELFLAG_NOAUTOMAP))
 		return;
-#endif

 	if (!automapactive)
 	{
--- a/src/common/menu/menu.cpp
+++ b/src/common/menu/menu.cpp
@ -64,7 +64,7 @@ CVAR (Int, m_showinputgrid, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, m_blockcontrollers, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)

 CVAR (Float, snd_menuvolume, 0.6f, CVAR_ARCHIVE)
-CVAR(Int, m_use_mouse, 2, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+CVAR(Int, m_use_mouse, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Int, m_show_backbutton, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Bool, m_cleanscale, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 // Option Search
--- 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, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "changes the texture filtering settings")
+CUSTOM_CVARD(Int, gl_texture_filter, 6, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "changes the texture filtering settings")
 {
 	if (self < 0 || self > 6) self=4;
 	screen->SetTextureFilterMode();
--- a/src/common/startscreen/endoom.cpp
+++ b/src/common/startscreen/endoom.cpp
@ -67,7 +67,7 @@

 // PUBLIC DATA DEFINITIONS -------------------------------------------------

-CUSTOM_CVAR(Int, showendoom, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+CUSTOM_CVAR(Int, showendoom, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 {
 	if (self < 0) self = 0;
 	else if (self > 2) self=2;
--- 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.3f, CVAR_ARCHIVE, "changes the size of the crosshair");
-CVAR(Bool, crosshairgrow, false, CVAR_ARCHIVE);
+CVARD(Float, crosshairscale, 0.2f, CVAR_ARCHIVE, "changes the size of the crosshair");
+CVAR(Bool, crosshairgrow, true, CVAR_ARCHIVE);

 CUSTOM_CVARD(Float, hud_scalefactor, 1.f, CVAR_ARCHIVE, "changes the hud scale")
 {
--- a/src/console/c_cmds.cpp
+++ b/src/console/c_cmds.cpp
@ -700,13 +700,11 @@ UNSAFE_CCMD (load)

 UNSAFE_CCMD(save)
 {
-#ifdef UNFRIENDLY_OPTIONS
-	if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
+	if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
 	{
 		Printf("%s\n", GStrings("SAVEDEAD"));
 		return;
 	}
-#endif

 	if (argv.argc() < 2 || argv.argc() > 3 || argv[1][0] == 0)
 	{
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@ -3998,6 +3998,22 @@ void I_UpdateWindowTitle()
 	I_SetWindowTitle(copy.Data());
 }

+CCMD(fs_dir)
+{
+	int numfiles = fileSystem.GetNumEntries();
+
+	for (int i = 0; i < numfiles; i++)
+	{
+		auto container = fileSystem.GetResourceFileFullName(fileSystem.GetFileContainer(i));
+		auto fn1 = fileSystem.GetFileFullName(i);
+		auto fns = fileSystem.GetFileShortName(i);
+		auto fnid = fileSystem.GetResourceId(i);
+		auto length = fileSystem.FileLength(i);
+		bool hidden = fileSystem.FindFile(fn1) != i;
+		Printf(PRINT_HIGH | PRINT_NONOTIFY, "%s%-64s %-15s (%5d) %10d %s %s\n", hidden ? TEXTCOLOR_RED : TEXTCOLOR_UNTRANSLATED, fn1, fns, fnid, length, container, hidden ? "(h)" : "");
+	}
+}
+
 #ifdef _WIN32
 // For broadest GL compatibility, require user to explicitly enable quad-buffered stereo mode.
 // Setting vr_enable_quadbuffered_stereo does not automatically invoke quad-buffered stereo,
@ -4030,19 +4046,3 @@ void UpdateVRModes(bool considerQuadBuffered)
 	}
 	vals = filteredValues;
 }
-
-CCMD(fs_dir)
-{
-	int numfiles = fileSystem.GetNumEntries();
-
-	for (int i = 0; i < numfiles; i++)
-	{
-		auto container = fileSystem.GetResourceFileFullName(fileSystem.GetFileContainer(i));
-		auto fn1 = fileSystem.GetFileFullName(i);
-		auto fns = fileSystem.GetFileShortName(i);
-		auto fnid = fileSystem.GetResourceId(i);
-		auto length = fileSystem.FileLength(i);
-		bool hidden = fileSystem.FindFile(fn1) != i;
-		Printf(PRINT_HIGH | PRINT_NONOTIFY, "%s%-64s %-15s (%5d) %10d %s %s\n", hidden ? TEXTCOLOR_RED : TEXTCOLOR_UNTRANSLATED, fn1, fns, fnid, length, container, hidden ? "(h)" : "");
-	}
-}
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@ -54,7 +54,7 @@

 static FRandom pr_pickteam ("PickRandomTeam");

-CVAR (Float,	autoaim,				35.f,		CVAR_USERINFO | CVAR_ARCHIVE);
+CVAR (Float,	autoaim,				0.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);
--- 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,			true,	CVAR_GLOBALCONFIG|CVAR_ARCHIVE)		// Always run?
+CVAR (Bool,		cl_run,			false,	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)
@ -2197,10 +2197,8 @@ CUSTOM_CVAR (Int, quicksaverotationcount, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

 void G_DoAutoSave ()
 {
-#ifdef UNFRIENDLY_OPTIONS
-	if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
+	if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
 		return;
-#endif

 	FString description;
 	FString file;
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@ -1521,11 +1521,9 @@ void FLevelLocals::DoLoadLevel(const FString &nextmapname, int position, bool au
 	DoDeferedScripts ();	// [RH] Do script actions that were triggered on another map.
 	

-#ifdef UNFRIENDLY_OPTIONS
 	// [Nash] allow modder control of autosaving
 	if (changeflags & CHANGELEVEL_NOAUTOSAVE)
 		autosave = false;
-#endif

 	// [RH] Always save the game when entering a new 
 	if (autosave && !savegamerestore && disableautosave < 1)
@ -1807,7 +1805,7 @@ void FLevelLocals::Init()
 	flags = 0;
 	flags2 = 0;
 	flags3 = 0;
-	flags9 = 0;
+	vkdflags = 0;
 	ImpactDecalCount = 0;
 	frozenstate = 0;

@ -1856,7 +1854,7 @@ void FLevelLocals::Init()
 	flags |= info->flags;
 	flags2 |= info->flags2;
 	flags3 |= info->flags3;
-	flags9 |= info->flags9;
+	vkdflags |= info->vkdflags;
 	levelnum = info->levelnum;
 	Music = info->Music;
 	musicorder = info->musicorder;
--- a/src/g_levellocals.h
+++ b/src/g_levellocals.h
@ -605,7 +605,8 @@ public:
 	uint32_t		flags;
 	uint32_t		flags2;
 	uint32_t		flags3;
-	uint32_t		flags9;
+
+	uint32_t		vkdflags;

 	uint32_t		fadeto;					// The color the palette fades to (usually black)
 	uint32_t		outsidefog;				// The fog for sectors with sky ceilings
--- a/src/gamedata/g_mapinfo.cpp
+++ b/src/gamedata/g_mapinfo.cpp
@ -250,7 +250,7 @@ void level_info_t::Reset()
 	else
 		flags2 = LEVEL2_LAXMONSTERACTIVATION;
 	flags3 = 0;
-	flags9 = 0;
+	vkdflags = 0;
 	Music = "";
 	LevelName = "";
 	AuthorName = "";
@ -1695,9 +1695,9 @@ enum EMIType
 	MITYPE_SETFLAG3,
 	MITYPE_CLRFLAG3,
 	MITYPE_SCFLAGS3,
-	MITYPE_SETFLAG9,
-	MITYPE_CLRFLAG9,
-	MITYPE_SCFLAGS9,
+	MITYPE_SETVKDFLAG,
+	MITYPE_CLRVKDFLAG,
+	MITYPE_SCVKDFLAGS,
 	MITYPE_COMPATFLAG,
 	MITYPE_CLRCOMPATFLAG,
 };
@ -1796,9 +1796,6 @@ MapFlagHandlers[] =
 	{ "nolightfade",					MITYPE_SETFLAG3,	LEVEL3_NOLIGHTFADE, 0 },
 	{ "nocoloredspritelighting",		MITYPE_SETFLAG3,	LEVEL3_NOCOLOREDSPRITELIGHTING, 0 },
 	{ "forceworldpanning",				MITYPE_SETFLAG3,	LEVEL3_FORCEWORLDPANNING, 0 },
-	{ "nousersave",						MITYPE_SETFLAG9,	LEVEL9_NOUSERSAVE, 0 },
-	{ "noautomap",						MITYPE_SETFLAG9,	LEVEL9_NOAUTOMAP, 0 },
-	{ "noautosaveonenter",				MITYPE_SETFLAG9,	LEVEL9_NOAUTOSAVEONENTER, 0 },
 	{ "propermonsterfallingdamage",		MITYPE_SETFLAG3,	LEVEL3_PROPERMONSTERFALLINGDAMAGE, 0 },
 	{ "disableshadowmap",				MITYPE_SETFLAG3,	LEVEL3_NOSHADOWMAP, 0 },
 	{ "enableshadowmap",				MITYPE_CLRFLAG3,	LEVEL3_NOSHADOWMAP, 0 },
@ -1806,6 +1803,9 @@ MapFlagHandlers[] =
 	{ "disableskyboxao",				MITYPE_CLRFLAG3,	LEVEL3_SKYBOXAO, 0 },
 	{ "avoidmelee",						MITYPE_SETFLAG3,	LEVEL3_AVOIDMELEE, 0 },
 	{ "attenuatelights",				MITYPE_SETFLAG3,	LEVEL3_ATTENUATE, 0 },
+	{ "nousersave",						MITYPE_SETVKDFLAG,	VKDLEVELFLAG_NOUSERSAVE, 0 },
+	{ "noautomap",						MITYPE_SETVKDFLAG,	VKDLEVELFLAG_NOAUTOMAP, 0 },
+	{ "noautosaveonenter",				MITYPE_SETVKDFLAG,	VKDLEVELFLAG_NOAUTOSAVEONENTER, 0 },
 	{ "nobotnodes",						MITYPE_IGNORE,	0, 0 },		// Skulltag option: nobotnodes
 	{ "nopassover",						MITYPE_COMPATFLAG, COMPATF_NO_PASSMOBJ, 0 },
 	{ "passover",						MITYPE_CLRCOMPATFLAG, COMPATF_NO_PASSMOBJ, 0 },
@ -1960,27 +1960,27 @@ void FMapInfoParser::ParseMapDefinition(level_info_t &info)
 				info.flags3 = (info.flags3 & handler->data2) | handler->data1;
 				break;

-			case MITYPE_SETFLAG9:
+			case MITYPE_SETVKDFLAG:
 				if (!CheckAssign())
 				{
-					info.flags9 |= handler->data1;
+					info.vkdflags |= handler->data1;
 				}
 				else
 				{
 					sc.MustGetNumber();
-					if (sc.Number) info.flags9 |= handler->data1;
-					else info.flags9 &= ~handler->data1;
+					if (sc.Number) info.vkdflags |= handler->data1;
+					else info.vkdflags &= ~handler->data1;
 				}
-				info.flags9 |= handler->data2;
+				info.vkdflags |= handler->data2;
 				break;

-			case MITYPE_CLRFLAG9:
-				info.flags9 &= ~handler->data1;
-				info.flags9 |= handler->data2;
+			case MITYPE_CLRVKDFLAG:
+				info.vkdflags &= ~handler->data1;
+				info.vkdflags |= handler->data2;
 				break;

-			case MITYPE_SCFLAGS9:
-				info.flags9 = (info.flags9 & handler->data2) | handler->data1;
+			case MITYPE_SCVKDFLAGS:
+				info.vkdflags = (info.vkdflags & handler->data2) | handler->data1;
 				break;

 			case MITYPE_CLRCOMPATFLAG:
--- a/src/gamedata/g_mapinfo.h
+++ b/src/gamedata/g_mapinfo.h
@ -271,10 +271,10 @@ enum ELevelFlags : unsigned int
 	LEVEL3_NOJUMPDOWN			= 0x00040000,	// only for MBF21. Inverse of MBF's dog_jumping flag.
 	LEVEL3_LIGHTCREATED			= 0x00080000,	// a light had been created in the last frame

-	// Deliberately skip ahead...
-	LEVEL9_NOUSERSAVE			= 0x00000001,
-	LEVEL9_NOAUTOMAP			= 0x00000002,
-	LEVEL9_NOAUTOSAVEONENTER	= 0x00000004,	// don't make an autosave when entering a map
+	// VKDoom custom flags
+	VKDLEVELFLAG_NOUSERSAVE			= 0x00000001,
+	VKDLEVELFLAG_NOAUTOMAP			= 0x00000002,
+	VKDLEVELFLAG_NOAUTOSAVEONENTER	= 0x00000004,	// don't make an autosave when entering a map
 };


@ -347,7 +347,8 @@ struct level_info_t
 	int32_t		flags;
 	uint32_t	flags2;
 	uint32_t	flags3;
-	uint32_t	flags9;
+
+	uint32_t	vkdflags;

 	FString		Music;
 	FString		LevelName;
--- a/src/menu/doommenu.cpp
+++ b/src/menu/doommenu.cpp
@ -251,13 +251,11 @@ bool M_SetSpecialMenu(FName& menu, int param)
 			return false;
 		}

-#ifdef UNFRIENDLY_OPTIONS
-		if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
+		if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
 		{
 			M_StartMessage(GStrings("SAVEDEAD"), 1);
 			return false;
 		}
-#endif

 		break;

@ -473,7 +471,7 @@ CCMD (quicksave)
 		return;
 	}

-	if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
+	if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
 		return;

 	if (gamestate != GS_LEVEL)
--- a/src/p_saveg.cpp
+++ b/src/p_saveg.cpp
@ -970,7 +970,7 @@ void FLevelLocals::Serialize(FSerializer &arc, bool hubload)
 	arc("flags", flags)
 		("flags2", flags2)
 		("flags3", flags3)
-		("flags9", flags9)
+		("vkdflags", vkdflags)
 		("fadeto", fadeto)
 		("found_secrets", found_secrets)
 		("found_items", found_items)
--- a/src/posix/osx/zdoom.icns
+++ b/src/posix/osx/zdoom.icns
--- a/src/rendering/hwrenderer/scene/hw_sprites.cpp
+++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp
@ -77,10 +77,10 @@ EXTERN_CVAR(Bool, gl_aalines)

 CVAR(Bool, gl_usecolorblending, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, gl_sprite_blend, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
-CVAR(Int, gl_spriteclip, 1, CVAR_ARCHIVE)
+CVAR(Int, gl_spriteclip, 2, CVAR_ARCHIVE)
 CVAR(Float, gl_sclipthreshold, 10.0, CVAR_ARCHIVE)
 CVAR(Float, gl_sclipfactor, 1.8f, CVAR_ARCHIVE)
-CVAR(Int, gl_particles_style, 2, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // 0 = square, 1 = round, 2 = smooth
+CVAR(Int, gl_particles_style, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // 0 = square, 1 = round, 2 = smooth
 CVAR(Int, gl_billboard_mode, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, gl_billboard_faces_camera, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, gl_billboard_particles, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
--- a/src/scripting/vmthunks.cpp
+++ b/src/scripting/vmthunks.cpp
@ -2763,7 +2763,7 @@ DEFINE_FIELD_X(LevelInfo, level_info_t, sucktime)
 DEFINE_FIELD_X(LevelInfo, level_info_t, flags)
 DEFINE_FIELD_X(LevelInfo, level_info_t, flags2)
 DEFINE_FIELD_X(LevelInfo, level_info_t, flags3)
-DEFINE_FIELD_X(LevelInfo, level_info_t, flags9)
+DEFINE_FIELD_X(LevelInfo, level_info_t, vkdflags)
 DEFINE_FIELD_X(LevelInfo, level_info_t, Music)
 DEFINE_FIELD_X(LevelInfo, level_info_t, LevelName)
 DEFINE_FIELD_X(LevelInfo, level_info_t, AuthorName)
@ -2852,8 +2852,8 @@ DEFINE_FIELD_BIT(FLevelLocals, flags2, infinite_flight, LEVEL2_INFINITE_FLIGHT)
 DEFINE_FIELD_BIT(FLevelLocals, flags2, no_dlg_freeze, LEVEL2_CONV_SINGLE_UNFREEZE)
 DEFINE_FIELD_BIT(FLevelLocals, flags2, keepfullinventory, LEVEL2_KEEPFULLINVENTORY)
 DEFINE_FIELD_BIT(FLevelLocals, flags3, removeitems, LEVEL3_REMOVEITEMS)
-DEFINE_FIELD_BIT(FLevelLocals, flags9, nousersave, LEVEL9_NOUSERSAVE)
-DEFINE_FIELD_BIT(FLevelLocals, flags9, noautomap, LEVEL9_NOAUTOMAP)
+DEFINE_FIELD_BIT(FLevelLocals, vkdflags, nousersave, VKDLEVELFLAG_NOUSERSAVE)
+DEFINE_FIELD_BIT(FLevelLocals, vkdflags, noautomap, VKDLEVELFLAG_NOAUTOMAP)

 DEFINE_FIELD_X(Sector, sector_t, floorplane)
 DEFINE_FIELD_X(Sector, sector_t, ceilingplane)
--- a/src/version.h
+++ b/src/version.h
@ -41,25 +41,25 @@ const char *GetVersionString();

 /** Lots of different version numbers **/

-#define VERSIONSTR "5.0pre"
+#define VERSIONSTR "1.0pre"

 // The version as seen in the Windows resource
-#define RC_FILEVERSION 5,0,9999,0
-#define RC_PRODUCTVERSION 5,0,9999,0
+#define RC_FILEVERSION 1,0,9999,0
+#define RC_PRODUCTVERSION 1,0,9999,0
 #define RC_PRODUCTVERSION2 VERSIONSTR

 // These are for content versioning.
-#define VER_MAJOR 5
+#define VER_MAJOR 1
 #define VER_MINOR 0
 #define VER_REVISION 0

 // These are for zscript versioning.
-#define ZSCRIPT_VER_MAJOR 5
-#define ZSCRIPT_VER_MINOR 0
+#define ZSCRIPT_VER_MAJOR 4
+#define ZSCRIPT_VER_MINOR 11
 #define ZSCRIPT_VER_REVISION 0

-// 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
+// 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
 #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 "GZDOOM"
-#define BASEWAD "gzdoom.pk3"
+#define GAMESIG "VKDOOM"
+#define BASEWAD "vkdoom.pk3"
 #define OPTIONALWAD "game_support.pk3"
 #define GZDOOM 1
 #define VR3D_ENABLED

 // More stuff that needs to be different for derivatives.
-#define GAMENAME "GZDoom"
-#define WGAMENAME L"GZDoom"
-#define GAMENAMELOWERCASE "gzdoom"
+#define GAMENAME "VKDoom"
+#define WGAMENAME L"VKDoom"
+#define GAMENAMELOWERCASE "vkdoom"
 //#define FORUM_URL "http://forum.zdoom.org/"
 //#define BUGS_FORUM_URL	"http://forum.zdoom.org/viewforum.php?f=2"

--- a/src/win32/icon1.ico
+++ b/src/win32/icon1.ico
--- a/src/win32/zdoom.rc
+++ b/src/win32/zdoom.rc
@ -69,13 +69,13 @@ BEGIN
    "        BEGIN\r\n"
    "            VALUE ""Comments"", ""Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg.""\r\n"
    "            VALUE ""CompanyName"", "" ""\r\n"
-    "            VALUE ""FileDescription"", ""GZDoom""\r\n"
+    "            VALUE ""FileDescription"", ""VkDoom""\r\n"
    "            VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
-    "            VALUE ""InternalName"", ""GZDoom""\r\n"
-    "            VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
+    "            VALUE ""InternalName"", ""VkDoom""\r\n"
+    "            VALUE ""LegalCopyright"", ""Copyright   1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
    "            VALUE ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
-    "            VALUE ""OriginalFilename"", ""gzdoom.exe""\r\n"
-    "            VALUE ""ProductName"", ""GZDoom""\r\n"
+    "            VALUE ""OriginalFilename"", ""vkdoom.exe""\r\n"
+    "            VALUE ""ProductName"", ""VkDoom""\r\n"
    "            VALUE ""ProductVersion"", GIT_VERSION\r\n"
    "        END\r\n"
    "    END\r\n"
@ -209,7 +209,7 @@ CAPTION "Welcome"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    ICON            IDI_ICON1,IDC_STATIC,7,7,20,20
-    LTEXT           "Welcome to GZDoom!",IDC_STATIC,43,8,180,8
+    LTEXT           "Welcome to VkDoom!",IDC_STATIC,43,8,180,8
    LTEXT           "<Version info>",IDC_WELCOME_VERSION,43,18,180,8
    GROUPBOX        "IWAD selection",IDC_STATIC,8,32,208,117
    LTEXT           "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8
@ -230,7 +230,7 @@ END
 IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
-CAPTION "GZDoom Very Fatal Error"
+CAPTION "VkDoom Very Fatal Error"
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
    CONTROL         "",IDC_CRASHTAB,"SysTabControl32",WS_TABSTOP,4,4,404,280
@ -340,13 +340,13 @@ BEGIN
        BEGIN
            VALUE "Comments", "Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg."
            VALUE "CompanyName", " "
-            VALUE "FileDescription", "GZDoom " GIT_DESCRIPTION
+            VALUE "FileDescription", "VkDoom " GIT_DESCRIPTION
            VALUE "FileVersion", RC_FILEVERSION2
-            VALUE "InternalName", "GZDoom"
-            VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
-            VALUE "LegalTrademarks", "Doom® is a Registered Trademark of id Software, Inc."
-            VALUE "OriginalFilename", "gzdoom.exe"
-            VALUE "ProductName", "GZDoom"
+            VALUE "InternalName", "VkDoom"
+            VALUE "LegalCopyright", "This isn't 1995. Typing a copyright here is silly!"
+            VALUE "LegalTrademarks", "Doom is a Registered Trademark of id Software, Inc."
+            VALUE "OriginalFilename", "vkdoom.exe"
+            VALUE "ProductName", "VkDoom"
            VALUE "ProductVersion", GIT_DESCRIPTION
        END
    END
--- a/wadsrc/CMakeLists.txt
+++ b/wadsrc/CMakeLists.txt
@ -1 +1 @@
-add_pk3(gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
+add_pk3(vkdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
--- a/wadsrc/static/zscript/actors/doom/doommisc.zs
+++ b/wadsrc/static/zscript/actors/doom/doommisc.zs
@ -62,8 +62,7 @@ class BulletPuff : Actor
 		+ALLOWPARTICLES
 		+RANDOMIZE
 		+ZDOOMTRANS
-		RenderStyle "Translucent";
-		Alpha 0.5;
+		+FORCEXYBILLBOARD
 		VSpeed 1;
 		Mass 5;
 	}
@ -73,7 +72,7 @@ class BulletPuff : Actor
 		PUFF A 4 Bright;
 		PUFF B 4;
 	Melee:
-		PUFF CD 4;
+		PUFF CD 4 A_SetRenderStyle(0.7, STYLE_Translucent);
 		Stop;
 	}
 }
--- a/wadsrc/static/zscript/constants.zs
+++ b/wadsrc/static/zscript/constants.zs
@ -1388,9 +1388,9 @@ enum ELevelFlags
 	LEVEL3_NOJUMPDOWN			= 0x00040000,	// only for MBF21. Inverse of MBF's dog_jumping flag.
 	LEVEL3_LIGHTCREATED			= 0x00080000,	// a light had been created in the last frame

-	LEVEL9_NOUSERSAVE			= 0x00000001,
-	LEVEL9_NOAUTOMAP			= 0x00000002,
-	LEVEL9_NOAUTOSAVEONENTER	= 0x00000004,	// don't make an autosave when entering a map
+	VKDLEVELFLAG_NOUSERSAVE			= 0x00000001,
+	VKDLEVELFLAG_NOAUTOMAP			= 0x00000002,
+	VKDLEVELFLAG_NOAUTOSAVEONENTER	= 0x00000004,	// don't make an autosave when entering a map
 };

 // [RH] Compatibility flags.
--- a/wadsrc/static/zscript/doombase.zs
+++ b/wadsrc/static/zscript/doombase.zs
@ -337,7 +337,7 @@ struct LevelInfo native
 	native readonly int flags;
 	native readonly int flags2;
 	native readonly int flags3;
-	native readonly int flags9;
+	native readonly int vkdflags;
 	native readonly String Music;
 	native readonly String LevelName;
 	native readonly String AuthorName;
@ -473,9 +473,8 @@ struct LevelLocals native
 	native readonly int compatflags2;
 	native readonly LevelInfo info;

-	// 'unfriendly' options not accessible by default.
-	//native bool nousersave;
-	//native bool noautomap;
+	native bool nousersave;
+	native bool noautomap;

 	native String GetUDMFString(int type, int index, Name key);
 	native int GetUDMFInt(int type, int index, Name key);