Jaime Passos
285a2ec05d
Revert "Merge branch 'software-clownery' into 'master'"
...
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Jaime Passos
2bdd411736
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 23:21:42 -03:00
Jaime Passos
016cced4a1
R_CalculateSegDistance stuff...
2019-12-26 01:58:38 -03:00
Jaime Passos
11dc6801dc
Update comments
2019-12-17 16:14:26 -03:00
Jaime Passos
1002c47407
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03: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
Jaime Passos
51c7074247
Fix Ploadflat closing the game with "Too many flats in level" error message
2019-12-11 22:45:47 -03:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03: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
MascaraSnake
9a0a85ba67
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
Louis-Antoine
c5003cb494
Disable perfect bonus in multiplayer
2019-11-14 19:25:19 +01:00
Jaime Passos
2fa2ebe4a7
Optimise
2019-11-14 14:12:36 -03:00
Jaime Passos
499c724f9f
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
0a44158db9
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
2019-11-14 12:27:22 -03:00
MascaraSnake
aeedb86d8c
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
MascaraSnake
d648a2ad87
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
Jaime Passos
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
MascaraSnake
fae4fb16e9
Merge branch 'internal-md3-vanilla-c' into 'master'
...
Internal MD3 merge 2 good riddance glBegin
See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
Jaime Passos
fbe850e63e
Use REDFLR for missing flats
2019-11-09 00:08:22 -03:00
Jaime Passos
a1339b60ad
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
toaster
2663c79d21
STOP THE CLOCK linedef exectutor!
...
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.
Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00