James R
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
James R
6528b4a0f8
Merge branch 'opengl-skipintro-sigabrt' into 'master'
...
Fix crash when using -skipintro and the renderer is set to OpenGL from config
See merge request STJr/SRB2!714
2020-01-31 02:34:08 -05:00
Jaime Passos
28fd2380df
Fix F_StartContinue fading out incorrectly in OpenGL
2020-01-27 13:28:07 -03:00
James R
59ed381fc0
Credit Tatsuru, he's done a bit
2020-01-24 16:38:46 -08:00
James R
dfcd058c80
(BRUH MOMENT) activettscale was -1, so do recache after it's set
2020-01-21 12:21:18 -08:00
Steel Titanium
54ec64062c
Revert "Move to the end of the list"
...
This reverts commit 32c65ae844
2020-01-16 19:20:05 -05:00
Steel Titanium
32c65ae844
Move to the end of the list
2020-01-16 18:59:39 -05:00
Steel Titanium
4c6edd87df
Restore this that got removed shomehow
2020-01-16 14:31:36 -05:00
Steel Titanium
36511afda9
Add missing name to the credits
2020-01-16 14:28:47 -05:00
James R
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
lachwright
e069e149d9
Apply skin's highresscale to continue screen
2020-01-07 13:56:54 +08:00
James R
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
MascaraSnake
2d90098b6a
Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen
2019-12-26 20:55:29 +01:00
Jaime Passos
03a3b02301
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-25 05:43:46 -03:00
Jaime Passos
43946d9826
Merge remote-tracking branch 'origin/master' into wipes2
2019-12-11 12:57:59 -03:00
Jaime Passos
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
MascaraSnake
239242f513
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
78de32b623
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
66bd864592
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.
2019-12-06 22:06:35 +00:00
lachwright
8f2d81ec74
Lengthen credits for msuic parity
2019-12-07 05:59:26 +08:00
MascaraSnake
a0ebb32912
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
674fcd7923
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
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
b5d5749bfb
Merge remote-tracking branch 'origin/master' into wipes2
2019-12-05 01:48:58 -03:00
Jaime Passos
7384522aef
Fix Continue game state wipes
2019-12-05 01:47:51 -03:00
Jaime Passos
6adb957f0f
Slap colormap fades everywhere
2019-12-04 19:25:39 -03:00
MascaraSnake
5662f8de00
Merge branch 'credits-update' into 'master'
...
Credits update
See merge request STJr/SRB2Internal!484
2019-12-04 16:59:46 -05:00
MascaraSnake
20c1a0158d
Added Sev to the Art section of the credits
2019-12-04 00:07:56 +01:00
MascaraSnake
c2577b6eb3
Added more people to the credits and reorganized them slightly
2019-12-04 00:02:47 +01:00
MascaraSnake
602ba32ecc
A few more credits additions/adjustments
2019-12-03 22:22:48 +01:00
lachwright
be3d7b7dcd
- 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
ec3548c7f4
Merge remote-tracking branch 'origin/master' into credits-update
2019-12-01 00:32:01 +01:00
sphere
d9a88ec10c
Promote some programmers, add Blade & CoatRack to texture artists.
2019-11-30 18:23:57 +01:00
lachwright
6613286f1c
Fix intro's BRITEGG/DARKEGG scale
2019-11-30 22:07:21 +08:00
lachwright
916fec2c41
Make INTRO4 display at high res
2019-11-30 12:31:23 +08:00
lachwright
d88eef3e95
Merge branch 'master' into newintro
2019-11-30 12:30:12 +08:00
toaster
f5dd0c5c3b
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
d56a117a93
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
ef556ca6d5
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
a187460865
Revert "Render title map on connecting to server screen too"
...
This reverts commit b6e145f0c5
2019-11-25 01:09:00 +01:00
lachwright
23ab807d68
Complete new intro
2019-11-24 15:58:03 +08:00
lachwright
f2de738b09
Merge branch 'master' into newintro
2019-11-24 13:11:38 +08:00
lachwright
3e1c3b04e7
WIP intro graphics update
2019-11-22 20:08:23 +08: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
Steel Titanium
5ad00ccd2e
Add Azeonus/SwitchKaze's name
2019-11-18 01:16:44 -05:00
sphere
440515e3af
whoops
2019-11-17 22:13:38 +01: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
90d385b402
fix crash
2019-11-12 22:03:40 -03:00
Jaime Passos
3354169769
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
c6253bb6f9
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -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
sphere
8c6884f534
Update credits.
2019-10-18 00:33:46 +02: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
fe60902df5
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03: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
Jaime Passos
8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
0a973af5b8
Comments
2019-09-09 19:27:08 -03:00
Jaime Passos
725d0b4c44
still making things better
2019-09-08 21:37:24 -03:00
Jaime Passos
c7e01a558e
initial stuff
2019-09-08 18:44:40 -03:00
Jaime Passos
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03: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
