Merge pull request #178 from obsidian-level-maker/v21

V21

.github/workflows/cmake-release.yml

@@ -16,9 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download w64devkit
-        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v1.23.0/w64devkit-i686-1.23.0.zip -outfile ${{github.workspace}}\w64devkit.zip
+        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v2.0.0/w64devkit-x86-2.0.0.exe -outfile ${{github.workspace}}\w64devkit.exe
       - name: Extract w64devkit
-        run: expand-archive -path ${{github.workspace}}\w64devkit.zip -destinationpath ${{github.workspace}}
+        run: ${{github.workspace}}\w64devkit.exe -y
       - name: Set environment variables and build
         run: |
           $env:Path = "${{github.workspace}}\w64devkit\bin;" + $env:Path
@@ -47,9 +47,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download w64devkit
-        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v1.23.0/w64devkit-1.23.0.zip -outfile ${{github.workspace}}\w64devkit.zip
+        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v2.0.0/w64devkit-x64-2.0.0.exe -outfile ${{github.workspace}}\w64devkit.exe
       - name: Extract w64devkit
-        run: expand-archive -path ${{github.workspace}}\w64devkit.zip -destinationpath ${{github.workspace}}
+        run: ${{github.workspace}}\w64devkit.exe -y
       - name: Set environment variables and build
         run: |
           $env:Path = "${{github.workspace}}\w64devkit\bin;" + $env:Path

.github/workflows/cmake.yml

@@ -18,9 +18,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download w64devkit
-        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v1.23.0/w64devkit-i686-1.23.0.zip -outfile ${{github.workspace}}\w64devkit.zip
+        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v2.0.0/w64devkit-x86-2.0.0.exe -outfile ${{github.workspace}}\w64devkit.exe
       - name: Extract w64devkit
-        run: expand-archive -path ${{github.workspace}}\w64devkit.zip -destinationpath ${{github.workspace}}
+        run: ${{github.workspace}}\w64devkit.exe -y
       - name: Set environment variables and build
         run: |
           $env:Path = "${{github.workspace}}\w64devkit\bin;" + $env:Path
@@ -49,9 +49,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download w64devkit
-        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v1.23.0/w64devkit-1.23.0.zip -outfile ${{github.workspace}}\w64devkit.zip
+        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v2.0.0/w64devkit-x64-2.0.0.exe -outfile ${{github.workspace}}\w64devkit.exe
       - name: Extract w64devkit
-        run: expand-archive -path ${{github.workspace}}\w64devkit.zip -destinationpath ${{github.workspace}}
+        run: ${{github.workspace}}\w64devkit.exe -y
       - name: Set environment variables and build
         run: |
           $env:Path = "${{github.workspace}}\w64devkit\bin;" + $env:Path

.gitignore

@@ -3,7 +3,7 @@ obsidian
 Obsidian.exe
 obsidian.exe
 
-#Logs/configs (Windows version)
+#Logs/configs
 CONFIG.txt
 OPTIONS.txt
 THEME.txt
@@ -32,23 +32,8 @@ cmake-build-*
 build/
 
 # User dirs
