Commit graph

15509 commits

Author SHA1 Message Date
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
Logan Aerl Arias
bf9904cfc2 Merge branch 'fireflower-icon' into 'next'
Display power-up icon for Fire Flower

See merge request STJr/SRB2!2097
2024-02-12 05:04:57 +00:00
Logan Aerl Arias
6d0fef8726 Merge branch SRB2:next into nonightsever 2024-02-12 04:53:51 +00:00
Logan Aerl Arias
bf4efe968f Merge branch 'patch-refactor' into 'next'
Patch and texture refactor

See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
Logan Aerl Arias
8ef47be7a3 Merge branch 'SDL2-update-to-v2.30.0' into 'next'
update SDL2 to v2.30.0

See merge request STJr/SRB2!2307
2024-02-12 04:33:26 +00:00
SteelT
ddfb59d185 Add common I_GetSysName function
Replaces the OS defines in Command_Version_f() with a common function to fetch the system name the game is currently running on.
2024-02-11 23:31:34 -05:00
Logan Aerl Arias
197243140f update SDL2 to v2.30.0
update SDL2 to v2.30.0
2024-02-11 22:33:08 -05:00
Logan Aerl Arias
7c33cc3783 Update cpm-libgme.cmake
remove link to ZLIB

(cherry picked from commit c16791bc11)
2024-02-11 22:01:06 +00:00
Logan Aerl Arias
c16791bc11 Update cpm-libgme.cmake
remove link to ZLIB
2024-02-11 22:00:34 +00:00
Alam Ed Arias
b9ff85332f Merge branch 'master' into next 2024-02-11 16:48:19 -05:00
Alam Ed Arias
fbc8a3524c Update .gitlab-ci.yml file
Do not care for single-bit-bitfield-constant-conversion warnings
2024-02-11 16:45:47 -05:00
Zwip-Zwap Zapony
bdeec56270 Substitute MT_NULL with MT_RAY in Lua 2024-02-11 13:30:15 +01:00
Hanicef
634c972f6c Fix console not being blocked by IT_CV_STRING 2024-02-11 12:08:42 +01:00
Logan Aerl Arias
ec90c87fb8 Merge branch 'zlib-update-to-v1.3.1' into 'next'
update zlib to v1.3.1

See merge request STJr/SRB2!2303
2024-02-11 05:29:02 +00:00
Logan Aerl Arias
6bc6a428c9 add static library files for zlib
add static library files for zlib
2024-02-11 00:20:12 -05:00
Alam Ed Arias
53989e1d1a Update .gitlab-ci.yml file
Do not care for single-bit-bitfield-constant-conversion warnings
2024-02-11 03:42:26 +00:00
Logan Aerl Arias
64f38bf588 update zlib to v1.3.1
update zlib to v1.3.1
2024-02-10 22:09:28 -05:00
Alam Ed Arias
ae25209cd1 r_draw.c: fix compiling with clang 2024-02-10 19:25:27 -05:00
sphere
58cf8293e3 Merge branch 'fix-nil-mo-spawnmobj-hook' into 'next'
Fix segfault when trying to access mo->player->mo from SpawnMobj hook

Closes #1189

See merge request STJr/SRB2!2300
2024-02-10 23:39:37 +00:00
Logan Aerl Arias
5e175a3438 add Visual Studio 2022 support (via CMAKE) 2024-02-10 14:34:03 -05:00
Logan Aerl Arias
58e6ce5c2d Update .gitignore
ignore out folder for VS2022 builds using CMake
2024-02-10 14:33:38 -05:00
Logan Aerl Arias
1cf3fcd0d5 Merge branch 'vs2022' into 'next'
add Visual Studio 2022 support (via CMAKE)

See merge request STJr/SRB2!2301
2024-02-10 19:29:48 +00:00
Logan Aerl Arias
da394a87dd add Visual Studio 2022 support (via CMAKE) 2024-02-10 19:29:48 +00:00
Hanicef
d0277b1799 fixup! Fix segfault when trying to access mo->player->mo from SpawnMobj hook 2024-02-10 20:19:45 +01:00
Hanicef
fe75a21bef Fix segfault when trying to access mo->player->mo from SpawnMobj hook 2024-02-10 19:40:27 +01:00
sphere
279820cd6c Merge branch 'slash-n' into 'next'
add checks for \n in chat messages

