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 |
|
James R
|
5ba363fda6
|
Make the cmake version 2.2.0
|
2019-12-07 14:28:03 -08:00 |
|
James R
|
7167e59b83
|
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
|
9c5e558117
|
Remove patch.pk3 from cmake
|
2019-12-07 20:31:40 +02:00 |
|
Jaime Passos
|
69c08f93bb
|
Update d_main.c
|
2019-12-07 11:55:53 -03:00 |
|
MascaraSnake
|
79b04c5872
|
One more asset hash change
|
2019-12-07 14:17:26 +01:00 |
|
toaster
|
0bd1399c52
|
Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.
|
2019-12-07 10:22:10 +00:00 |
|
Alam Ed Arias
|
d02648450a
|
Let fix that GCC warning
|
2019-12-06 18:12:50 -05:00 |
|
MascaraSnake
|
0768032a43
|
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
|
2019-12-07 00:12:10 +01:00 |
|
MascaraSnake
|
4dde4c6d07
|
Minor changes to the readme
|
2019-12-07 00:11:57 +01:00 |
|
James R
|
53cfba1f42
|
Use strncpy
|
2019-12-06 15:09:07 -08:00 |
|
MascaraSnake
|
c33d163c00
|
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
|
0d22970c78
|
Change versionstring to 2.2.0
|
2019-12-06 23:47:05 +01:00 |
|
MascaraSnake
|
f6563c85ed
|
Updated MD5 hashes
|
2019-12-06 23:43:54 +01:00 |
|
MascaraSnake
|
bf477c6ed4
|
Merge branch 'master' into nondevelop
|
2019-12-06 23:23:01 +01:00 |
|
MascaraSnake
|
239242f513
|
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
|
78de32b623
|
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
|
5f9f255f77
|
Correct comment
|
2019-12-06 17:10:14 -05:00 |
|
toaster
|
66bd864592
|
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.
|
2019-12-06 22:06:35 +00:00 |
|
lachwright
|
8f2d81ec74
|
Lengthen credits for msuic parity
|
2019-12-07 05:59:26 +08:00 |
|
MascaraSnake
|
a0ebb32912
|
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
|
a3549cc8f2
|
Merge branch 'datestuff' into 'master'
Date stuff
See merge request STJr/SRB2Internal!618
|
2019-12-06 16:10:36 -05:00 |
|