stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
15712 commits 171 branches 41 tags 312 MiB
Commit graph

15712 commits

This branch
This branch
All branches
Author SHA1 Message Date
spherallic
8bbdf1037f Merge branch 'next' into fruits-clipper 2024-02-15 16:36:35 +01:00
spherallic
b312377800 Clean up overzealous time check 2024-02-15 16:36:05 +01:00
Logan Aerl Arias
fa690e0190 Merge branch 'VSFix' into 'next' 
Visual Studio compiles again

See merge request STJr/SRB2!2315
 2024-02-14 23:57:54 +00:00
Logan Aerl Arias
5a16fd138f fix path to x64 curl in VS project file 
(edited by hand via WebIDE)
 2024-02-14 23:53:13 +00:00
Arthur
0cb4a1397d Remove absolute paths 2024-02-14 18:04:58 -05:00
Arthur
99c91d4bb3 Visual Studio compiles again 2024-02-14 16:36:36 -05:00
Hanicef
493a7db1ee Fix thinker being added twice to mobj 2024-02-14 21:54:28 +01:00
Gustaf Alhäll
b808fde260 Fix broken titlescreen for MT_ALTVIEWMAN mobjs 2024-02-14 21:45:53 +01:00
Gustaf Alhäll
5c2821fb10 Fix faulty references when spawning mobjs 2024-02-14 21:45:52 +01:00
Alam Ed Arias
dfd47733e2 Merge branch 'fix-command-line-input' into 'next' 
Fix input via command line/terminal not working

See merge request STJr/SRB2!2296
 2024-02-14 17:26:45 +00:00
Alam Ed Arias
3a5c5410bf Merge branch SRB2:next into fix-command-line-input 2024-02-14 17:12:05 +00:00
Sal
f09dd25bbb Merge branch 'gamedata-check' into 'next' 
Fix G_SaveGameData crash if quit early

See merge request STJr/SRB2!2313
 2024-02-14 10:40:50 +00:00
SteelT
a9a1a4bf65 Fix FreeBSD memory reporting if built with cmake 2024-02-14 02:59:26 -05:00
SteelT
97afd18e96 Fix G_SaveGameData crash if quit early 
Fixes a crash that can occur if data struct is passed to G_SaveGameData before it is allocated.
 2024-02-14 02:27:58 -05:00
Alam Ed Arias
6d820223f7 Merge branch 'cmake_w_clang' into 'master' 
Switch Clang build to use cmake

See merge request STJr/SRB2!2312
 2024-02-13 18:23:40 +00:00
Alam Ed Arias
e76e3f244e Switch Clang build to use cmake 2024-02-13 18:23:40 +00:00
spherallic
f4588d50b0 Merge branch 'next' into fruits-clipper 2024-02-13 19:14:26 +01:00
spherallic
e26f1b4027 Restore overwritten linedef action in UZB config 2024-02-13 16:48:04 +01:00
spherallic
985b3f9fc3 Update UZB config files 2024-02-13 16:45:06 +01:00
sphere
ff851dcb44 Merge branch 'get-sys-name' into 'next' 
Add common I_GetSysName function

See merge request STJr/SRB2!2308
 2024-02-13 15:42:30 +00:00
sphere
2675441f74 Merge branch 'freeslot-double' into 'next' 
Match mobj freeslot count with SRB2Kart

See merge request STJr/SRB2!2298
 2024-02-13 15:34:44 +00:00
sphere
245a53b423 Merge branch 'fix-1190' into 'next' 
Fix #1190

Closes #1190

See merge request STJr/SRB2!2310
 2024-02-13 15:33:59 +00:00
sphere
eaab39bbaf Merge branch 'fix-searchblockmap' into 'next' 
Fix Lua 'searchBlockmap' (resolves #1191)

Closes #1191

See merge request STJr/SRB2!2309
 2024-02-13 15:32:41 +00:00
Logan Aerl Arias
fc36b8d7f5 Merge branch 'cherry-pick-65da8e52' into 'master' 
Merge branch 'batocera' into 'master'

See merge request STJr/SRB2!2311
 2024-02-13 00:34:59 +00:00
Logan Aerl Arias
832c46b2ad Merge branch 'batocera' into 'next' 
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2278

(cherry picked from commit 65da8e5291)

dcd68add Update .gitlab-ci.yml file
4d0b3722 Update .gitlab-ci.yml file
d1de54dc Update .gitlab-ci.yml file
083176f1 Update .gitlab-ci.yml file
abbb3a44 Update .gitlab-ci.yml file
ebe3262d Update .gitlab-ci.yml file
 2024-02-13 00:26:24 +00:00
Logan Aerl Arias
65da8e5291 Merge branch 'batocera' into 'next' 
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2278
 2024-02-13 00:26:00 +00:00
Logan Aerl Arias
ae8bfbe763 Merge branch '1168-accessing-an-invalid-variable-in-ticcmd_t-crashes-the-game' into 'next' 
check if LUA field exists before accessing it

Closes #1168

See merge request STJr/SRB2!2261
 2024-02-12 19:58:56 +00:00
Lactozilla
356e455335 Fix #1190 2024-02-12 16:58:00 -03:00
Lactozilla
a709ff9ecd Fix Lua 'searchBlockmap' 2024-02-12 16:28:32 -03:00
Logan Aerl Arias
3087107175 Merge branch 'shieldrespawn' into 'next' 
Respawn Certain Monitors in Co-op

See merge request STJr/SRB2!2152
 2024-02-12 05:46:25 +00:00
SMS Alfredo
2e7fa1990a Respawn Certain Monitors in Co-op 2024-02-12 05:46:25 +00:00
Logan Aerl Arias
74b65956df Merge branch 'emblemexitfix' into 'next' 
Only Award Bonuses / Record Attack Emblems from Physically Beating a Level

See merge request STJr/SRB2!2161
 2024-02-12 05:40:42 +00:00
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