Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
MascaraSnake
7a9151a969
Merge branch 'stretch-credits' into 'master'
...
Lengthen credits for msuic parity
See merge request STJr/SRB2Internal!620
2019-12-06 17:19:17 -05:00
MascaraSnake
19286d33f9
Merge branch 'creditweak' into 'master'
...
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.
See merge request STJr/SRB2Internal!621
2019-12-06 17:18:54 -05:00
toaster
74279862c3
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.
2019-12-06 22:06:35 +00:00
lachwright
97b72422c4
Lengthen credits for msuic parity
2019-12-07 05:59:26 +08:00
MascaraSnake
32f76e8c65
Merge branch 'introskiptext' into 'master'
...
Add "Press ENTER to skip..." text to the intro's first scene
See merge request STJr/SRB2Internal!619
2019-12-06 16:48:29 -05:00
toaster
c5a9a0c246
Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P
2019-12-06 20:50:41 +00:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
131327c97c
Merge remote-tracking branch 'origin/master' into wipes2
2019-12-05 01:48:58 -03:00
Jaime Passos
a7d13e5eb4
Fix Continue game state wipes
2019-12-05 01:47:51 -03:00
Jaime Passos
cbe17383e0
Slap colormap fades everywhere
2019-12-04 19:25:39 -03:00
MascaraSnake
731d839f5f
Merge branch 'credits-update' into 'master'
...
Credits update
See merge request STJr/SRB2Internal!484
2019-12-04 16:59:46 -05:00
MascaraSnake
9c1b50e3bd
Added Sev to the Art section of the credits
2019-12-04 00:07:56 +01:00
MascaraSnake
9da4b4680f
Added more people to the credits and reorganized them slightly
2019-12-04 00:02:47 +01:00
MascaraSnake
55dea263fc
A few more credits additions/adjustments
2019-12-03 22:22:48 +01:00
lachwright
c65b02896b
- Remove y coordinate from struct for credits_pics
...
- Update x coordinates for credits_pics entries
- Reorder credits_pics entries (what even was the previous order lol)
- Add zig zag graphics to credits roll
- Attempt to scale the y positions of credits graphics with the length of the credits roll
- New escape character for credits entries: \2, which centers the text and makes it yellow
- Add support for colored text to V_DrawStringAtFixed
2019-12-02 22:24:05 +08:00
sphere
c9d82328d5
Merge remote-tracking branch 'origin/master' into credits-update
2019-12-01 00:32:01 +01:00
sphere
3bed07720d
Promote some programmers, add Blade & CoatRack to texture artists.
2019-11-30 18:23:57 +01:00
lachwright
65269d78cd
Fix intro's BRITEGG/DARKEGG scale
2019-11-30 22:07:21 +08:00
lachwright
bd5b30b54e
Make INTRO4 display at high res
2019-11-30 12:31:23 +08:00
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