14203 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
sphere	89e7ef16cc	Merge branch 'issue711' into 'next' ... Fixes Issue #711 See merge request STJr/SRB2!1907	2023-02-28 13:51:35 +00:00
Eidolon	c42ef9f1be	Fix IT and ctf flag sign interpolation	2023-02-27 18:28:34 -06:00
sphere	7eabccbfac	Merge branch 'issue568' into 'next' ... Fixes issue #568 Closes #568 See merge request STJr/SRB2!1913	2023-02-27 20:37:50 +00:00
sphere	1dfb8ed4c3	Merge branch 'issue912a' into 'next' ... Fixes Issue #912 Closes #912 See merge request STJr/SRB2!1909	2023-02-27 20:37:38 +00:00
sphere	20bfa8d96c	Merge branch 'flagfix' into 'next' ... Fix wrong flag being checked in P_ProcessTeamBase Closes #957 See merge request STJr/SRB2!1938	2023-02-27 20:31:10 +00:00
Eidolon	a32dc3daa0	Fix software vsync ... This pre-SDL 2.0.18 hack from the interp branch is no longer needed when building with a new enough SDL version. This makes vid_wait toggleable at all times if SDL is at least 2.0.18.	2023-02-26 17:57:44 -06:00
MascaraSnake	bb9e7045c5	Fix wrong flag being checked in P_ProcessTeamBase	2023-02-25 15:43:51 +01:00
MascaraSnake	6e7ff69720	Re-add code that sets MF2_AMBUSH if MTF_AMBUSH is set, but only for binary maps	2023-02-25 15:03:52 +01:00
MascaraSnake	283f7e8919	Linedef type 14 UDMF conversion: Don't fill stringargs[0] if toptexture is empty	2023-02-25 13:24:14 +01:00
MascaraSnake	d58dad7f98	Move emblem float option to args[1], since args[0] is already occupied for NiGHTS emblems	2023-02-25 11:58:12 +01:00
Eidolon	9a9a16183f	Disable floor splat slope interpolation ... Getting these to interpolate correctly is proving to be an absolute ordeal and I would rather have them look correct-but-not-interpolated than completely broken.	2023-02-24 18:49:09 -06:00
MascaraSnake	aba57612d5	-Only print deprecated map effect warnings once on map load ... -Add missing unsupported effect warnings to P_WriteTextmap -Apply spikes MSF_TRIGGERSPECIAL_TOUCH hack in UDMF too	2023-02-19 07:27:16 +01:00
Eidolon	707860815b	Merge GitHub PR #514 into next ... fix ARM builds being completely broken Conditionally adds -mno-ms-bitfields based on architecture, as this is only relevant on Intel architectures. https://github.com/STJr/SRB2/pull/514	2023-02-08 21:15:04 -06:00
cobalt2727	4f8d2fcdc8	fix ARM builds being completely broken ... If merged, this is the quickest approach to resolve https://github.com/STJr/SRB2/issues/513 ...alternatively, we could just remove the option altogether but I don't have the time right now to test whether it's needed or not To the best of my knowledge, this covers all possible amd64 `CMAKE_SYSTEM_PROCESSOR` values based on what I'm seeing at https://stackoverflow.com/questions/70475665/what-are-the-possible-values-of-cmake-system-processor	2023-02-08 14:46:09 -05:00
Zwip-Zwap Zapony	702b2acfd3	Limit con_hudtime to 24 hours ... Also rename cons_msgtimeout to cons_hudtime for consistency	2023-02-04 17:35:44 +01:00
Zwip-Zwap Zapony	cc6eac0886	Fix con_hudlines being off by one	2023-02-04 17:34:43 +01:00
spherallic	4a1e99729b	Merge branch 'next' into public_next	2023-01-31 15:47:11 +01:00
sphere	337a94eb99	Merge branch '2211-gamepaddefaults' into 'next' ... Change gamepad defaults for 2.2.11 Closes #813 See merge request STJr/SRB2!1928	2023-01-31 14:43:30 +00:00
MascaraSnake	efca1eccca	Merge branch 'floormover-tag-fix' into 'next' ... EV_DoFloor: Set dummy tag correctly for chained linedef executing Closes #932 See merge request STJr/SRB2!1898	2023-01-28 06:33:11 +00:00
MascaraSnake	02fa860c46	Merge branch 'thingonspecial3dfloor' into 'next' ... Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility See merge request STJr/SRB2!1905	2023-01-28 06:32:42 +00:00
MascaraSnake	6055b1490b	Merge branch 'udmf-triggerer' into 'next' ... UDMF: Use string values for the sector "triggerer" field See merge request STJr/SRB2!1902	2023-01-28 06:32:29 +00:00
MascaraSnake	c25cb5732d	Merge branch 'specialstagepit-fix' into 'next' ... Disable exit sectors in non-NiGHTS special stages because they interfere with the pits Closes #930 See merge request STJr/SRB2!1900	2023-01-28 06:32:16 +00:00
Jaime Ita Passos	b64dac714f	Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings	2023-01-28 00:18:55 -03:00
spherallic	a6599c176d	Change gamepad defaults for 2.2.11	2023-01-27 16:49:53 +01:00
Arthur	20724ad70b	Also retain PF_CANCARRY	2023-01-27 09:46:02 -05:00
spherallic	3bc519ed65	Merge branch 'next' into bbox	2023-01-27 14:59:39 +01:00
MascaraSnake	f94695390e	Merge branch 'revert-gamepads' into 'next' ... Revert Gamepads for now See merge request STJr/SRB2!1926	2023-01-27 13:53:45 +00:00
MascaraSnake	c84a71dcf5	Merge branch 'splitscreen-hooks' into 'next' ... Handle splitscreen lua hud lists separately Closes #935 See merge request STJr/SRB2!1925	2023-01-27 13:53:23 +00:00
MascaraSnake	5c91d78fcb	Merge branch 'rollangle-parity' into 'next' ... Invert OpenGL rollangle for papersprites to match software renderer behaviour Closes #849 See merge request STJr/SRB2!1924	2023-01-27 13:52:00 +00:00
MascaraSnake	32183d1e82	Merge branch 'uncap-fixes' into 'next' ... Minor interpolation fixes Closes #900, #906, and #916 See merge request STJr/SRB2!1923	2023-01-27 13:51:02 +00:00
Eidolon	e5dea805fa	Revert "Merge branch 'gamepad-refactor' into next" ... This reverts commit 696e2ab909, reversing changes made to d98d59494f.	2023-01-26 19:26:28 -06:00
Eidolon	366ee4ad92	Revert "Merge branch 'gamepad-refactor-lua-features' into 'next'" ... This reverts commit 7f1cafcd3d, reversing changes made to 696e2ab909.	2023-01-26 19:26:24 -06:00
Eidolon	6cc48a6e89	Revert "Merge branch 'gamepad-refactor-lua-rumble' into 'next'" ... This reverts commit 7d8e8e20b7, reversing changes made to 7f1cafcd3d.	2023-01-26 19:26:21 -06:00
Eidolon	7ad54af89f	Revert "Fix axis inversion and camera look inversion" ... This reverts commit 6428d6fc61.	2023-01-26 19:26:17 -06:00
Eidolon	bbf6e8ccce	Revert "sdl: SDL version-guard controller type and hidapi" ... This reverts commit ec58b1504d.	2023-01-26 19:26:02 -06:00
Eidolon	2810a46095	Revert "sdl: Version-guard rumble and extended buttons" ... This reverts commit f5f224136b.	2023-01-26 19:25:59 -06:00
Eidolon	40a5580e65	Revert "sdl: Yet more SDL rumble version-guards" ... This reverts commit df28ffd72e.	2023-01-26 19:25:56 -06:00
Eidolon	f9c9e0829a	Revert "sdl: I can't believe it's more version-guards" ... This reverts commit fdb6f2aff9.	2023-01-26 19:25:53 -06:00
Eidolon	5827a19b89	Revert "Merge branch 'controller-fixes' into 'next'" ... This reverts commit 71736f358f, reversing changes made to 4e3f78784a.	2023-01-26 19:24:52 -06:00
Eidolon	bbd4cff75c	Revert "Merge branch 'gamepadtweaks' into 'next'" ... This reverts commit 96bfd8cea7, reversing changes made to 24f9ec4ec4.	2023-01-26 19:24:21 -06:00
Eidolon	f1a7494a31	Handle splitscreen lua hud lists separately ... Fixes STJr/SRB2#935 by ensuring each drawlist is drawn separately while stplyr is set correctly.	2023-01-26 08:59:51 -06:00
Lach	42fa7f4723	Invert OpenGL rollangle for papersprites to match software renderer behaviour	2023-01-26 15:29:35 +11:00
Eidolon	b02707a4ee	Adjust caption pop-in by tics instead of frames ... Fixes STJr/SRB2#900 pop-in animation being affected by framerate	2023-01-25 21:09:50 -06:00
Eidolon	add018cb83	Interpolate minecart marks ... Fixes STJr/SRB2#906 Uses the old displacement of the minecart to position the mark relative to its destination. It's not completely correct, but it works.	2023-01-25 21:09:50 -06:00
Eidolon	6c54af3774	Fix precip interpolation ... Fixes STJr/SRB2#916	2023-01-25 21:09:50 -06:00
Alam Ed Arias	43eb7526c0	Update http-mserv.c	2023-01-20 19:00:50 +00:00
LJ Sonic	379cc4207a	Revert "Merge branch 'netcode-refactor' into merging" ... This reverts merge request !1920	2023-01-15 17:57:23 +00:00
LJ Sonic	41fb0c8943	Merge branch 'netcode-refactor' into merging	2023-01-15 17:45:06 +01:00
LJ Sonic	fe304ae2db	Cleanup comments	2023-01-15 13:10:23 +01:00
LJ Sonic	d1ba9e0afd	Cleanup	2023-01-15 13:08:31 +01:00