From cc248d7c44f7040236a1dc97df7ee8032d55ab7a Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 12 Aug 2023 17:51:01 +0300 Subject: [PATCH 1/5] Remove op_video_gravstretch from video options enum since it isn't here anymore. OpenGL options should be hidden in software mode again now --- src/m_menu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/m_menu.c b/src/m_menu.c index e2901f984..437d7761f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1327,7 +1327,6 @@ enum op_video_vsync, op_video_fpscap, op_video_driftsparkpulse, - op_video_gravstretch, #ifdef HWRENDER op_video_ogl, #endif -- 2.54.0 From 0cad0f8828c7aeb8b93019f15e2a05f6f3e7de87 Mon Sep 17 00:00:00 2001 From: Alug <136046486+alufolie91@users.noreply.github.com> Date: Sat, 12 Aug 2023 16:59:31 +0200 Subject: [PATCH 2/5] Update README.md ee hope i didnt forget anything --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b5f70f9e3..36659251d 100644 --- a/README.md +++ b/README.md @@ -9,24 +9,26 @@ - Lua shows tracebacks whenever an error occurs - The Lua perfstat page now has multiple pages and is more organized (ps_thinkframe_page X) - "addfilelocal" Command, for those who want to use their custom hud in netgames (Same as addfile but completely client sided) +- OpenMPT for Tracker module playback (Complete with filters) fixed looping issue while even sounding better than the old GME playback +- Music changes now properly show the music credits +- Configurable chatlog size +- Lua hooks for Intermission +- Timeout for waiting to join a full server is configurable now +- Higher/configurable addon download speed - Visual Portals from haya´s HEP Client +- Everything that galaxy has Techical Stuff: - ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it) - Fof´s intersecting with slopes have less issues and now render correctly in Opengl - Midtextures on slopes in Opengl arent broken anymore, all those weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone. -- A longstanding crash with "fading music changes" has been fixed -- A crash after long play sessions or when hosting a listen server regarding "FreeColormipmaps" has been fixed - Multiple other fixes/optimizations like 3D floor clipping in software mode +- Zone memory allocations have been rewritten +- The annoying depraction messages for "P_TeleportMove" and "P_AproxDistance" have been silenced ## Bugs -- Joining a netgame midrace makes all sprites invisible until the next mapchange. -(Sadly unfixable without breaking netgame compability) - -- For the reason mentioned above, sometimes when rewinding a recorded replay from a netgame, playersprites may disappear, however normal playback is fine. - ## Dependencies - NASM (x86 builds only) - SDL2 (Linux/OS X only) -- 2.54.0 From c438f14599a2ed6b9a42fcf3ecf747961458301f Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sat, 12 Aug 2023 17:13:04 +0200 Subject: [PATCH 3/5] v7.1 cause why not --- src/doomdef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index 09d00aba8..5b1f35a34 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -149,8 +149,8 @@ extern char logfilename[1024]; #else #define VERSION 1 // Game version #define SUBVERSION 6 // more precise version number -#define VERSIONSTRING "Saturn v7.0 " -#define VERSIONSTRINGW L"Saturn v7.0" +#define VERSIONSTRING "Saturn v7.1 " +#define VERSIONSTRINGW L"Saturn v7.1" // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // And change CMakeLists.txt (not src/, but in root), for CMake users! // AND appveyor.yml, for the build bots! -- 2.54.0 From 179d2ab764c82d97bbe31c8e38f8442996e2d5ec Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sat, 12 Aug 2023 18:21:15 +0200 Subject: [PATCH 4/5] Cleaned up and translated some comments brap --- src/hardware/hw_cache.c | 3 +-- src/hardware/r_opengl/r_opengl.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 971dd67fd..c27e17a16 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -25,7 +25,7 @@ #include "../z_zone.h" #include "../v_video.h" #include "../r_draw.h" -#include "../r_patch.h" // sneed's feed and seed, formerly chuck's +#include "../r_patch.h" // patch rotation // Values set after a call to HWR_ResizeBlock() static INT32 blocksize, blockwidth, blockheight; @@ -706,7 +706,6 @@ static void HWR_LoadMappedPatch(GLMipmap_t *grmip, GLPatch_t *gpatch) // You can't free rawpatch for some reason? // (Obviously I can't, sprite rotation needs that...) - // Fuckal: I HATE HARDWARE, I HATE HARDWARE!! if (!gpatch->rawpatch) Z_Free(patch); } diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 9c8074f56..04fe8783e 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1142,8 +1142,8 @@ void Flush(void) while (gr_cachehead) { - // ceci n'est pas du tout necessaire vu que tu les a charger normalement et - // donc il sont dans ta liste ! + // this is not necessary at all, because you have loaded them normally, + // and so they already are in your list! if (gr_cachehead->downloaded) pglDeleteTextures(1, (GLuint *)&gr_cachehead->downloaded); gr_cachehead->downloaded = 0; @@ -1731,11 +1731,11 @@ EXPORT void HWRAPI(SetTexture) (FTextureInfo *pTexInfo) pTexInfo->nextmipmap = NULL; if (gr_cachetail) - { // insertion en fin de liste + { // insertion at the tail gr_cachetail->nextmipmap = pTexInfo; gr_cachetail = pTexInfo; } - else // initialisation de la liste + else // initialization of the linked list gr_cachetail = gr_cachehead = pTexInfo; } } -- 2.54.0 From 5feceffb2d68358ddbad1eaa2439d5537039d6e4 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 13 Aug 2023 12:02:12 +0300 Subject: [PATCH 5/5] Disable camera tilting by default and remove birdmod warning --- src/command.c | 1 - src/command.h | 1 - src/m_menu.c | 57 --------------------------------------------------- src/m_misc.c | 2 -- src/p_user.c | 6 +++--- 5 files changed, 3 insertions(+), 64 deletions(-) diff --git a/src/command.c b/src/command.c index ff2ff7b13..49bba34e7 100644 --- a/src/command.c +++ b/src/command.c @@ -79,7 +79,6 @@ CV_PossibleValue_t kartspeed_cons_t[] = { static boolean execversion_enabled = false; consvar_t cv_execversion = {"execversion","1",CV_CALL,CV_Unsigned, CV_EnforceExecVersion, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_birdmod = {"birdmod", "0", CV_SAVE|CV_NOSHOWHELP, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; // for default joyaxis detection #if 0 diff --git a/src/command.h b/src/command.h index 55b31217d..3fc39c84a 100644 --- a/src/command.h +++ b/src/command.h @@ -143,7 +143,6 @@ extern CV_PossibleValue_t CV_Natural[]; extern CV_PossibleValue_t kartspeed_cons_t[]; extern consvar_t cv_execversion; -extern consvar_t cv_birdmod; void CV_InitFilterVar(void); void CV_ToggleExecVersion(boolean enable); diff --git a/src/m_menu.c b/src/m_menu.c index e2901f984..2b38590d5 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3426,19 +3426,6 @@ void M_Drawer(void) interpTimerHackAllow = false; } -static tic_t disclaimertic; - -static void -M_AcceptBird (event_t *ev) -{ - (void)ev; - if (disclaimertic >= 3*TICRATE) - { - CV_SetValue(&cv_birdmod, 1); - M_StopMessage(0); - } -} - // // M_StartControlPanel // @@ -3633,23 +3620,6 @@ void M_StartControlPanel(void) } CON_ToggleOff(); // move away console - - if (cv_birdmod.value == 0) - { - currentMenu->lastOn = itemOn; - - M_StartMessage( - "\x82WARNING\n\x80" - "This version of bird mod includes\n" - "a feature that may cause motion\n" - "sickness for some people.\n\n" - - "You may want to look at\n" - "the\x82 Bird Options\x80 first.\n\n" - - "(wait 3 seconds...)", - M_AcceptBird, MM_EVENTHANDLER); - } } void M_EndModeAttackRun(void) @@ -3758,33 +3728,6 @@ void M_Ticker(void) #endif CL_TimeoutServerList(); - - if (menuactive && cv_birdmod.value == 0) - { - if (disclaimertic < 3*TICRATE) - { - disclaimertic++; - - if (disclaimertic % TICRATE == 0) - { - char *p = strrchr(MessageDef.menuitems[0].text, '\n'); - - if (disclaimertic == TICRATE) - { - strcpy(&p[1], "(wait 2 seconds...)"); - } - else - { - strcpy(&p[1], "(wait 1 second...)"); - } - } - } - else - { - char *p = strrchr(MessageDef.menuitems[0].text, '\n'); - strcpy(&p[1], "(press a key)"); - } - } } // diff --git a/src/m_misc.c b/src/m_misc.c index dc49724d3..307146d7d 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -501,8 +501,6 @@ void M_FirstLoadConfig(void) // register execversion here before we load any configs CV_RegisterVar(&cv_execversion); - CV_RegisterVar(&cv_birdmod); - // temporarily reset execversion to default // we shouldn't need to do this, but JUST in case... CV_ToggleExecVersion(true); diff --git a/src/p_user.c b/src/p_user.c index 69ab77093..cb4403433 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -7135,11 +7135,11 @@ consvar_t cv_cam4_speed = {"cam4_speed", "0.4", CV_FLOAT|CV_SAVE, CV_CamSpeed, N consvar_t cv_cam4_rotate = {"cam4_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate4_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_cam4_rotspeed = {"cam4_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_tilting = {"tilting", "On", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_quaketilt = {"quaketilt", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_tilting = {"tilting", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_quaketilt = {"quaketilt", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_tiltsmoothing = {"tiltsmoothing", "32", CV_SAVE, CV_Natural, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_actionmovie = {"actionmovie", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_actionmovie = {"actionmovie", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_windowquake = {"windowquake", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; fixed_t t_cam_dist = -42; -- 2.54.0