-addons/*
 !addons/.gitkeep
 
-# Quake files (not redistributable)
-quake_tex.wd2
-pak0.pak
-pak1.pak
-
-tools/filename_formatter
-tools/filename_formatter.exe
-tools/qsavetex
-tools/qsavetex.exe
-tools/qsavetex_log.txt
-
-web/out
-web/shots
-
 _work
 *~
 install/

AUTHORS.md

@@ -157,6 +157,9 @@ KadKad1
 Lobo
   - EDGE-Classic Enhancement Addon
 
+DaveFriedLiver
+  - Widget tooltip updates/grammar corrections
+
 # OBLIGE
 
 ## DEVELOPER:

CMakeLists.txt

@@ -1,12 +1,5 @@
 cmake_minimum_required(VERSION 3.12..3.20)
 
-if(NOT CONSOLE_ONLY)
-  add_subdirectory(libraries/fltk EXCLUDE_FROM_ALL)
-endif()
-add_subdirectory(libraries/miniz EXCLUDE_FROM_ALL)
-add_subdirectory(libraries/physfs EXCLUDE_FROM_ALL)
-add_subdirectory(libraries/steve EXCLUDE_FROM_ALL)
-
 project(
   obsidian
   LANGUAGES C CXX
@@ -21,11 +14,7 @@ add_compile_definitions(OBSIDIAN_TIMESTAMP="${BUILD_TIMESTAMP}")
 if(CONSOLE_ONLY)
   add_compile_definitions(OBSIDIAN_CONSOLE_ONLY)
 endif()
-if(WIN32)
-  add_compile_definitions(WIN32_LEAN_AND_MEAN)
-  add_compile_definitions(UNICODE)
-  add_compile_definitions(_UNICODE)
-elseif(NOT APPLE AND NOT CONSOLE_ONLY)
+if(NOT WIN32 AND NOT APPLE AND NOT CONSOLE_ONLY)
   add_compile_definitions(USE_XFT)
 endif()
 if(MSVC)
@@ -52,6 +41,16 @@ if(${CMAKE_SYSTEM} MATCHES "OpenBSD")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I /usr/X11R6/include")
 endif()
 
+if(UNIX)
+  if(NOT CONSOLE_ONLY
+     AND NOT APPLE
+  )
+    find_package(Fontconfig REQUIRED)
+  endif()
+endif()
+
+add_subdirectory(libraries)
+
 set(OBSIDIAN_SOURCE_FILES
     source/bsp_level.cc
     source/bsp_misc.cc
@@ -126,27 +125,6 @@ add_executable(
   ${OBSIDIAN_SOURCE_FILES}
 )
 
-target_include_directories(obsidian SYSTEM PRIVATE libraries/fastPRNG)
-if(NOT CONSOLE_ONLY)
-  target_include_directories(obsidian SYSTEM PRIVATE libraries/fltk)
-  target_include_directories(
-    obsidian SYSTEM PRIVATE "${PROJECT_BINARY_DIR}/libraries/fltk"
-  ) # Hack for FLTK 1.4 (for now)
-endif()
-target_include_directories(obsidian SYSTEM PRIVATE libraries/gif-h)
-target_include_directories(obsidian SYSTEM PRIVATE libraries/minilua)
-target_include_directories(obsidian SYSTEM PRIVATE libraries/miniz)
-target_include_directories(obsidian SYSTEM PRIVATE libraries/physfs/src)
-target_include_directories(obsidian SYSTEM PRIVATE libraries/steve/src)
-
-if(UNIX)
-  if(NOT CONSOLE_ONLY
-     AND NOT APPLE
-  )
-    find_package(Fontconfig REQUIRED)
-  endif()
-endif()
-
 # Copies executables to local install directory after build
 add_custom_command(
   TARGET obsidian
@@ -160,8 +138,10 @@ if(UNIX)
     if(NOT CONSOLE_ONLY)
       target_link_libraries(
         obsidian
-        PRIVATE fltk
+        PRIVATE fastPRNG
+                fltk
                 fltk_images
+                minilua
                 miniz
                 physfs-static
                 steve
@@ -172,30 +152,34 @@ if(UNIX)
       )
     else()
       target_link_libraries(
-        obsidian PRIVATE miniz physfs-static steve
+        obsidian PRIVATE fastPRNG minilua miniz physfs-static steve
       )
     endif()
   elseif(${CMAKE_SYSTEM} MATCHES "BSD")
     if(NOT CONSOLE_ONLY)
       target_link_libraries(
         obsidian
-        PRIVATE fltk
+        PRIVATE fastPRNG
+                fltk
                 fltk_images
+                minilua
                 miniz
                 physfs-static
                 steve
       )
     else()
       target_link_libraries(
-        obsidian PRIVATE miniz physfs-static steve
+        obsidian PRIVATE fastPRNG minilua miniz physfs-static steve
       )
     endif()
   else()
     if(NOT CONSOLE_ONLY)
       target_link_libraries(
         obsidian
-        PRIVATE fltk
+        PRIVATE fastPRNG
+                fltk
                 fltk_images
+                minilua
                 miniz
                 physfs-static
                 fontconfig
@@ -205,7 +189,9 @@ if(UNIX)
     else()
       target_link_libraries(
         obsidian
-        PRIVATE miniz
+        PRIVATE fastPRNG
+                minilua
+                miniz
                 physfs-static
                 pthread
                 steve
@@ -216,15 +202,17 @@ else()
   if(NOT CONSOLE_ONLY)
     target_link_libraries(
       obsidian
-      PRIVATE fltk
+      PRIVATE fastPRNG
+              fltk
               fltk_images
+              minilua
               miniz
               physfs-static
               steve
     )
   else()
     target_link_libraries(
-      obsidian PRIVATE miniz physfs-static steve
+      obsidian PRIVATE fastPRNG minilua miniz physfs-static steve
     )
   endif()
 endif()

LICENSE.txt

@@ -1,19 +1,4 @@
-                    OBSIDIAN Level Maker
-
-Copyright (C) 2021-2022 The OBSIDIAN Team
-Copyright (C) 2006-2017 Andrew Apted
-
-OBSIDIAN is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-OBSIDIAN is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU General Public License for more details. 
-
-================================================================================
-
+
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991

modules/gzdoom_fauna.lua → addons/Obsidian Non-Free Addons/modules/gzdoom_fauna.lua

@@ -475,19 +475,19 @@ function FAUNA_MODULE.all_done()
 
     local dir = "games/doom/data/"
     gui.wad_merge_sections(dir .. "Fly.wad")
-    gui.wad_insert_file("data/sounds/FLYBUZZ.ogg", "FLYBUZZ")
+    gui.wad_insert_file(dir .. "sounds/FLYBUZZ.ogg", "FLYBUZZ")
   end
 
   if PARAM.bool_rats == 1 then
     SCRIPTS.decorate = ScriptMan_combine_script(SCRIPTS.decorate, FAUNA_MODULE.DEC)
 
     local dir = "games/doom/data/"
     gui.wad_merge_sections(dir .. "Rats.wad")
-    gui.wad_insert_file("data/sounds/DSRAT.ogg", "DSRAT")
-    gui.wad_insert_file("data/sounds/DSRATIDL.ogg", "DSRATIDL")
-    gui.wad_insert_file("data/sounds/DSRATDI1.ogg", "DSRATDI1")
-    gui.wad_insert_file("data/sounds/DSRATDI2.ogg", "DSRATDI2")
-    gui.wad_insert_file("data/sounds/RATCRAWL.ogg", "RATCRAWL")
+    gui.wad_insert_file(dir .. "sounds/DSRAT.ogg", "DSRAT")
+    gui.wad_insert_file(dir .. "sounds/DSRATIDL.ogg", "DSRATIDL")
+    gui.wad_insert_file(dir .. "sounds/DSRATDI1.ogg", "DSRATDI1")
+    gui.wad_insert_file(dir .. "sounds/DSRATDI2.ogg", "DSRATDI2")
+    gui.wad_insert_file(dir .. "sounds/RATCRAWL.ogg", "RATCRAWL")
   end
 end