stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 19:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
9584 commits 172 branches 41 tags 285 MiB
Commit graph

9584 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
Zachary McAlpin
458f3cb14b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-29 20:37:11 -06:00
GoldenTails
bc88def225 Slap in some Ctrl+Insert (copy) support too while I'm at it. 
Also added a comment but you didn't see that.
 2019-12-29 20:22:58 -06:00
GoldenTails
9d701d722e Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete. 
Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
 2019-12-29 20:15:18 -06:00
James R
98313a8216 Merge branch 'bruh' into 'next' 
Fix fuckup

See merge request STJr/SRB2!598
 2019-12-29 19:56:20 -05:00
James R
97c5e63dc3 Initialize 'supported' array 2019-12-29 16:52:39 -08:00
GoldenTails
ae9adce873 Replace magic numbers with less magic and more readable chars. 2019-12-29 18:26:56 -06:00
James R
a4db30b0cc Merge branch 'newnodeformats' into 'next' 
New node formats

See merge request STJr/SRB2!595
 2019-12-29 19:11:07 -05:00
Jaime Passos
2f4c270a7b Update r_segs.c 2019-12-29 19:43:38 -03:00
Zachary McAlpin
fdd1823ee2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-29 16:19:53 -06:00
MascaraSnake
136c656cc0 Properly pass nodes data along to functions that need it without breaking the original data pointer 2019-12-29 22:11:15 +01:00
MascaraSnake
81422c4e6d Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly" 
This reverts commit cfc6428569.
 2019-12-29 21:57:47 +01:00
MascaraSnake
cfc6428569 Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly 2019-12-29 21:42:16 +01:00
MascaraSnake
e88556efe1 P_GetNodetype: The virtnodes pointer is supposed to be the output parameter, so we have to pass a pointer to that pointer 2019-12-29 21:00:20 +01:00
MascaraSnake
dd02fe0d78 P_GetNodetype: Set virtnodes for traditional Doom format 2019-12-29 20:43:41 +01:00
MascaraSnake
882e8ef7b8 Separate shared parts of seg initialization into P_InitializeSeg 2019-12-29 20:24:14 +01:00
MascaraSnake
36f86077da Move loading of extended subsectors and segs into its own function 2019-12-29 19:54:04 +01:00
MascaraSnake
c287b86fab Get rid of duplicated code in the extended seg parsing 2019-12-29 19:04:50 +01:00
MascaraSnake
3839e95d63 Move reading of extra vertices into separate function 2019-12-29 18:07:44 +01:00
MascaraSnake
45ca959f97 -Move reading of actual extended nodes into separate function, cutting down on code duplication in the process 
-Fix a typo in the segs reading
 2019-12-29 17:52:49 +01:00
MascaraSnake
e5cb7a7833 Merge branch 'next' into newnodeformats 2019-12-29 16:05:55 +01:00
MascaraSnake
bf25128986 Merge branch 'mapload-refactor' into 'next' 
Refactor map loading functions

See merge request STJr/SRB2!594
 2019-12-29 10:04:27 -05:00
MascaraSnake
9d009edfc8 Move copying of the nodes signature out of the else case 2019-12-29 15:59:15 +01:00
MascaraSnake
0aed60f4de Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.) 2019-12-29 15:50:53 +01:00
MascaraSnake
8032054a47 Separate loading of extended nodes into its own file 2019-12-29 15:15:32 +01:00
MascaraSnake
bb9093ff57 Merge branch 'kill-zshift' into 'next' 
Eliminate all unnecessary uses of ZSHIFT

See merge request STJr/SRB2!580
 2019-12-29 08:35:52 -05:00
Nev3r
389b9e35c4 Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
MascaraSnake
c43a83dc04 Remove virtres_t pointer in P_SpawnSpecials that's no longer needed 2019-12-29 12:26:02 +01:00
MascaraSnake
abdfe60aa7 Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on 2019-12-29 12:01:41 +01:00
James R
566b4a1626 Don't let us warp to a map that doesn't exist (really!) 
Okay so 6464df9876, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.
 2019-12-29 02:44:27 -08:00
James R
404f3c13e4 If we move the -warp code down, map searching can be used 2019-12-29 02:31:48 -08:00
James R
0a014755b9 I'm still an idiot 2019-12-29 02:16:37 -08:00
James R
2ffff56b39 Who cares? 2019-12-29 02:15:48 -08:00
James R
19aafbfd0b Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
James R
e04e1ac1b4 Merge branch 'mfe-lua' into 'next' 
Add missing MFE_ flags to Lua (resolves #103)

See merge request STJr/SRB2!592
 2019-12-29 04:44:29 -05:00
MascaraSnake
b333770a3b Merge branch 'next' into mapload-refactor 2019-12-29 09:40:19 +01:00
MascaraSnake
cfadbb0f36 -Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup 
-Fix a broken condition during setup of texture fields for the change music linedef
 2019-12-29 09:39:50 +01:00
Zachary McAlpin
ef9a7b01f5 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-28 22:29:10 -06:00
Steel Titanium
0d15f27026 Fix emerald hunt not working properly 2019-12-28 21:57:29 -05:00
Alam Ed Arias
d588e3ca9c Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Alam Ed Arias
2acb4f9840 Revert "Delete the original configuration file." 
This reverts commit 2cf94ea6ae.
 2019-12-28 21:43:10 -05:00
Alam Ed Arias
c27d062cc8 Merge branch 'fixmain' into 'master' 
Fix logfiles crashing Windoze (resolves #102)

Closes #102

See merge request STJr/SRB2!591
 2019-12-28 21:15:23 -05:00
Jaime Passos
f997866b4d Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
James R
0237dc8ca2 Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC 2019-12-28 17:52:22 -08:00
Jaime Passos
244f0b228f Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Jaime Passos
3bb7fd4cbf Fix logfiles crashing Windoze 2019-12-28 22:14:23 -03:00
Jaime Passos
e63f77ea1a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
James R
90e56bcdf9 Merge branch 'levelload-refactor' into 'next' 
Hack P_SetupLevel into little pie- actually just clean it up a bit

See merge request STJr/SRB2!587
 2019-12-28 19:37:06 -05:00
James R
97f1da9c12 Merge branch 'give-brains-back' into 'next' 
Remove MF_NOTHINK from join-breaking referenced objects

See merge request STJr/SRB2!589
 2019-12-28 19:33:35 -05:00
Jaime Passos
dede51fc4c Disallow few more characters. 2019-12-28 21:05:42 -03:00