stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-24 12:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
8283 commits 174 branches 42 tags 257 MiB
Commit graph

8283 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nev3r
b629434ea2 Fix shadowing var declare, and fix mixed declaration warnings. 2019-12-13 12:28:41 +01:00
Nev3r
c649385f9a Fix more compile warnings... But why is subsector.numlines signed anyway? 2019-12-13 12:19:12 +01:00
Nev3r
0dccc26cfa Kill compile warnings. 2019-12-13 11:56:24 +01:00
Nev3r
0c3147eb4c Remove decorate-related line in the config, and fix the lump recognition. 2019-12-13 11:40:55 +01:00
Nev3r
10b1c9c4e9 Clean up BSP loading procedure a little. 2019-12-13 11:13:52 +01:00
Nev3r
a7c3464ed4 Fix epic hijack copypaste oversight on M_GetToken() 2019-12-13 11:07:54 +01:00
Nev3r
4f51950041 Added WIP ZB config business 2019-12-12 20:59:06 +01:00
Nev3r
0e2af083b3 Early rudimentary UDMF support. 2019-12-12 20:26:32 +01:00
Nev3r
da6dde1a5f Hijack the TEXTURES parser for UDMF usage. :) 2019-12-12 18:25:35 +01:00
Nev3r
47f6949464 Merge branch 'spawn_z_refactor' into udmf-base 2019-12-12 15:05:07 +01:00
Nev3r
c5d8fe4752 Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection. 2019-12-12 15:04:48 +01:00
Nev3r
793a2b8ce1 Handle stage data initialization and defaults in a separate function. 2019-12-12 13:57:08 +01:00
Nev3r
3b216441d4 Move flat caching procedure. 2019-12-12 12:57:31 +01:00
Nev3r
51c129c0b7 Add rudimentary support for different node formats. 2019-12-12 12:42:37 +01:00
Nev3r
0670476c85 Add glseg junk. 2019-12-12 12:32:11 +01:00
Nev3r
df95a8f501 Merge branch 'virtres' into udmf 
# Conflicts:
#	src/p_setup.c
 2019-12-12 11:46:04 +01:00
Nev3r
c64a9d7ae9 Stop things from becoming Chocapic in THZ3, ACZ2, and special stages. 
Temporarily revert function call order for mapthings.
 2019-12-12 11:37:48 +01:00
Nev3r
ec9f727e53 Move map data load procedure to separate functions. 2019-12-12 11:16:55 +01:00
Nev3r
43cbad200c Move loading functions around a bit and refactor the stage data allocation code. 2019-12-12 10:35:38 +01:00
Nev3r
c15654f7c4 Merge branch 'virtres' into udmf 2019-12-11 16:38:06 +01:00
Nev3r
edfe053cc3 Treat warnings as errors; comment out unused function. 2019-12-11 16:37:41 +01:00
Nev3r
179f5e4f4c Merge branch 'spawn_z_refactor' into udmf 2019-12-11 15:49:05 +01:00
Nev3r
d34fd4b755 Epic oversight in upside-down spawn offset. 2019-12-11 15:48:44 +01:00
Nev3r
16f2710130 Merge branch 'virtres' into udmf 2019-12-11 15:17:50 +01:00
Nev3r
222336ac0b Oversight, do not free the data yet vres_Free() does it already at the end. 2019-12-11 15:16:56 +01:00
Nev3r
c19c0d5492 P_LoadThingsOnly() no longer reloads the mapthings lump, as mapthings are no longer altered by spawning functions. 2019-12-11 14:56:58 +01:00
Nev3r
a72b0b222d Merge branch 'virtres' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf 
# Conflicts:
#	src/p_setup.c
 2019-12-11 14:54:59 +01:00
Nev3r
4d3ec6db41 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
a87a9e6ff6 Remove wrappers and dupes for map lump reading, as they are no longer used. 2019-12-11 14:40:31 +01:00
Nev3r
9952bae5ee P_MakeMapMD5() now uses virtres. 2019-12-11 14:20:08 +01:00
Nev3r
14ad3b938e 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
4d86dc11a6 '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
bf5a2c68d5 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
f7c69f0c1c 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
854d50f479 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
55f9c74e08 Merge branch 'spawn_z_refactor' into udmf 2019-12-11 11:28:44 +01:00
Nev3r
d2cbdd4fb1 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
584348b91e 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
Nev3r
ca6a7ffbb3 Fix NiGHTS bumpers height. 2019-12-10 18:53:49 +01:00
Steel Titanium
9ab00049dc appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
Nev3r
8466dc5813 Move mobj spawn Z calculating to a separate function. 2019-12-10 18:03:15 +01:00
Nev3r
3dfa526eea Separate Emerald Hunt emerald spawning into another function. 2019-12-10 14:21:08 +01:00
Nev3r
6fe6db8e18 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
8ea7dd418a 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
Alam Ed Arias
2d68eac528 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
d8eccc2921 Merge remote-tracking branch 'public/strcasestr-swap' into buildbot 2019-12-08 12:36:23 -05:00
Alam Ed Arias
1d0cd586ba P_AddWadFile: the PK3 may not have folders 2019-12-08 12:35:21 -05:00
Alam Ed Arias
623629b04a 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
35168ddeae OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
James R
d5816d44f3 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08:00