Nev3r
befe33e239
Remove redundant netarchive-related sector vars as they're not used anymore.
...
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 12:42:38 +01:00
Nev3r
7be95c1999
Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps.
...
Fix print type issue.
2019-12-23 12:30:32 +01:00
MascaraSnake
2e802dde5c
P_LoadMapData(): Throw an error if resources are not found.
2019-12-22 23:22:15 +01:00
MascaraSnake
f91e9bdee5
Merge branch 'next' into virtres
...
# Conflicts:
# src/p_setup.c
2019-12-22 23:02:47 +01:00
James R
eb39e72a10
Merge branch 'spawn_z_refactor' into 'next'
...
(UDMF prereq.) Spawn Z refactor
See merge request STJr/SRB2!536
2019-12-16 23:21:07 -05:00
MascaraSnake
a144523a42
Some more cleanup of map loading code
2019-12-16 00:17:20 +01:00
MascaraSnake
3c9354991e
Minor cleanup of virtual resources code
2019-12-16 00:04:48 +01:00
MascaraSnake
71767b7d11
SpawnEmeraldHunt() -> P_SpawnEmeraldHunt()
2019-12-15 09:49:54 +01:00
James R
bc939a2211
Merge branch 'opengl-is-a-bad-renderer' into 'master'
...
OpenGL fixes
See merge request STJr/SRB2!519
2019-12-14 16:48:50 -05:00
Jaime Passos
7f6099e186
Don't reset the FOV
2019-12-12 17:06:04 -03:00
Nev3r
a7f501615d
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
2d526c9a3b
Move map data load procedure to separate functions.
2019-12-12 11:16:55 +01:00
Nev3r
3da7a69d0b
Move loading functions around a bit and refactor the stage data allocation code.
2019-12-12 10:35:38 +01: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
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
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
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
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
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
Alam Ed Arias
c17d52e5a8
Merge branch 'master' into opengl-is-a-bad-renderer
2019-12-08 12:50:45 -05:00
Alam Ed Arias
86ef0d5e55
P_AddWadFile: the PK3 may not have folders
2019-12-08 12:35:21 -05:00
Jaime Passos
4a593ed92d
HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly
...
(done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)
2019-12-08 04:40:29 -03:00
Jaime Passos
33f9ce9d1c
Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading
2019-12-08 04:32:25 -03:00
Jaime Passos
5d2bbb53fc
Optimize mipmaps
2019-12-08 03:23:37 -03:00
MascaraSnake
fffd385151
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
0fa1525749
Remove unnecessary function parameters from title card code
2019-12-05 01:58:19 -03:00
Jaime Passos
64f6f5a84a
fix Ploadflat warning
2019-12-04 15:41:29 -03:00
MascaraSnake
ee9e1aaafb
Merge branch 'savedatareorder' into 'master'
...
Savedata load order of operations change
See merge request STJr/SRB2Internal!583
2019-12-03 02:18:06 -05:00
Alam Ed Arias
b869d29580
Fixup compiling errors
2019-12-02 12:12:26 -05:00
toaster
51a5f918e9
Change the order of operations such that savedata info is loaded before mapthings are spawned, so that if you have all the emeralds, the emerald objects won't spawn in BCZ2 if you use the SP savefile's level select to go to it directly.
2019-11-30 15:52:41 +00:00
lachwright
82e393ab73
Fix 'Speeding off to...' placement in non-greeen resolutions
2019-11-26 00:16:46 +08:00
Jaime Passos
4d18646881
fix RA fade
2019-11-23 18:15:09 -03:00
MascaraSnake
e70f8b383e
Fixed a missing space in the "Speeding off to..." text
2019-11-23 18:51:32 +01:00
Jaime Passos
476e6cc6ed
Fix crossfades
...
Fixes NoReload using the wrong wipestyle.
Also fixes non-titlemap title screen wipes using the wrong wipestyle.
2019-11-22 17:44:42 -03:00
toaster
c2cb2b7a35
Make the SPEEDING OFF TO ZONE text that appears while loading:
...
* Use a mixed case "Zone" to match the mixed case level titles.
* Have V_TRANSLUCENT to not stick out too much against pure black/white backgrounds. (Can revert this aspect if necessary, but I think you'll agree it's a good balance between readable and aesthetic.)
2019-11-19 13:00:37 +00:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
Jaime Passos
75468a1d5d
map header option
2019-11-18 14:08:47 -03:00
Jaime Passos
23a5801a09
lua
2019-11-18 13:50:44 -03:00
Jaime Passos
8ad20c1108
Organize
2019-11-18 12:56:41 -03:00
Jaime Passos
7bd19aaed1
arg
2019-11-18 11:42:45 -03:00
Jaime Passos
f37e0de8c5
stuff
2019-11-18 11:39:54 -03:00
Jaime Passos
bc7686c16a
LEVELWIPES
2019-11-15 18:21:12 -03:00
Jaime Passos
7168d72580
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:24:42 -03:00
MascaraSnake
0c304eefce
Merge branch 'coop-item-respawn' into 'master'
...
Allow item respawn in co-op again
See merge request STJr/SRB2Internal!466
2019-11-14 18:06:32 -05:00
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00