Merge Latest changes from master/ into here

Author: FriskTheFallenHuman

.github/CHANGELOG.md

@@ -14,6 +14,11 @@ Note: Numbers starting with a "#" like #330 refer to the bugreport with that num
   It can also be opened while in the game, which then is paused (if Single Player) but still visible,
   so the effect of most graphics settings can be seen immediately.
   Needs SDL2 and C++11.
+* "Soft" Particles (that don't "cut" into geometry but fade smoothly), based on code from The Dark Mod
+  2.04. Can be enabled/disabled with `r_useSoftParticles`, is applied automatically for all appropriate
+  particles (view-aligned, using additive or alpha blending and not too small)
+* `r_enableDepthCapture`: Enable capturing depth buffer to texture, needed for the soft particles.
+  Can be used in custom materials by using the `"_currentDepth"` texture
 * Replaced dependency on (external) zlib with integrated [miniz](https://github.com/richgel999/miniz)
 * HighDPI/Retina support
 * Allow inverted mouse look (horizontally, vertically or both) with `m_invertLook`
@@ -28,7 +33,18 @@ Note: Numbers starting with a "#" like #330 refer to the bugreport with that num
   downscaling by OpenAL's output limiter
 * If `r_windowResizable` is set, the dhewm3 window (when in windowed mode..) can be freely resized.
   Needs SDL2; with 2.0.5 and newer it's applied immediately, otherwise when creating the window.
-
+* If switching between fullscreen and windowed mode or similar changes causes issues (like
+  [here](https://github.com/dhewm/dhewm3/issues/587#issuecomment-2205807989)), you can set
+  `r_vidRestartAlwaysFull 1`, so (again) a full `vid_restart` is done, instead of the partial one
+  which *usually* suffices for just changing the resolution or fullscreen state. If you run into that
+  issue (probably a driver bug), you'll probably also want to set `r_windowResizable 0`, because
+  resizing the window that way also triggered the bug, and in that case no `vid_restart` is done at all
+* Fixed screenshots when using native Wayland (`SDL_VIDEODRIVER=wayland`)
+* If you enter the `map` command in the console, without any arguments, the current map name is printed
+* Support OpenGL debug contexts and messages (`GL_ARB_debug_output`). Can be enabled with `r_glDebugContext 1`.
+  Changing that CVar requires a `vid_restart` (or set it as startup argument)
+* The Mods Menu's entries for the base game and d3xp/RoE are now clearer, and it can load the new
+  d3xp-based mods (sikkmodd3xp, perfected_roe)
 
 1.5.3 (2024-03-29)
 ------------------------------------------------------------------------

.github/CONFIGURATION.md

@@ -18,7 +18,7 @@ useful commandline arguments, for example how to tell dhewm3 where the game data
 
 When built with [Dear ImGui](https://github.com/ocornut/imgui) integration (which is the default
 when using SDL2), dhewm3 has an advanced settings menu with many settings that the main menu doesn't
-offer, including a *Control BIndings* menu that supports as many keys per command as you want and is
+offer, including a *Control Bindings* menu that supports as many keys per command as you want and is
 fully navigable with keyboard or gamepad (or mouse, of course).
 
 Unless you have already bound your `F10` key to something else, it will open this menu.  
@@ -210,9 +210,18 @@ This can be configured with the following CVars:
   at the end of each frame. Needed at least when using Wayland.  
   `1`: do this, `0`: don't do it, `-1`: let dhewm3 decide (default)
 
+- `r_useSoftParticles` Soften particle transitions when player walks through them or they cross solid geometry.
+   Needs r_enableDepthCapture. Can slow down rendering! `1`: enable (default), `0`: disable
+- `r_enableDepthCapture` Enable capturing depth buffer to texture. `0`: disable, `1`: enable,  
+  `-1`: enable automatically (if soft particles are enabled; the default).   
+   This can be used in custom materials with the "_currentDepth" texture.
+- `r_gammaInShader` If set to `1` (the default), gamma and brightness are applied in shaders
+   instead of using hardware gamma. May cause visual glitches with some mods like Sikkmod.
 - `r_useCarmacksReverse` Use Z-Fail ("Carmack's Reverse") when rendering shadows (default `1`)
 - `r_useStencilOpSeparate` Use glStencilOpSeparate() (if available) when rendering shadow (default `1`)
 - `r_scaleMenusTo43` Render full-screen menus in 4:3 by adding black bars on the left/right if necessary (default `1`)
+- `r_glDebugContext` Enable OpenGL debug context and printing warnings/errors from the graphics driver.  
+  Changing that CVar requires a `vid_restart` (or set it as startup argument)
 
 - `s_alReverbGain` reduce strength of OpenAL (EAX-like) EFX reverb effects, `0.0` - `1.0` (default `0.5`)
 - `s_alHRTF` Enable [HRTF](https://en.wikipedia.org/w/index.php?title=Head-related_transfer_function)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Report a problem with dhewm3
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- NOTE: Please check the existing bug reports first to find out if it has already been reported. In that case, just add a comment there with your additional information -->
+
+**Describe the bug**
+A short description of what the bug is.
+
+**Your System**
+- What **operating system** are you using, what CPU and GPU, which GPU driver version?
+- What **version of dhewm3** are you using? (Also: Official download? Package from Linux distro? MacSourcePorts? Did you compile yourself?)
+
+**To Reproduce**
+Describe how to reproduce the bug
+- if it happens while playing: What mod (base game, RoE, or some 3rd-party mod), which level, what do you do there to trigger the bug
+    - After opening the console (`Shift`+`Esc`) you can enter `map` to print the current map name and `where` to print the coordinates in the level
+- if it happens in the menu or similar: describe the steps to trigger the bug
+
+**Expected and actual behavior**
+A clear and concise description of what you expected to happen and what happens instead
+
+**Additional information**
+If applicable, add screenshots or a video to help explain your problem.
+Please attach [dhewm3log.txt](https://github.com/dhewm/dhewm3/wiki/FAQ#where-do-i-find-the-config-files-and-savegames-and-dhewm3logtxt)
+A **savegame** also often helps to more quickly reproduce a bug

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for dhewm3
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- NOTE: Please check the existing feature requests first to see if it has already been reported. In that case, just add a comment there with your additional information/ideas -->
+
+**Describe the feature you want**
+A clear and concise description of what the feature is supposed to do.
+Add screenshots or illustrations or whatever if you think it helps explaining.
+
+**What problem does it solve?**
+Describe what problem the feature would solve, or how it would improve the game and,
+if a similar feature already exists, why it's not sufficient.
+
+**Additional information**
+If you have ideas how it could be implemented, or what other open source projects to check out that already have the feature, or links with information about the feature or any other additional information, post it here.

.github/README.md

@@ -1,4 +1,11 @@
-# DOOM 3 Modding Kit
+<p align="center">
+  <img src="https://github.com/FriskTheFallenHuman/D3ModdingKit/blob/master/.github/branding/logo.png?raw=true" alt="The logo, what else do you expected?"/>
+</p>
+
+[![](https://dcbadge.limes.pink/api/server/https://discord.gg/fEehA3hCTg?style=flat)](https://discord.gg/fEehA3hCTg) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) ![C++](https://img.shields.io/badge/c++-%2300599C.svg?style=flat&logo=c%2B%2B&logoColor=white) ![Windows](https://img.shields.io/badge/Windows-0078D6?style=flat&logo=windows&logoColor=white) ![Linux](https://img.shields.io/badge/Linux-FCC624?flat&logo=linux&logoColor=black) ![macOS](https://img.shields.io/badge/mac%20os-000000?style=flat&logo=macos&logoColor=F0F0F0) ![GitHub Repo stars](https://img.shields.io/github/stars/FriskTheFallenHuman/D3ModdingKit?style=flat&logo=Github) [![Building](https://github.com/FriskTheFallenHuman/D3ModdingKit/actions/workflows/build_baker.yml/badge.svg)](https://github.com/FriskTheFallenHuman/D3ModdingKit/actions/workflows/build_baker.yml)
+
+
+# About
 
 Doom 3 Modding Kit is basically a kit oriented for modders and people that wants to make total conversion mods.
 
@@ -10,7 +17,7 @@ This fork is base on Defunk's MD5 changes for D3Quest such has:
 - Binary Animations
 - PNG has default image format
 - Mikktspace
-- ImGUI
+- ImGui
 
 # CHANGES
 
@@ -43,12 +50,39 @@ Compared to the original _dhewm 3_, the changes of _D3Modding Kit_ worth mention
     - Restore Command List windows.
   - Added Background music support for maps.
   - Added More Console Information.
-  - Quake 1 Style ligth styles.
   - Ambient Music for maps.
 - The Dark Mod / Hardcorps
   - Re-implemented water system
+- IcedTech3:
+  - Removed legacy lighttris generation code.
+  - Deprecated legacy async thread.
+  - Fixed a bug were DoomEdit would have slow performance.
+  - IceTech3: Fixed Particle Editor crashing when creating a new particle.
+  - Fixed Multiplayer Not working after Async Removal.
+  - Moved sound async to a separate thread.
+  - Added OBJ support.
+  - Moved AASfile to libs to match QuakeWars.
+  - brush_t renamed to idEditorBrush and entity_t idEditorEntity.
+  - Brushes will now be a single idRenderModel rather then each side of a brush also having its own render model.
+  - Varius Changes for DoomEdit:
+    * Added Proper Camera look for camera preview.
+    * Surface properties are now accessed from the M key.
+    * Camera movement is now based on delta time, and controled by radiant_cameraMoveSpeed.
+    * Added grid lines.
+  - Fixed a performance were idInteraction would allocate and link for objects that weren't in the light views frustum.
+  - Fixed a bug were timing would be incorrect in loading screens.
+  - Created native versions of all AI_events and then new script functions to call the new native events.
+  - Moved Weapon DoomScript native functions so they can be called in native and just in doomscript.
+  - Added AnimatedEntity.cpp/h moved that from Entity.cpp/h
+  - idAnimState moved to AnimState.cpp/h
+  - Seperated idEntity doomscript functions so they can be called in native.
+  - Seperated DoomScript from idActor so it can be used with native.
+  - Re-Added MayaImport:
+    * Supports Maya SDK 2019 up to 2025 (2019 Below is untested)
+  - Gamesys integration from Quake 4/Quake Wars. Prevents dead stripping, and new state management code.
+- com.n0n3m4.diii4a:
+  - Quake 4's map base .reverb config files for maps + default .efx for maps that lacks it.
 - Original Changes:
-  - Restore Quake 3 Style console base on left overs in the files.
   - Support for source engine skyboxes base on StormEngine2 Changes.
   - fixed noSpecular flag for lights Base on a dhewn3 rejected PR.
   - Enable Common Controls theme engine for the tools.
@@ -59,7 +93,18 @@ Compared to the original _dhewm 3_, the changes of _D3Modding Kit_ worth mention
   - Set gui_mediumFontLimit and gui_smallFontLimit to "0"
   - Added Missing Material Editor models.
   - Added .guide Support from Quake 4.
-  - Refactored MFC Tools
+  - Refactored MFC Tools.
+  - Backported fixes from d3xp and merge missed changes in d3xp/ from base/
+  - Backported Water bullet impact from RoE ( see Examples/ folder for the water particle)
+  - Made the player be in thirdperson when they die in multiplayer.
+  - Rename g_showPlayerShadow to g_showExtraShadows and make it default.
+  - Added decl_warn_duplicates so warnings about duplicated entries are hide.
+  - Removed TakeNotes system.
+  - Added doxygen support.
+  - Improved GUIEditor base on the idtech4sdk project.
+  - Restored "mphud" keyvalue in player.def
+  - Remove unused game over gui file.
+  - Added blender model I/O scripts.
 
 See [Changelog](./CHANGELOG.md) for the original dhewn3 changelog.
 
@@ -73,4 +118,14 @@ Additionally to the [Compiling instructions](./COMPILING.md) we use vcpkg for th
 
 ## License
 
-The GNU License can be see here [GNU License](./LICENSE.md) the same goes for the original [DOOM 3 License](./LICENSE_DOOM3.md).
+The GNU License can be see here [GNU License](./LICENSE.md) the same goes for the original [DOOM 3 License](./LICENSE_DOOM3.md).
+
+## Special thanks
+
+Special thanks to everybody who did previous help on the making of Dhewm3 and D3Modding Kit:
+
+<p align="center">
+  <a href="https://github.com/FriskTheFallenHuman/D3ModdingKit/graphs/contributors">
+    <img src="https://contrib.rocks/image?repo=FriskTheFallenHuman/D3ModdingKit" />
+  </a>
+</p>

.github/branding/logo.png

@@ -11,33 +11,22 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-
-      - name: Import GPG
-        uses: crazy-max/ghaction-import-gpg@v5
-        with:
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-          git_tag_gpgsign: true
-          git_committer_name: ${{ env.USER_GIT_NAME }}
-          git_committer_email: ${{ env.USER_GIT_EMAIL }}
-        env:
-          USER_GIT_NAME: ${{ secrets.USER_GIT_NAME }}
-          USER_GIT_EMAIL: ${{ secrets.USER_GIT_EMAIL }}
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.PASSPHRASE }}
 
       - name: Keep up with master
         id: get_commit_id
         run: |
           cd vcpkg
+          git checkout --end-of-options master --
           git pull origin master
           echo "::set-output name=commit_id::$(git rev-parse HEAD)"
 
-      - name: Git commit
+      - name: Commit it
         run: |
-          git config --global commit.gpgsign true
-          git config --global user.email "${{ env.USER_GIT_EMAIL }}"
-          git config --global user.name "{{ env.USER_GIT_NAME }}"
-          git add vcpkg
-          git commit -S -m "Update VCPKG to ${{ steps.get_commit_id.outputs.commit_id }}"
-          git push
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git commit -m "Update VCPKG to ${{steps.get_commit_id.outputs.commit_id}}" -a
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}

.github/workflows/auto-update-vcpkg.yml

@@ -0,0 +1,99 @@
+name: Making a Build
+on: push
+
+jobs:
+  job:
+    name: ${{ matrix.os }}-build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Download dependencies
+        if: matrix.os == 'ubuntu-latest' 
+        run: sudo apt install build-essential pkgconf autoconf libtool libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libibus-1.0-dev libglfw3-dev libgl1-mesa-dev libglu1-mesa-dev
+
+      - name: Get latest CMake if possible
+        uses: lukka/get-cmake@latest
+
+      - name: Restore from cache and setup vcpkg executable and data files.
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgDirectory: '${{github.workspace}}/vcpkg'
+          runVcpkgInstall: true
+          vcpkgJsonGlob: '**/neo/vcpkg.json'
+
+      - name: Run CMake+vcpkg+Ninja to build the engine.
+        uses: lukka/run-cmake@v10
+        with:
+          cmakeListsTxtPath: '${{github.workspace}}/neo/CMakeLists.txt'
+          configurePreset: 'ninja-multi-vcpkg'
+          buildPreset: 'ninja-vcpkg-release'
+
+      - name: Lower case runner.os
+        if: matrix.os != 'windows-latest'
+        id: runner_os
+        uses: Entepotenz/change-string-case-action-min-dependencies@v1.1.0
+        with:
+          string: ${{runner.os}}
+
+      - name: Copy base files to ${{steps.runner_os.outputs.lowercase}}/
+        if: matrix.os != 'windows-latest'
+        shell: pwsh
+        run: |
+          cd ${{github.workspace}}
+          Copy-Item -Path "output/base" -Destination "output/${{steps.runner_os.outputs.lowercase}}/base" -Recurse
+          Copy-Item -Path "output/d3xp" -Destination "output/${{steps.runner_os.outputs.lowercase}}/d3xp" -Recurse
+          Copy-Item -Path "output/libs" -Destination "output/${{steps.runner_os.outputs.lowercase}}/libs" -Recurse
+          Copy-Item -Path "output/examples" -Destination "output/${{steps.runner_os.outputs.lowercase}}/examples" -Recurse
+          Copy-Item -Path "blender" -Destination "output/${{steps.runner_os.outputs.lowercase}}/blender" -Recurse
+          Copy-Item -Path ".github/CHANGELOG.md" -Destination "output/${{steps.runner_os.outputs.lowercase}}"
+          Copy-Item -Path ".github/CONFIGURATION.md" -Destination "output/${{steps.runner_os.outputs.lowercase}}"
+          Copy-Item -Path ".github/LICENSE.md" -Destination "output/${{steps.runner_os.outputs.lowercase}}"
+          Copy-Item -Path ".github/LICENSE_DOOM3.md" -Destination "output/${{steps.runner_os.outputs.lowercase}}"
+          Copy-Item -Path ".github/README.md" -Destination "output/${{steps.runner_os.outputs.lowercase}}"
+
+      - name: Copy windows only files ( hacky :( )
+        if: matrix.os == 'windows-latest'
+        shell: pwsh
+        run: |
+          cd ${{github.workspace}}
+          Copy-Item -Path "output/base" -Destination "output/windows/base" -Recurse
+          Copy-Item -Path "output/d3xp" -Destination "output/windows/d3xp" -Recurse
+          Copy-Item -Path "output/examples" -Destination "output/windows/examples" -Recurse
+          Copy-Item -Path "blender" -Destination "output/windows/blender" -Recurse
+          Copy-Item -Path ".github/CHANGELOG.md" -Destination "output/windows"
+          Copy-Item -Path ".github/CONFIGURATION.md" -Destination "output/windows"
+          Copy-Item -Path ".github/LICENSE.md" -Destination "output/windows"
+          Copy-Item -Path ".github/LICENSE_DOOM3.md" -Destination "output/windows"
+          Copy-Item -Path ".github/README.md" -Destination "output/windows"
+          Copy-Item -Path ".github/README.md" -Destination "output/windows"
+          Copy-Item -Path "output/afseditor.bat" -Destination "output/windows"
+          Copy-Item -Path "output/debugger.bat" -Destination "output/windows"
+          Copy-Item -Path "output/decleditor.bat" -Destination "output/windows"
+          Copy-Item -Path "output/idstudio.bat" -Destination "output/windows"
+          Copy-Item -Path "output/guieditor.bat" -Destination "output/windows"
+          Copy-Item -Path "output/materialeditor.bat" -Destination "output/windows"
+          Copy-Item -Path "output/particleeditor.bat" -Destination "output/windows"
+          Copy-Item -Path "output/pdaeditor.bat" -Destination "output/windows"
+          Copy-Item -Path "output/scripteditor.bat" -Destination "output/windows"
+          Copy-Item -Path "output/soundeditor.bat" -Destination "output/windows"
+
+      - name: Artifacts for Windows
+        if: matrix.os == 'windows-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: d3moddingkit-windows
+          path: output/windows/
+
+      - name: Artifacts for Linux
+        if: matrix.os == 'ubuntu-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: d3moddingkit-linux
+          path: output/linux/

.github/workflows/build_baker.yml

@@ -1,3 +1,3 @@
 [submodule "vcpkg"]
 	path = vcpkg
-	url = git@github.com:microsoft/vcpkg.git
+	url = https://github.com/microsoft/vcpkg.git