lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
7955 commits 1 branch 29 tags 122 MiB
Commit graph

225 commits

Author SHA1 Message Date
Louis-Antoine a187460865 Revert "Render title map on connecting to server screen too" 
This reverts commit b6e145f0c5.
 2019-11-25 01:09:00 +01:00
sphere 74987beb1f Reword some evaluation sentences. 2019-11-21 02:24:12 +01:00
sphere 9608021824 Rename "secrets" to "extras". 2019-11-21 01:34:32 +01:00
Jaime Passos 8a05afa1aa Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
MascaraSnake 98f2ee598d Merge branch 'endingmus' into 'master' 
Ending music and associated

See merge request STJr/SRB2Internal!475
 2019-11-18 14:33:22 -05:00
toaster fdd681ab72 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 aff55ee27b
Fix crash when using the -connect startup paramater (Resolves #292) 2019-11-15 16:57:47 -05:00
toaster efa609d366 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 6be45ec241 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:24:42 -03:00
James R d36086ba33 Clang warning 2019-11-14 15:12:50 -08:00
MascaraSnake 031a352f72 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 d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
MascaraSnake 8f6890025c Merge branch 'secretstuff' into 'master' 
The letter

See merge request STJr/SRB2Internal!438
 2019-11-14 17:49:23 -05:00
toaster da1b4f2277 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 761bd41eb5 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 3afe152a86 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 39d80e1cba 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 3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
MascaraSnake bffa281d91 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 c2d09ac4e4 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 ad4c55c10b 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 872e662618 That's a lot of whitespace 2019-11-07 13:42:54 -08:00
Jaime Passos 00d76bd9ef fix fades for real 2019-11-05 12:10:42 -03:00
mazmazz 43fff92c82 Alacroix: Fix our heroes' arms disappearing due to dropped frames 2019-11-04 02:43:48 -05:00
mazmazz d268582315 Frame 4 typos 2019-11-03 19:53:05 -05:00
mazmazz cb6bc67944 Alacroix title: Give Tails his back tails 2019-11-03 18:38:09 -05:00
mazmazz 05ac1a1a21 Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions 2019-11-03 16:21:21 -05:00
mazmazz 82b65c87b8 Alacroix title screen character frames 2019-11-03 10:34:12 -05:00
mazmazz 42835905ef Load Alacroix character frames 2019-11-03 06:30:27 -05:00
mazmazz 96a80c51d3 TTMODE_USER logic 2019-11-02 21:51:45 -04:00
mazmazz 6db58bc2bf Alacroix title animation adjustments 2019-11-02 21:05:01 -04:00
mazmazz 067ef42e37 SNTX -> SONT 2019-11-02 13:30:03 -04:00
mazmazz fc02b73534 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
mazmazz 1ebcdb5344 Multi-res title screen gfx 2019-11-02 12:12:36 -04:00
toaster 67f5b2245f 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 e91bf1a32e Fix some intro fades displaying text in all-caps 2019-10-28 16:10:22 +01:00
toaster df785e1651 * 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 b6e145f0c5 Render title map on connecting to server screen too 2019-10-26 12:50:49 -07:00
mazmazz c7c72a4892 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
Steel Titanium 9e9a40cadb
Merge branch 'master' into newmenus 2019-10-13 20:12:48 -04:00
Steel Titanium 6b10ffb88f
Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04:00
Steel Titanium ebe99dad7a
Make comment more clear 2019-09-30 01:29:57 -04:00
Steel Titanium 592a98a3e8
Fix the sky on the intro cutscene not scrolling. 2019-09-30 01:25:21 -04:00
Jaime Passos f2915817a7 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-11 22:17:42 -03:00
toaster ed5e8c486c 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
toaster ba50a03d9c Update SPR2_XTRA references for adjusted player.dta content. 2019-09-08 21:28:12 +01:00
mazmazz 57974168c8 WIP 2.2 title screen (Alacroix) 2019-09-02 22:40:28 -04:00
Steel Titanium fbec4af086
Fallback graphic for firework display, if the character lacks one. 2019-08-24 17:17:55 -04:00
Jaime Passos 29dc1119e5 uh 2019-08-19 14:43:48 -03:00
Jaime Passos 85499040d3 did The Thing 2019-08-19 14:23:03 -03:00