lachwright
bc243beb3b
Merge branch 'master' into newintro
2019-11-30 12:30:12 +08:00
toaster
3f5b91d11b
Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out ( resolves #384 ).
2019-11-28 19:11:12 +00:00
toaster
33a79ae8c0
Now we have mixed case level title font, and since we had a question mark graphic in that for a while, make the continue screen a tad nicer.
2019-11-26 18:25:36 +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
Louis-Antoine
aac5e41f3d
Revert "Render title map on connecting to server screen too"
...
This reverts commit 502c72e975
2019-11-25 01:09:00 +01:00
lachwright
6788bcef7c
Complete new intro
2019-11-24 15:58:03 +08:00
lachwright
703e15ad12
Merge branch 'master' into newintro
2019-11-24 13:11:38 +08:00
lachwright
aa60a34e74
WIP intro graphics update
2019-11-22 20:08:23 +08:00
sphere
3a2a1130e6
Reword some evaluation sentences.
2019-11-21 02:24:12 +01:00
sphere
693d6b5ca5
Rename "secrets" to "extras".
2019-11-21 01:34:32 +01:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
MascaraSnake
6f8a84b8cc
Merge branch 'endingmus' into 'master'
...
Ending music and associated
See merge request STJr/SRB2Internal!475
2019-11-18 14:33:22 -05:00
Steel Titanium
5a7014fd81
Add Azeonus/SwitchKaze's name
2019-11-18 01:16:44 -05:00
sphere
e766588c06
whoops
2019-11-17 22:13:38 +01:00
toaster
e155da7280
Since I had to tweak this branch to do the scrapped changing-to-title-music-at-a-different-time thing (since it was too late, and too late is WAY worse than too early): Have the credits music fade out over a shorter time when going to the title screen (vs going to evaluation), as opposed to stopping entirely.
2019-11-17 14:14:38 +00:00
Steel Titanium
56f77a83f4
Fix crash when using the -connect startup paramater ( Resolves #292 )
2019-11-15 16:57:47 -05:00
toaster
28c662b5a3
Ending music and associated.
...
* Play the good or bad ending track, instead of perfect silence.
* Fade out the credits music over 5 seconds when the credits go to the evaluation (timed to have finished just before the "you unlocked this!" jingle).
2019-11-15 15:58:25 +00:00
Jaime Passos
7168d72580
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:24:42 -03:00
James R
e7fd7602ca
Clang warning
2019-11-14 15:12:50 -08:00
MascaraSnake
910a39ee32
Merge branch 'titleflash' into 'master'
...
Improved title screen flashes
See merge request STJr/SRB2Internal!462
2019-11-14 18:07:05 -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
toaster
35b6e8ca94
Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.)
2019-11-14 12:52:34 +00:00
toaster
5a26b684ad
I'm a dumbass who makes extremely consequential typoes (and since the typo is no longer in effect, the supergold can be brightened some more)
...
https://cdn.discordapp.com/attachments/244035368595357697/644316971738857483/srb20060.gif
2019-11-13 23:27:01 +00:00
toaster
594974f287
Sev wanted no darkness during the initial animation... I think this is an acceptible compromise!
...
https://cdn.discordapp.com/attachments/428262628893261828/644295409283497995/srb20058.gif
2019-11-13 22:02:06 +00:00
toaster
6d7b448f49
https://cdn.discordapp.com/attachments/244035368595357697/644293089049182218/srb20057.gif
...
* Make the white flash a little easier on the eyes by putting the full-screen fade behind the title wing/ring, then drawing multiple overlaid colormapped versions of them on top of each other.
* Darken the pre-flash screen.
2019-11-13 21:52:35 +00:00
Jaime Passos
8f2a34f58c
fix crash
2019-11-12 22:03:40 -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
5346d0b9e7
Merge branch 'titlemap-on-connect' into 'master'
...
Render title map on connecting to server screen too (closes #166 )
Closes #166
See merge request STJr/SRB2Internal!416
2019-11-12 15:41:07 -05:00
Digiku
c8b47193d8
Merge branch 'new-title-multi-res' into 'master'
...
2.2 Title Screen
See merge request STJr/SRB2Internal!439
2019-11-11 08:46:36 -05:00
James R
b9a3f79f25
Merge branch 'fix-uppercase-in-intro-fades' into 'master'
...
Fix some intro fades displaying text in all-caps
See merge request STJr/SRB2Internal!429
2019-11-07 17:52:17 -05:00
James R
6ae6089343
That's a lot of whitespace
2019-11-07 13:42:54 -08:00
Jaime Passos
ffc9626355
fix fades for real
2019-11-05 12:10:42 -03:00
mazmazz
40149e00bc
Alacroix: Fix our heroes' arms disappearing due to dropped frames
2019-11-04 02:43:48 -05:00
mazmazz
9364427819
Frame 4 typos
2019-11-03 19:53:05 -05:00
mazmazz
925268f60c
Alacroix title: Give Tails his back tails
2019-11-03 18:38:09 -05:00
mazmazz
a7e38c5cc5
Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions
2019-11-03 16:21:21 -05:00
mazmazz
ad0b9e40ae
Alacroix title screen character frames
2019-11-03 10:34:12 -05:00
mazmazz
288d9f9e39
Load Alacroix character frames
2019-11-03 06:30:27 -05:00
mazmazz
ed87a603df
TTMODE_USER logic
2019-11-02 21:51:45 -04:00
mazmazz
35e102492b
Alacroix title animation adjustments
2019-11-02 21:05:01 -04:00
mazmazz
7b9974ddd1
SNTX -> SONT
2019-11-02 13:30:03 -04:00
mazmazz
0b6651eb00
Remove TTCOUNTERSET to simplify custom title SOC
2019-11-02 12:40:12 -04:00
mazmazz
45b7f2e6cc
Multi-res title screen gfx
2019-11-02 12:12:36 -04:00
toaster
b501e5b358
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
Louis-Antoine
027c60d47d
Fix some intro fades displaying text in all-caps
2019-10-28 16:10:22 +01:00
toaster
972b8ca733
* Add alternate numerical drawer for continues on Intermission screen if there's > 5.
...
* Tweak offsets on Continue screen numerical continue drawer to match.
2019-10-27 17:20:43 +00:00
James R
502c72e975
Render title map on connecting to server screen too
2019-10-26 12:50:49 -07:00
mazmazz
31d7254d14
Merge branch 'master' into new-title
2019-10-25 22:29:29 -04:00
