Commit graph

233 commits

Author SHA1 Message Date
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -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
toaster
0f287c9b30 Actually, wait; this is way better and cleaner. 2019-11-29 20:41:13 +00:00
toaster
2aafcf9e5b Match final countdown timer to timer (resolves #400). 2019-11-29 20:35:59 +00:00
toaster
937cd7688a Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.
2019-11-25 18:52:38 +00:00
Jaime Passos
2527e85108 fix showfps with st_translucency 2019-11-23 18:41:28 -03:00
Jaime Passos
bb3958d463 Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes 2019-11-19 21:49:45 -03:00
toaster
9aeed5f146 Fix the coords of the subtitle. 2019-11-19 12:59:01 +00:00
Jaime Passos
9939e1f775 change vertical alignment 2019-11-18 21:45:30 -03:00
Jaime Passos
51e4153ec0 fix subttl 2019-11-18 21:44:02 -03:00
Jaime Passos
3ed8470b58 remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos
e30d85e265 adjust duration 2019-11-18 19:08:04 -03:00
Jaime Passos
925940b44e Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
Jaime Passos
8ce00492c2 Merge remote-tracking branch 'origin/master' into titlecards 2019-11-18 17:55:47 -03:00
MascaraSnake
abdfc2d237 Merge branch 'exit-move-lj' into 'master'
Post-exit movement

See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
Jaime Passos
649d040cfe restore zigzags 2019-11-18 15:32:48 -03:00
Jaime Passos
0f9aa2fcb0 V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements 2019-11-18 15:18:27 -03:00
Jaime Passos
1f9dc8aaa1 missing prototype 2019-11-18 15:13:31 -03:00
Jaime Passos
e3ad4f5731 perplayer 2019-11-18 15:12:55 -03:00
Jaime Passos
8005112879 invert conditional 2019-11-18 15:06:07 -03:00
Jaime Passos
bb8b49b738 LF_WARNINGTITLE 2019-11-18 15:04:40 -03:00
Jaime Passos
a644fe6e77 oh sh 2019-11-18 14:32:34 -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
53c1914501 Merge remote-tracking branch 'origin/master' into titlecards 2019-11-17 23:57:18 -03:00
Louis-Antoine
738bfdf99b Add missing checks for PF_FINISHED in HUD code 2019-11-18 03:27:39 +01:00
Nev3r
e3e93016cd Mapname lowercase support (#146)
*  Moved levelname parsing to before where uppercase conversion occurs.
*  Extended titlecard font range.
*  Replaced misc. "ZONE" strings with "Zone" for titlecard purposes.
*  Don't convert to uppercase when rendering the titlecard name.


Signed-off-by: Nev3r <apophycens@gmail.com>
2019-11-16 20:36:25 -05: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
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -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
toaster
50b92afc4e * Restart Metal recording from beginning if retry is used.
* Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot).
* Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
Steel Titanium
2aa72aa2d4 Merge branch 'master' into newmenus 2019-10-13 20:12:48 -04:00
toaster
ce85daeaca Hide NiGHTS grade in singleplayer if ranking is below GRADE_A, on Rob's request.
(Resolves #250)
2019-10-13 16:30:29 +01:00
MascaraSnake
5b8b17ecf4 Don't deplete special stage timer in water if you have water protection 2019-10-07 09:01:17 +02:00
Steel Titanium
2c7e53f32f Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
toaster
571daa256a Always pretend cv_playersforexit is 4 in co-op special stages. 2019-09-19 18:44:55 +01:00
toaster
667dcd5bca Continue screen! With aaaaaall the new assets to go with it.
* https://cdn.discordapp.com/attachments/428262628893261828/621129794045870108/srb20077.gif
* https://cdn.discordapp.com/attachments/428262628893261828/621129785124585502/srb20078.gif
* I will be accepting no further questions at this time.
2019-09-11 00:50:51 +01:00
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
mazmazz
c6dcb853e1 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-07 22:25:47 -04:00
toaster
135a6636a7 Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!) 2019-09-07 12:10:50 +01:00
toaster
ffec691023 Bunch of fixes for dying in MP special stages.
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
2019-09-04 15:51:14 +01:00
toaster
b5ddea4827 Seperate "Game" and "Over" assets, per Sev's request and design.
https://cdn.discordapp.com/attachments/428262628893261828/618812279127015475/srb20069.gif
2019-09-04 15:21:00 +01:00
Jaime Passos
c72f3cbc69 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-02 23:34:25 -03:00
toaster
0700ad229f Lots of death stuff.
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
2019-09-01 15:55:23 +01:00