Commit graph

316 commits

Author SHA1 Message Date
mazmazz
b22538beb9 Implemented features
* M_SkyScroll optimization with still speeds; refactor background drawing
* Music (in time attack screens so far)
* FadeStrength
* HideTitlePics
* Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)
2018-11-17 01:21:21 -05:00
mazmazz
a046718c47 Implement scrolling menu backgrounds 2018-11-16 18:26:26 -05:00
mazmazz
917222a8c7 Merge branch 'menu-execs' into menu-execs-skyscroll 2018-11-16 15:11:02 -05:00
mazmazz
536e0bb18a Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg 2018-11-16 15:01:28 -05:00
mazmazz
648f57f17c Sky scroll attempt 2018-11-16 14:34:28 -05:00
mazmazz
336610c042 Remove misplaced tutorialmode = false due to debugging 2018-11-13 14:12:22 -05:00
mazmazz
7b0ec6479f Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
mazmazz
7b224cdcd5 Tutorial named tag detection adjustment 2018-11-13 02:00:58 -05:00
mazmazz
5270743a42 F_AdvanceToNextPage adjustment 2018-11-13 01:38:20 -05:00
mazmazz
422692ed03 NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
2018-11-13 00:13:36 -05:00
mazmazz
deb036058c text-prompts gclist -> gcl refactor 2018-11-12 23:31:10 -05:00
mazmazz
7663c0828e PicToStart implementation; fix NumPrompts limitation error 2018-11-12 23:16:24 -05:00
mazmazz
b68fb6ec4e F_GetTextPromptTutorialTag implementation 2018-11-12 22:47:20 -05:00
mazmazz
8b434072a9 Stub netgame support; ignore bots on linedef special 2018-11-10 15:34:56 -05:00
mazmazz
4f2f5c7e6d Let triggering splitscreen player control the text prompt 2018-11-10 14:47:30 -05:00
mazmazz
9c8a3818ef Splitscreen "support" (one prompt only, both players freeze controls) 2018-11-10 14:30:59 -05:00
Monster Iestyn
4c3bfe81bd Merge branch 'public_next'
# Conflicts:
#	src/Makefile
#	src/doomtype.h
#	src/hardware/hw_clip.c
#	src/hardware/hw_main.c
#	src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
Monster Iestyn
f3d129e1a6 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
mazmazz
b45fe054cb Pictoloop zero-based fix 2018-11-10 12:54:59 -05:00
mazmazz
58c9232210 Implemented GFX for text prompts
* PicMode SOC
* PicToLoop SOC
2018-11-10 12:42:13 -05:00
mazmazz
c607991f16 Implement music switching for prompts 2018-11-10 11:05:33 -05:00
mazmazz
b1bfc35ad7 Hardcode tutorial prompt offset index 2018-11-10 10:15:16 -05:00
mazmazz
9660c0e3c8 Prompt page string field length adjustment; check empty named tag before prompt search 2018-11-10 09:38:32 -05:00
mazmazz
3174969755 Added page tags and find page by tag
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
mazmazz
bf9b5c5d5b Prompt HUD hiding implementation 2018-11-10 01:00:18 -05:00
mazmazz
aaf0a0a3df Merge branch 'text-prompts' into text-prompts-hidehud 2018-11-10 00:10:42 -05:00
mazmazz
19dd2b500b Actually fix empty prompt text crash 2018-11-10 00:10:16 -05:00
mazmazz
b25cf9e0d9 Text prompt Hide HUD dehacked 2018-11-09 23:50:25 -05:00
mazmazz
b7af1e385b Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
mazmazz
90c83962d1 Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start 2018-11-09 22:07:32 -05:00
mazmazz
6c785cff56 Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES 2018-11-09 21:55:14 -05:00
Monster Iestyn
b34e8c5390 Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00
mazmazz
3d86cbc729 Close text prompt upon level load 2018-11-04 22:32:47 -05:00
mazmazz
0169847e06 Pause TextPrompt when game is paused 2018-11-04 22:32:47 -05:00
mazmazz
568d87f254 Lowercase font for body text; added ICONFLIP parameter 2018-11-04 22:32:46 -05:00
mazmazz
3e8238f745 Implemented auto-advancing TextPrompts
* Fixed TextSpeed
* New TimeToNext
* Other bugs
2018-11-04 22:32:46 -05:00
mazmazz
247580a168 Implemented progressive text printing for TextPrompt 2018-11-04 22:32:46 -05:00
Monster Iestyn
5a8e256ca1 Fix errors found when compiling 2018-11-04 22:32:46 -05:00
mazmazz
6469efc661 EndTextPrompt: Fix tmthing crash with P_LinedefExecute 2018-11-04 22:32:46 -05:00
mazmazz
30dbb6a644 TextPrompt: Implement player blocked controls and post-close run line 2018-11-04 22:32:46 -05:00
mazmazz
8d812ab24e Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling 2018-11-04 22:32:46 -05:00
mazmazz
77c5774e51 Moved TextPrompt logic to f_finale.c
* Added basic TextPrompt ticker and drawer functions
* Added chevron animation
2018-11-04 22:32:45 -05:00
Monster Iestyn
55a3e4c81f Merge branch 'endgame-code-refactor-backport' into 'next'
Endgame code refactor

See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
Monster Iestyn
3c981c913a Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame 2018-10-11 21:24:53 +01:00
Monster Iestyn
34728b3031 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
Monster Iestyn
6c85af79f6 Merge branch 'master' into hud-n-menu-tidbits
# Conflicts:
#	src/m_menu.c
#	src/screen.c
#	src/st_stuff.c
2018-08-28 20:51:46 +01:00
Monster Iestyn
502c80eaac Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
Monster Iestyn
f6b8206660 Merge branch 'public_next'
# Conflicts:
#	src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
colette
639f0d335b Update f_finale.c 2018-07-07 20:20:46 -04:00