Merge from 3.3.0

sirjuddington · May 2, 2024 · 0858041 · 0858041
2 parents 18076a4 + ddf9711
commit 0858041
Show file tree

Hide file tree

Showing 765 changed files with 41,186 additions and 30,614 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -50,15 +50,13 @@ body:
         2. Click on '....'
         3. Scroll down to '....'
         4. See error
-      render: text
     validations:
       required: true
   - type: textarea
     id: expected
     attributes:
       label: Expected Behavior
       description: What did you expect to happen instead?
-      render: text
     validations:
       required: false
   - type: textarea
@@ -68,6 +66,5 @@ body:
       description: If applicable, add screenshots to help explain your problem.
       value: |
         ![DESCRIPTION](LINK.png)
-      render: text
     validations:
       required: false
diff --git a/.github/ISSUE_TEMPLATE/crash.yml b/.github/ISSUE_TEMPLATE/crash.yml
@@ -46,7 +46,6 @@ body:
         2. Click on '....'
         3. Scroll down to '....'
         4. Crash occurrs
-      render: text
     validations:
       required: true
   - type: textarea
@@ -64,6 +63,5 @@ body:
       description: If applicable, add screenshots to help explain how to reproduce the crash.
       value: |
         ![DESCRIPTION](LINK.png)
-      render: text
     validations:
       required: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -27,7 +27,6 @@ body:
       description: "What exactly are you looking for in SLADE?"
       value: |
         I would like SLADE to ...
-      render: text
     validations:
       required: true
   - type: textarea
@@ -37,6 +36,5 @@ body:
       description: "If applicable ONLY, add mock-ups to help explain your feature request."
       value: |
         ![DESCRIPTION](LINK.png)
-      render: text
     validations:
       required: false
diff --git a/.github/ISSUE_TEMPLATE/other.yml b/.github/ISSUE_TEMPLATE/other.yml
@@ -25,6 +25,5 @@ body:
     id: repro
     attributes:
       label: Issue Details
-      render: text
     validations:
       required: true
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -13,16 +13,15 @@ jobs:
         - {
             name: "macOS",
             os: macos-12,
-            extra_options: "-DBUILD_PK3=ON",
-            deps_cmdline: "brew install fluidsynth freeimage ftgl lua mpg123 sfml wxwidgets"
+            deps_cmdline: "brew install fluidsynth freeimage ftgl glm lua mpg123 sfml wxwidgets"
           }
         - {
             name: "Linux GCC",
             os: ubuntu-20.04,
             deps_cmdline: "sudo apt-key adv --fetch-keys https://repos.codelite.org/CodeLite.asc && \
 						   sudo apt-add-repository 'deb https://repos.codelite.org/wx3.2.0/ubuntu/ focal universe' && \
 						   sudo apt update && sudo apt install \
-                           libfluidsynth-dev libfreeimage-dev libftgl-dev libgtk-3-dev \
+                           libfluidsynth-dev libfreeimage-dev libftgl-dev libglm-dev libgtk-3-dev \
                            liblua5.3-dev libmpg123-dev libsfml-dev libwxgtk3.2unofficial-dev"
           }
         - {
@@ -32,7 +31,7 @@ jobs:
             deps_cmdline: "sudo apt-key adv --fetch-keys https://repos.codelite.org/CodeLite.asc && \
 						   sudo apt-add-repository 'deb https://repos.codelite.org/wx3.2.0/ubuntu/ focal universe' && \
 						   sudo apt update && sudo apt install \
-                           libfluidsynth-dev libfreeimage-dev libftgl-dev libgtk-3-dev \
+                           libfluidsynth-dev libfreeimage-dev libftgl-dev libglm-dev libgtk-3-dev \
                            liblua5.3-dev libmpg123-dev libsfml-dev libwxgtk3.2unofficial-dev"
           }
 

diff --git a/.gitignore b/.gitignore
@@ -32,8 +32,6 @@
 /win_installer/Output
 /cmake-build-*
 /.idea/
-/msvc/.vs
-/msvc/x64/
 /.vs
 /out/
 
@@ -42,4 +40,10 @@
 !/dist/CMakeLists.txt
 !/dist/makebuild.ps1
 
