Commit graph

8256 commits

Author SHA1 Message Date
James R
ff73055b56 Add this back for Windoodoo because I'm an idiot 2019-12-13 15:04:31 -08:00
James R
a9679eb440 Rename signal caught message to be more obvious 2019-12-12 22:01:16 -08:00
James R
e13853e9ba Fix signal handler setup error reporting 2019-12-12 21:57:54 -08:00
James R
6f2324d8df Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place 2019-12-12 21:30:35 -08:00
James R
648f5221c7 Kill child when wait fails, so I_Error exits both 2019-12-12 21:21:25 -08:00
James R
11910e844c Fix idiot mistake 2019-12-12 21:20:51 -08:00
James R
5d9cd1c72a Move everything to i_system.c
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-12 15:08:27 -08:00
James R
ff41ba7979 nix: Fork before game code and wait to catch signals and coredumps
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
2019-12-11 23:46:57 -08:00
James R
b701baca6d Move I_ShutdownConsole to I_ShutdownSystem 2019-12-11 22:10:22 -08:00
James R
d46bd4e8f1 Merge remote-tracking branch 'dev-origin/master' 2019-12-11 16:21:18 -08:00
James R
112ac631ef Merge branch 'garbage' into 'master'
memset SERVERINFO maptitle

See merge request STJr/SRB2Internal!624
2019-12-11 19:19:29 -05:00
Steel Titanium
ab50f1255d appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
Alam Ed Arias
409e938735 Merge branch 'public_next' into private 2019-12-08 12:56:37 -05:00
Alam Ed Arias
f7abc7c30f Merge branch 'buildbot' into 'master'
Fix All the buidlbot issues

See merge request STJr/SRB2!520
2019-12-08 12:49:26 -05:00
Alam Ed Arias
3bcc16be11 Merge remote-tracking branch 'public/strcasestr-swap' into buildbot 2019-12-08 12:36:23 -05:00
Alam Ed Arias
86ef0d5e55 P_AddWadFile: the PK3 may not have folders 2019-12-08 12:35:21 -05:00
Alam Ed Arias
7e5c8d81e4 OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL 2019-12-08 12:33:11 -05:00
Alam Ed Arias
a3857301cd OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
James R
3482e147c2 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08:00
James R
ee07656120 memset this or the stupid masterserver (used to) show garbage bytes
Also for security I guess...
2019-12-07 15:47:18 -08:00
James R
dbf83f90c5 Make the cmake version 2.2.0 2019-12-07 14:28:03 -08:00
James R
b0b471868c Merge branch 'cmake-no-patch-pk3' into 'master'
Remove patch.pk3 from cmake

See merge request STJr/SRB2!516
2019-12-07 17:26:35 -05:00
Tasos Sahanidis
16ca409b11 Remove patch.pk3 from cmake 2019-12-07 20:31:40 +02:00
MascaraSnake
af81adfdd3 Merge branch 'zbconfig-tweaks' into 'master'
Rename CastleBot FaceStabber to Lance-a-Bot for maximum pun

See merge request STJr/SRB2Internal!622
2019-12-07 12:13:17 -05:00
Jaime Passos
44daeb340e Update d_main.c 2019-12-07 11:55:53 -03:00
MascaraSnake
c2cd1adb8b One more asset hash change 2019-12-07 14:17:26 +01:00
MascaraSnake
90126cfb15 SDURF to SURF turned out to be contentious. 2019-12-07 06:46:37 -05:00
toaster
3b7b788e4c Revert paperprojection, but keep it as a #define in case someone fixes it in a patch. 2019-12-07 10:22:10 +00:00
MascaraSnake
fe6b04c838 Rename SDURF to SURF and CastleBot FaceStabber to Lance-a-Bot for maximum pun 2019-12-07 09:51:09 +01:00
Alam Ed Arias
247ef908f0 Let fix that GCC warning 2019-12-06 18:12:50 -05:00
MascaraSnake
1c4ed89ab6 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal 2019-12-07 00:12:10 +01:00
MascaraSnake
c0bc5f7c5a Minor changes to the readme 2019-12-07 00:11:57 +01:00
James R
c3c3fac1a8 Use strncpy 2019-12-06 15:09:07 -08:00
MascaraSnake
136a4a8e15 Merge branch 'nondevelop' into 'master'
Get 2.2(.0) release ready

Closes #461

See merge request STJr/SRB2Internal!615
2019-12-06 17:47:32 -05:00
MascaraSnake
e31a10df30 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake
7f0bb0686d Updated MD5 hashes 2019-12-06 23:43:54 +01:00
MascaraSnake
3ad7f9e445 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
MascaraSnake
7a9151a969 Merge branch 'stretch-credits' into 'master'
Lengthen credits for msuic parity

See merge request STJr/SRB2Internal!620
2019-12-06 17:19:17 -05:00
MascaraSnake
19286d33f9 Merge branch 'creditweak' into 'master'
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.

See merge request STJr/SRB2Internal!621
2019-12-06 17:18:54 -05:00
Steel Titanium
147960f4db Correct comment 2019-12-06 17:10:14 -05:00
toaster
74279862c3 Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. 2019-12-06 22:06:35 +00:00
lachwright
97b72422c4 Lengthen credits for msuic parity 2019-12-07 05:59:26 +08:00
MascaraSnake
32f76e8c65 Merge branch 'introskiptext' into 'master'
Add "Press ENTER to skip..." text to the intro's first scene

See merge request STJr/SRB2Internal!619
2019-12-06 16:48:29 -05:00
MascaraSnake
fffd385151 Merge branch 'datestuff' into 'master'
Date stuff

See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
MascaraSnake
313afd1ea3 Merge branch 'signpost-cleanup' into 'master'
Signpost fixes

See merge request STJr/SRB2Internal!602
2019-12-06 15:58:46 -05:00
toaster
c5a9a0c246 Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P 2019-12-06 20:50:41 +00:00
MascaraSnake
23e9a3d19c Merge branch 'analogfixes' into 'master'
Small analog mode fixes

See merge request STJr/SRB2Internal!604
2019-12-06 15:32:10 -05:00
Steel Titanium
4cc7bd7a16 get lua_blockmaplib.c too 2019-12-06 15:27:20 -05:00
Steel Titanium
adbdf688e7 Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff 2019-12-06 15:23:02 -05:00
Steel Titanium
7ec6757ecd Fix copy+paste goof 2019-12-06 15:21:41 -05:00