See merge request STJr/SRB2!2170
2024-02-10 15:22:33 +00:00
Sally Coolatta
d5c8fcac2b Match freeslot count with SRB2Kart 2024-02-10 08:52:32 -05:00
Gustaf Alhäll
1a53971c39 Fix various segfaults caused by missing P_MobjWasRemoved checks 2024-02-09 19:39:20 +01:00
Hanicef
8155313344 Fix input via command line/terminal not working 2024-02-09 18:49:32 +01:00
sphere
0c59a46d5a Merge branch 'fix-segfault-remove-thinglist' into 'next'
Fix segfault when removing mobjs while iterating thinglist

See merge request STJr/SRB2!2293
2024-02-08 23:17:54 +00:00
sphere
41613d89a1 Merge branch 'blockmap-links' into 'next'
Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592)

Closes #592

See merge request STJr/SRB2!2267
2024-02-08 23:16:59 +00:00
sphere
2cfbcf7fbf Merge branch 'allow-banip-mask' into 'next'
Allow ban masks to be specified for banip

See merge request STJr/SRB2!2272
2024-02-08 23:16:47 +00:00
spherallic
7fc554bd4e Merge branch 'showinput' of git.do.srb2.org:STJr/SRB2 into showinput 2024-02-08 23:12:03 +01:00
spherallic
16b28d177e Merge branch 'next' into showinput 2024-02-08 23:09:09 +01:00
sphere
51f0758c47 Merge branch 'fix-console-double-mapping' into 'next'
Fix console binds incorrectly respecting keyboard layout

See merge request STJr/SRB2!2295
2024-02-08 21:35:05 +00:00
sphere
26c057f6e5 Merge branch 'fix-unlist-request' into 'next'
Fix /unlist request

See merge request STJr/SRB2!2294
2024-02-08 21:34:55 +00:00
sphere
0d526c0ff5 Merge branch 'http-download-port' into 'next'
HTTP downloader port

See merge request STJr/SRB2!2290
2024-02-08 21:34:36 +00:00
Hanicef
914cb167a4 Fix console binds incorrectly respecting layout keys 2024-02-08 21:50:43 +01:00
Felice D'Angelo
bdf13b6957 Fix /unlist request 2024-02-08 17:09:26 +00:00
Zwip-Zwap Zapony
21b8acf75d Change P_MobjWasRemoved to P_RemoveMobj in the error message (thanks Zwip-Zwap Zapony) 2024-02-07 20:30:20 +00:00
Hanicef
e1d15b5ed5 Fix segfault when removing mobjs while iterating thinglist 2024-02-07 18:42:24 +01:00
sphere
1b2b7658a8 Merge branch 'fix-table-key-archiving' into 'next'
Fix archiving with tables that contain tables as keys

See merge request STJr/SRB2!2245
2024-02-07 15:09:38 +00:00
Lactozilla
7724fafa0b Merge branch 'fix-1183' into 'next'
Fix #1183

Closes #1183

See merge request STJr/SRB2!2282
2024-02-06 21:54:27 +00:00
Logan Aerl Arias
e8c3555c5b Update .gitignore
ignore out folder for VS2022 builds using CMake
2024-02-05 20:55:37 -05:00
Lactozilla
9b33d5c808 Fix build warnings 2024-02-04 20:22:27 -03:00
Lactozilla
e7e54ef28c Merge remote-tracking branch 'stjr/next' into http-download-port 2024-02-04 20:08:52 -03:00
Lactozilla
321415fd19 Rephrase 2024-02-04 20:08:49 -03:00
Lactozilla
b4beaa9f43 HTTP downloader port 2024-02-04 20:00:51 -03:00
sphere
c91fc082f9 Merge branch 'oldspecnightsrecordsfix' into 'next'
Fix hud_nightsrecords in old (multiplayer) special stages

See merge request STJr/SRB2!2191
2024-02-04 21:35:36 +00:00
sphere
fd92193f7e Merge branch 'fix-slope-plane-distortion' into 'next'
Fix equation plane distortion

See merge request STJr/SRB2!2283
2024-02-04 21:33:17 +00:00