+/msvc/*
+!/msvc/resource.h
+!/msvc/slade.ico
+!/msvc/SLADE.manifest
+!/msvc/SLADE.rc
+
 CMakeSettings.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 # Build options
 OPTION(NO_LUA "Disable Lua/Scripting features to reduce compile time" OFF)
 OPTION(NO_FLUIDSYNTH "Disable FluidSynth MIDI playback" OFF)
-OPTION(BUILD_PK3 "Build the SLADE pk3 file from dist/res" OFF)
+OPTION(BUILD_PK3 "Build the SLADE pk3 file from dist/res" ON)
 
 # c++17 is required to compile
 set(CMAKE_CXX_STANDARD 17)

diff --git a/cmake/unix.cmake b/cmake/unix.cmake
@@ -110,6 +110,7 @@ if (NOT NO_LUA)
 	find_package(Lua REQUIRED)
 endif()
 find_package(MPG123 REQUIRED)
+find_package(glm REQUIRED)
 find_package(SQLite3 REQUIRED)
 include_directories(
 	${FREEIMAGE_INCLUDE_DIR}
@@ -179,6 +180,7 @@ target_link_libraries(slade
 	${OPENGL_LIBRARIES}
 	${LUA_LIBRARIES}
 	${MPG123_LIBRARIES}
+	glm::glm
 	sqlite3
 )
 
@@ -217,9 +219,9 @@ if (BUILD_PK3)
 			)
 endif()
 
-		install(FILES "${PROJECT_SOURCE_DIR}/dist/res/logo_icon.png"
-			DESTINATION share/icons/
-			RENAME net.mancubus.SLADE.png
+		install(FILES "${PROJECT_SOURCE_DIR}/dist/res/icons/general/logo.svg"
+			DESTINATION share/icons/hicolor/scalable/apps/
+			RENAME net.mancubus.SLADE.svg
 			)
 
 		install(FILES "${PROJECT_SOURCE_DIR}/net.mancubus.SLADE.desktop"
@@ -245,7 +247,7 @@ endif()
 
 if (NOT NO_COTIRE)
 	set_target_properties(slade PROPERTIES
-		COTIRE_CXX_PREFIX_HEADER_INIT "common.h"
+		COTIRE_CXX_PREFIX_HEADER_INIT "Application/Main.h"
 		# Enable multithreaded unity builds by default
 		# because otherwise probably no one would realize how
 		COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES -j

diff --git a/cmake/win_msvc.cmake b/cmake/win_msvc.cmake
@@ -36,6 +36,7 @@ find_package(freeimage CONFIG REQUIRED)
 find_package(MPG123 CONFIG REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(SFML COMPONENTS system audio window network CONFIG REQUIRED)
+find_package(glm REQUIRED)
 find_package(unofficial-sqlite3 CONFIG REQUIRED)
 find_package(xxHash CONFIG REQUIRED)
 
@@ -81,7 +82,7 @@ set_target_properties(slade
 )
 
 # Precompiled Header
-target_precompile_headers(slade PRIVATE "common.h")
+target_precompile_headers(slade PRIVATE "Application/Main.h")
 
 # Link
 target_link_libraries(slade
@@ -98,6 +99,7 @@ target_link_libraries(slade
 	sfml-main
 	sfml-network
 	sfml-window
+	glm::glm
 	unofficial::sqlite3::sqlite3
 	xxHash::xxhash
 )

diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
@@ -8,12 +8,12 @@ set(PK3_DESTINATION ${CMAKE_BINARY_DIR})
 endif()
 
 if(ZIPTOOL_7Z_EXECUTABLE)
-	set(ZIP_COMMAND "${ZIPTOOL_7Z_EXECUTABLE}" u -tzip -mtc- -mcu+ -mx=9 -r "${PK3_DESTINATION}/slade.pk3" .)
+	set(ZIP_COMMAND "${CMAKE_COMMAND}" "-DZIPTOOL_7Z_EXECUTABLE=${ZIPTOOL_7Z_EXECUTABLE}" "-DPK3_DESTINATION=${PK3_DESTINATION}" -P "${CMAKE_CURRENT_SOURCE_DIR}/7z_command.cmake")
 elseif(ZIPTOOL_ZIP_EXECUTABLE)
 	if(NOT APPLE)
 		set(ZIP_COMMAND_CHARSET "-UN=UTF8")
 	endif()
-	set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X ${ZIP_COMMAND_CHARSET} -9 -r "${PK3_DESTINATION}/slade.pk3" .)
+	set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X ${ZIP_COMMAND_CHARSET} -9 -FS -r "${PK3_DESTINATION}/slade.pk3" .)
 else()
 	message(STATUS "no zip executable, slade.pk3 won't build")
 endif()

diff --git a/dist/res/actions/mapw_general.cfg b/dist/res/actions/mapw_general.cfg
@@ -15,6 +15,14 @@ action mapw_saveas
 	shortcut	= "Ctrl+Shift+S";
 }
 
+action mapw_close
+{
+	text		= "&Close";
+	icon		= "close";
+	help_text	= "Close the current map";
+	shortcut	= "Ctrl+W";
+}
+
 action mapw_rename
 {
 	text		= "&Rename Map";

diff --git a/dist/res/actions/scrm.cfg b/dist/res/actions/scrm.cfg
@@ -98,3 +98,11 @@ action scrm_jump_to_line
 	help_text	= "Jump to a specific line number";
 	keybind		= "ted_jumptoline";
 }
+
+action scrm_close
+{
+	text		= "&Close";
+	icon		= "close";
+	help_text	= "Close the tab or window";
+	shortcut	= "Ctrl+W";
+}
diff --git a/dist/res/config/colours/Default.txt b/dist/res/config/colours/Default.txt
@@ -1,5 +1,6 @@
 
-colours {
+colours
+{
 	// General program colours
 	new
 	{
@@ -69,7 +70,7 @@ colours {
 	{
 		name = "Thing";
 		group = "Map Preview";
-		rgb = 200, 200, 200;
+		rgb = 211, 168, 86;
 	}
 
 	// Map image export colours
@@ -306,6 +307,20 @@ colours {
 		alpha = 170;
 		additive = true;
 	}
+
+	map_thing_path
+	{
+		name = "Pathed Thing Line";
+		group = "Map Editor";
+		rgb = 34, 255, 255;
+	}
+
+	map_thing_path_dragon
+	{
+		name = "Pathed Thing Line (Dragon)";
+		group = "Map Editor";
+		rgb = 255, 34, 34;
+	}
 }
 
 theme

diff --git a/dist/res/config/entry_types/text.cfg b/dist/res/config/entry_types/text.cfg
@@ -48,6 +48,12 @@ animdefs : text
 	text_language = "z_animdefs";
 }
 
+complvl : text
+{
+	name = "Compatibility level";
+	match_name = "complvl";
+}
+
 cvarinfo : text
 {
 	name = "Console var defs";
@@ -608,6 +614,8 @@ zscript : text
 {
 	name = "ZScript";
 	match_name = "zscript";
+	match_ext = "zs", "zsc", "zc";
+	match_extorname = 1;
 	text_language = "zscript";
 	icon = "code";
 }

diff --git a/dist/res/config/languages/decorate.txt b/dist/res/config/languages/decorate.txt
@@ -176,7 +176,8 @@ decorate : cstyle {
 		BOUNCEONUNRIPPABLES, DONTBOUNCEONSHOOTABLES, DONTBOUNCEONSKY, RETARGETAFTERSLAM, E1M8BOSS, E2M8BOSS,
 		E3M8BOSS, E4M6BOSS, E4M8BOSS, MAP07BOSS1, MAP07BOSS2, HIGHERMPROB, DONTFOLLOWPLAYERS, SEEFRIENDLYMONSTERS,
 		ADDLIGHTLEVEL, CROSSLINECHECK, MASTERNOSEE, INVISIBLEINMIRRORS, ONLYVISIBLEINMIRRORS, ONLYSLAMSOLID,
-		SHADOWAIM, DOSHADOWBLOCK, SHADOWBLOCK, SHADOWAIMVERT, NOSAVEGAME,
+		SHADOWAIM, DOSHADOWBLOCK, SHADOWBLOCK, SHADOWAIMVERT, NOSAVEGAME, DECOUPLEDANIMATIONS, BILLBOARDFACECAMERA,
+		BILLBOARDNOFACECAMERA, FLIPSPRITEOFFSETX, FLIPSPRITEOFFSETY,
 
 		// INVENTORY.
 		INVENTORY,
@@ -388,7 +389,7 @@ decorate : cstyle {
 
 		// A_SpawnParticle flags
 		SPF_FULLBRIGHT, SPF_RELACCEL, SPF_RELANG, SPF_RELATIVE, SPF_RELPOS, SPF_RELVEL, SPF_NOTIMEFREEZE,
-		SPF_ROLL, SPF_REPLACE,
+		SPF_ROLL, SPF_REPLACE, SPF_NO_XY_BILLBOARD, SPF_LOCAL_ANIM,
 
 		// Render styles
 		STYLE_None, STYLE_Normal, STYLE_Fuzzy, STYLE_SoulTrans, STYLE_OptFuzzy, STYLE_Stencil, STYLE_Translucent,

diff --git a/dist/res/config/languages/zdoom.txt b/dist/res/config/languages/zdoom.txt
@@ -257,7 +257,8 @@ z_mapinfo {
 		e2m8special, e3m8special, e4m6special, e4m8special, disableshadowmap, enableshadowmap,
 		avoidmelee, compat_avoidhazards, compat_stayonlift, compat_nombf21, compat_vileghosts,
 		attenuatelights, intro, outro, lightblendmode, cvar_redirect, compat_voodoozombies,
-		nopassover, passover,
+		nopassover, passover, colormap, nogravity, lightningsound, isocam_pitch, isometricmode,
+		isometricsprites, iso_dist, orthographic,
 
 		// GZDoom
 		FogDensity, OutsideFogDensity, SkyFog, LightMode, NoColoredSpriteLighting, SkyRotate, PixelRatio,
@@ -359,13 +360,13 @@ z_modeldef {
 		MODEL, PATH, SKIN, SCALE, FRAME, FRAMEINDEX,
 		Rotation-Speed, Rotation-Vector, Rotation-Center, 
 		Offset, AngleOffset, PitchOffset, RollOffset, ZOffset, SurfaceSkin,
-		Animation
+		Animation, BaseFrame
 	}
 
 	constants = {
 		PITCHFROMMOMENTUM, IGNORETRANSLATION, INTERPOLATEDOUBLEDFRAMES, ROTATING, NOINTERPOLATION,
 		INHERITACTORPITCH, INHERITACTORROLL, USEACTORPITCH, USEACTORROLL, DONTCULLBACKFACES,
-		SCALEWEAPONFOV, MODELSAREATTACHMENTS, CORRECTPIXELSTRETCH
+		SCALEWEAPONFOV, MODELSAREATTACHMENTS, CORRECTPIXELSTRETCH, FORCECULLBACKFACES
 	}
 }