Commit graph

557 commits

Author SHA1 Message Date
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
sphere
8da5c681aa Update credits. 2019-10-18 00:33:46 +02:00
Steel Titanium
2aa72aa2d4 Merge branch 'master' into newmenus 2019-10-13 20:12:48 -04:00
TehRealSalt
2324282569 Merge master 2019-10-03 12:16:24 -04:00
TehRealSalt
ca83b06d93 Fuckhuge restructuring
- m_menu.c and m_menu.h are dead. Everything has now been moved to k_menudef.c, k_menufunc.c, k_menudraw.c, and k_menu.h.
- Expanded menu_t and menuitem_t to add transitions and tooltips
- Early character select screen
- Removed almost all menu definitions, I'll be reimporting them as they are needed
2019-10-02 11:31:11 -04:00
Steel Titanium
2c7e53f32f Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04:00
Steel Titanium
edf4dd8e0a Make comment more clear 2019-09-30 01:29:57 -04:00
Steel Titanium
b9234d1d8c Fix the sky on the intro cutscene not scrolling. 2019-09-30 01:25:21 -04:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos
9b5a7309bd Merge remote-tracking branch 'origin/master' into newmenus 2019-09-11 22:17:42 -03: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
ce8b821691 Merge remote-tracking branch 'jimita/renderswitch' into renderswitch 2019-09-10 18:12:01 -03:00
Jaime Passos
fe737c33f6 Comments 2019-09-09 19:27:08 -03:00
Jaime Passos
11077c2bac still making things better 2019-09-08 21:37:24 -03:00
Jaime Passos
1cb22d5e6b initial stuff 2019-09-08 18:44:40 -03:00
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
toaster
380f9ec07d Update SPR2_XTRA references for adjusted player.dta content. 2019-09-08 21:28:12 +01:00
mazmazz
c662413edd WIP 2.2 title screen (Alacroix) 2019-09-02 22:40:28 -04:00
Steel Titanium
efd2d4a499 Fallback graphic for firework display, if the character lacks one. 2019-08-24 17:17:55 -04:00
Jaime Passos
af8c67c59a uh 2019-08-19 14:43:48 -03:00
Jaime Passos
518bb32ecb did The Thing 2019-08-19 14:23:03 -03:00
Jaime Passos
b31c012063 Merge remote-tracking branch 'origin/master' into newmenus 2019-08-18 14:46:34 -03:00
Steel Titanium
6b16560832 Merge branch 'master' into newmenus 2019-08-14 22:51:06 -04:00
Monster Iestyn
fac04cf853 tweak the defaults for titlescrollxspeed and numDemos 2019-08-11 22:28:32 +01:00
TehRealSalt
978c4f7e24 Minor fixes 2019-08-10 09:50:42 -04:00
TehRealSalt
5da84b78a2 Encore wiggle 2019-08-10 01:59:23 -04:00
Alam Ed Arias
06b339f6ae curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
TehRealSalt
36e4f25cc9 Uses pre-defined colormap lumps now
Works much faster now. I'd like to clean up this code some though
2019-08-07 02:21:04 -04:00
Steel Titanium
6ff08671cd Merge branch 'master' into newmenus 2019-08-01 18:36:42 -04:00
toaster
5971c03feb Added escape pod. Okay, now I'm truly done with this branch. https://cdn.discordapp.com/attachments/249925765423038464/605506507345362964/srb20033.gif 2019-07-29 22:13:24 +01:00