Commit graph

8677 commits

Author SHA1 Message Date
Nev3r
3da7a69d0b Move loading functions around a bit and refactor the stage data allocation code. 2019-12-12 10:35:38 +01: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
Jaime Passos
740f095219 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-12 01:39:46 -03:00
Jaime Passos
51c7074247 Fix Ploadflat closing the game with "Too many flats in level" error message 2019-12-11 22:45:47 -03:00
Tatsuru
2e1460cb5c Hugging now requires being in the same Z position
Don't try this at home
2019-12-11 19:13:22 -06:00
Jaime Passos
aaa0841322 Sad! 2019-12-11 22:11:00 -03:00
Jaime Passos
3c9cc53185 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03: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
James R
66524a1e3f Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
lachwright
fa52f69c21 Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Jaime Passos
d00ce727a6 Organise 2019-12-11 13:26:28 -03:00
Jaime Passos
fac339a1d3 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into wipes2 2019-12-11 13:14:11 -03:00
Jaime Passos
a3612f8765 Update f_wipe.c 2019-12-11 13:09:27 -03:00
Jaime Passos
aa4e3384bb Merge remote-tracking branch 'origin/master' into wipes2 2019-12-11 12:57:59 -03:00
Nev3r
9ab9373084 Treat warnings as errors; comment out unused function. 2019-12-11 16:37:41 +01:00
Jaime Passos
a337ed749c Update r_plane.c 2019-12-11 12:36:54 -03:00
Nev3r
935a1d182c Epic oversight in upside-down spawn offset. 2019-12-11 15:48:44 +01:00
Jaime Passos
463e2567fe Restore portal culling code that went gone by pure accident 2019-12-11 11:35:34 -03:00
Nev3r
6b5889386c Oversight, do not free the data yet vres_Free() does it already at the end. 2019-12-11 15:16:56 +01:00
Nev3r
4fcdf23bc6 Merge branch 'virtres' of https://git.magicalgirl.moe/STJr/SRB2/ into virtres
# Conflicts:
#	src/p_setup.c
2019-12-11 14:44:42 +01:00
Nev3r
576ad30c24 Remove wrappers and dupes for map lump reading, as they are no longer used. 2019-12-11 14:40:31 +01:00
Nev3r
b9f99792db P_MakeMapMD5() now uses virtres. 2019-12-11 14:20:08 +01:00
Nev3r
22392eaa5f Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question. 2019-12-11 14:04:09 +01:00
Nev3r
ea6becb876 'prepare' mapthings using virtres in P_LevelInitStuff(). Whether 'preparing' them or not is actually necessary is another matter. 2019-12-11 13:54:15 +01:00
Nev3r
03dab2ae5e P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not. 2019-12-11 13:22:07 +01:00
Nev3r
ffb11a6bed P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not. 2019-12-11 12:48:41 +01:00
Nev3r
23c0c8f68e Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears. 2019-12-11 11:44:46 +01:00
Nev3r
a57ead226e Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now. 2019-12-11 11:10:31 +01:00
Nev3r
be3234a4e8 Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead. 2019-12-11 10:13:52 +01:00
GoldenTails
5b61af47b0 Stop characters from being able to activate their abilities when doing a shield ability!
Fixes #61.
2019-12-10 23:55:52 -06:00
Jaime Passos
bd51f26807 Tilted water 2019-12-10 17:01:19 -03:00
Nev3r
3214ad0b3a Fix NiGHTS bumpers height. 2019-12-10 18:53:49 +01:00
Steel Titanium
ab50f1255d appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
Nev3r
842afa8d67 Move mobj spawn Z calculating to a separate function. 2019-12-10 18:03:15 +01:00
Nev3r
940c36ef24 Separate Emerald Hunt emerald spawning into another function. 2019-12-10 14:21:08 +01:00
James R
7553046a52 Cvar and menu option to let user increase turn speed
cam_turnmultiplier and cam2_turnmultiplier.

"Camera Speed" has been renamed to "Camera Spacial Speed" in the menu. "Camera
Turning Speed" is now an option.
2019-12-09 16:30:03 -08:00
Nev3r
3e9e57b3b3 Removed seemingly redundant (and incorrect) mapthing Z load code.
The proper code seems to sit inside P_SpawnMapThing() and the SpawnHoop functions. Time will tell if I've actually commited an atrocity.
2019-12-09 14:05:22 +01:00
Nev3r
d27a5d7992 Move the axis spawning code out of the mapthing read function, and read the mapthing z in the mapthing read function. 2019-12-09 13:26:31 +01:00
Jaime Passos
af292bc2c5 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos
042f14236b Speed up level loading
Don't flush every texture just because the palette MAY have changed
2019-12-08 22:28:13 -03:00
Jaime Passos
4ccc854a90 Die 2019-12-08 22:12:56 -03:00
Jaime Passos
768293fb0b Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos
4bb8532714 Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias
409e938735 Merge branch 'public_next' into private 2019-12-08 12:56:37 -05:00
Alam Ed Arias
c17d52e5a8 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -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