stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-03 01:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
8771 commits 177 branches 41 tags 198 MiB
Commit graph

8771 commits

This branch
This branch
All branches
Author SHA1 Message Date
lachwright
d3c56cd807 Remove flight indicator when AI Tails is taken over by second player 2019-12-31 16:48:29 +08:00
James R
939814d479 Merge remote-tracking branch 'origin/master' into next 2019-12-30 22:37:24 -08:00
James R
3112dff345 Merge branch 'oops' into 'next' 
Fix unknown gametype for map command crashing the game

See merge request STJr/SRB2!606
 2019-12-31 01:34:39 -05:00
James R
34687e85d7 Merge branch 'emeraldhunt-fix' into 'next' 
Fix emerald hunt not working properly

See merge request STJr/SRB2!593
 2019-12-31 01:34:17 -05:00
James R
b5df2d5c3f Merge branch 'polyobj-waypoint-thinker-optimise' into 'next' 
Polyobj waypoint thinker optimise

See merge request STJr/SRB2!586
 2019-12-31 01:33:01 -05:00
James R
4b91e49bf4 Merge branch 'fix-lua-scorechains' into 'next' 
Fix scoreadd not doing anything in certain cases when modified by Lua

See merge request STJr/SRB2!579
 2019-12-31 01:32:22 -05:00
James R
077c453e33 Merge branch 'dashmode-ctf-monitors' into 'next' 
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
 2019-12-31 01:31:55 -05:00
James R
8e61b1003a Merge branch 'dashspeed-fix' into 'next' 
Cap dashspeed between mindash and maxdash before revving.

See merge request STJr/SRB2!565
 2019-12-31 01:31:43 -05:00
James R
36c5bb7b0d Fix NOHW compiling 2019-12-30 20:18:08 -08:00
James R
782bf8d31e Fix NOMIXER compiling 2019-12-30 20:08:29 -08:00
James R
4bf3597116 Fix NOOPENMPT compiling 2019-12-30 19:19:17 -08:00
James R
5e94ca07bc Use gametypecount in G_GetGametypeByName 2019-12-30 17:57:38 -08:00
James R
fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
James R
80bb6fe7a0 Merge branch 'modid' into 'next' 
Put a mod name in SERVERINFO

See merge request STJr/SRB2!577
 2019-12-30 15:41:08 -05:00
James R
5e5f3c4fa7 Merge branch 'renderswitch' into 'master' 
Renderer switching

See merge request STJr/SRB2!550
 2019-12-30 15:36:17 -05:00
Monster Iestyn
7c9b1ee2cb Fix P_SetTarget crash by setting th->target to NULL first 2019-12-30 11:49:01 +00:00
James R
c46bfa2be9 Merge branch 'saloondoor-fix' into 'next' 
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
 2019-12-30 00:25:37 -05:00
Tatsuru
3d724f302d Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
James R
7886a4bbee Don't warn if we start in OpenGL 2019-12-29 18:37:44 -08:00
James R
569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08: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
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
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
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
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
James R
0237dc8ca2 Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC 2019-12-28 17:52:22 -08:00