Commit graph

4854 commits

Author SHA1 Message Date
mazmazz
647ae7ad9f Fixed skullAnimCounter type for text prompts 2018-11-18 12:56:37 -05:00
mazmazz
e3a8c70a94 Mirror a wipe if it's forced off and the counter-wipe is specified 2018-11-18 04:39:34 -05:00
mazmazz
d95ccd371c Compiler fixes 2018-11-18 04:32:38 -05:00
mazmazz
03141456b1 Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings) 2018-11-18 03:32:19 -05:00
mazmazz
958163089c Fix lingering titlemapcameraref when reloading title screen 2018-11-18 03:19:32 -05:00
mazmazz
53ef38980a Fix MN_SPECIAL check for menu meta state 2018-11-18 03:19:07 -05:00
mazmazz
1dcfd14b90 Allow backgrounds for player select 2018-11-18 02:49:08 -05:00
mazmazz
02fe8dc178 Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too 2018-11-18 02:41:35 -05:00
mazmazz
3334df7ac4 More title screen features; menu meta state implementation (active and previous menu types)
* Draw background over titlemap
* HIDEBACKGROUND to show titlemap
* Specify NOMUSIC or IGNOREMUSIC (to not change music)
* Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE)
* Specify ENTERWIPE and EXITWIPE
* Menuid hierarchy fixes (Control mapping, joystick setup)
* Time attack handling fixes
* Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap)
* Allow for forcing and skipping a wipe
* Wipe utility functions F_GetWipeLength and F_WipeExists
2018-11-17 19:08:30 -05:00
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
b0df8a3d36 Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg 2018-11-16 14:18:35 -05:00
mazmazz
b1b747bf6f Menumeta iterators 2018-11-16 14:16:41 -05:00
mazmazz
76822324da Make MENU dehacked block top-level; TITLESCREEN is not necessary 2018-11-16 12:12:11 -05:00
mazmazz
54266a52e5 Title screen menu SOC 2018-11-16 12:07:47 -05:00
mazmazz
c26d800caa Refactor MM_ menu types to MN_ 2018-11-16 09:56:22 -05:00
mazmazz
67fc31fcf8 Menutypes for dehacked 2018-11-16 09:46:32 -05:00
mazmazz
8413b12c4e Use bitshifting for menu IDs and hierarchy instead 2018-11-16 09:22:27 -05:00
mazmazz
ff7213679a Add MM menutype flags to menu defs 2018-11-15 19:41:27 -05:00
mazmazz
6eff9d81d8 Express menu defs as flags 2018-11-15 19:41:05 -05:00
mazmazz
ee9e07997a Define menu enum, encode hierachy by number places 2018-11-15 15:51:29 -05:00
mazmazz
336610c042 Remove misplaced tutorialmode = false due to debugging 2018-11-13 14:12:22 -05:00
Digiku
656a471908 Merge branch 'text-prompts' into 'master'
SOC and Line Exec Text Prompts

See merge request STJr/SRB2Internal!200
2018-11-13 11:14:02 -05:00
mazmazz
7b0ec6479f Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
Digiku
aac4a99e99 Merge branch 'tutorial-time' into 'master'
Tutorial mode handling

See merge request STJr/SRB2Internal!201
2018-11-13 10:49:02 -05:00
Digiku
38107c9b3d Merge branch 'control-switching' into 'master'
Game control switching

See merge request STJr/SRB2Internal!202
2018-11-13 10:48:18 -05:00
Digiku
3f7df0561d Merge branch 'tracerangle' into 'master'
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away

See merge request STJr/SRB2Internal!198
2018-11-13 10:48:01 -05:00
Digiku
d10191ea5d Merge branch 'monitor-exec' into 'master'
Run linedef exec upon popping a monitor

See merge request STJr/SRB2Internal!199
2018-11-13 10:47:37 -05:00
mazmazz
9a36d559dc Compile errors 2018-11-13 10:43:40 -05:00
mazmazz
c92df614f0 Compile errors 2018-11-13 10:31:06 -05:00
mazmazz
7b224cdcd5 Tutorial named tag detection adjustment 2018-11-13 02:00:58 -05:00
mazmazz
3c168afc60 Check specifically for gcs_fps when starting tutorial 2018-11-13 01:57:51 -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
25857f04c0 Merge branch 'control-selector' into text-prompts 2018-11-12 23:26:27 -05:00
mazmazz
5cb72f7071 tutorial-time gclist -> gcl refactor 2018-11-12 23:25:49 -05:00
mazmazz
4fd469da56 Merge branch 'control-selector' into tutorial-time 2018-11-12 23:23:52 -05:00
mazmazz
f0dbe3900c Refactor gclists 2018-11-12 23:23:39 -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
ccffb0538d Merge branch 'control-selector' into text-prompts 2018-11-12 21:11:53 -05:00
mazmazz
99b24d6bcf Force chasecam for tutorialmode 2018-11-12 20:37:55 -05:00
mazmazz
14199fd516 First time tutorial prompt fixes 2018-11-12 19:10:41 -05:00
mazmazz
8b1624576f Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-12 18:08:48 -05:00
mazmazz
c9f56017d2 Freeze camera values in tutorialmode with proper defaults 2018-11-12 18:08:24 -05:00
mazmazz
e956536bb8 Merge branch 'tutorial-time' into tutorial-time-camera 2018-11-12 17:41:49 -05:00