Commit graph

5024 commits

Author SHA1 Message Date
mazmazz 3c2d30072e Allow backgrounds for player select 2018-11-18 02:49:08 -05:00
mazmazz f3be97a95a Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too 2018-11-18 02:41:35 -05:00
mazmazz 758647fab2 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 d2bbddbed4 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 1e6369e8de Implement scrolling menu backgrounds 2018-11-16 18:26:26 -05:00
mazmazz 32dc47207d Merge branch 'menu-execs' into menu-execs-skyscroll 2018-11-16 15:11:02 -05:00
mazmazz 0e0437b894 Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg 2018-11-16 15:01:28 -05:00
mazmazz 4d3ddda5b5 Sky scroll attempt 2018-11-16 14:34:28 -05:00
mazmazz 9c76c61384 Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg 2018-11-16 14:18:35 -05:00
mazmazz c4cddf8741 Menumeta iterators 2018-11-16 14:16:41 -05:00
mazmazz 199bc155bc Make MENU dehacked block top-level; TITLESCREEN is not necessary 2018-11-16 12:12:11 -05:00
mazmazz 15c0bab0c9 Title screen menu SOC 2018-11-16 12:07:47 -05:00
mazmazz 75dab7850f Refactor MM_ menu types to MN_ 2018-11-16 09:56:22 -05:00
mazmazz 3ec96d8b99 Menutypes for dehacked 2018-11-16 09:46:32 -05:00
mazmazz b69756f5e5 Use bitshifting for menu IDs and hierarchy instead 2018-11-16 09:22:27 -05:00
mazmazz 9dab65fce0 Add MM menutype flags to menu defs 2018-11-15 19:41:27 -05:00
mazmazz c8f5aa688a Express menu defs as flags 2018-11-15 19:41:05 -05:00
mazmazz f7cc62d9d9 Define menu enum, encode hierachy by number places 2018-11-15 15:51:29 -05:00
Steel Titanium c26c850f5d Add missing 64-bit libgme dll 2018-11-15 13:30:59 -05:00
Steel Titanium 02c08a3e10 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium f02105732e Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium c5a97dcfe6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit 2018-11-14 17:28:41 -05:00
Alam Ed Arias 4695841b8d fix format-truncation: need bigger string buffers 2018-11-14 16:50:52 -05:00
Monster Iestyn 09f9572a8f Merge branch 'master' into next 2018-11-14 21:49:11 +00:00
Monster Iestyn 3e6fcf1b8b Merge branch 'opengl-hud-scale-fix' into 'master'
OpenGL HUD scaling fix

See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
Alam Ed Arias fb08950c19 Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length 2018-11-14 16:32:57 -05:00
Alam Ed Arias 4e9fc881a2 Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? 2018-11-14 16:26:46 -05:00
Alam Ed Arias 6fa063375d TravisCI: test build on GCC 8.x 2018-11-14 15:56:46 -05:00
Alam Ed Arias d4cb81cb28 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
MonsterIestyn a4f8411ae7
Merge pull request #313 from LJSonik/analog-flipcam-synch-fix
Fix desynch when toggling analog mode or flipcam
2018-11-14 19:57:47 +00:00
MonsterIestyn 772c072064
Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
Monster Iestyn 9c70c87f8e Merge branch 'master' into next 2018-11-14 18:01:31 +00:00
Monster Iestyn 8c95ef8a1d Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4

See merge request STJr/SRB2!322
2018-11-14 12:58:07 -05:00
Monster Iestyn fc4bb83c3e Merge branch 'public-sdl2-update' into 'master'
Update SDL2 to 2.0.9

See merge request STJr/SRB2!321
2018-11-14 12:57:54 -05:00
Digiku cc3dd1f664 Merge branch 'tracer-angle-fix' into 'master'
Line 457 Track Object Angle: Calculate input angle tolerance correctly

See merge request STJr/SRB2Internal!203
2018-11-14 11:31:54 -05:00
Alam Ed Arias 97fd69951a Merge branch 'master' into next 2018-11-14 11:07:12 -05:00
Alam Ed Arias de5b626520 Fix misleading indentation 2018-11-14 11:06:45 -05:00
Alam Ed Arias f81d01edca Merge branch 'vc-xpm-fix' into 'master'
Remove unnecessary SDLCALL from IMG_xpm.c declarations

See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
Alam Ed Arias d14f87b8c6 Cleanup whitespace 2018-11-14 10:54:33 -05:00
Alam Ed Arias 938bf1605c Merge branch 'master' into next 2018-11-14 10:52:49 -05:00
Alam Ed Arias f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
mazmazz cf834f3503 Line 457: Calculate input angle tolerance correctly 2018-11-14 10:13:39 -05:00
Marco Z 8777d5c6c9 Comment context for declaration changes; remove extern terms 2018-11-14 08:15:38 -05:00
Marco Z 51768e7dd1 Remove unnecessary SDLCALL from xpm declarations 2018-11-14 08:06:07 -05:00
Monster Iestyn f3b59c1731 Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00:00
Monster Iestyn 0625ffcf8a Merge branch 'public-winsnd-libgme-fix' into 'master'
Missed #ifdef HAVE_LIBGME in win_snd

See merge request STJr/SRB2!326
2018-11-14 06:40:07 -05:00
Marco Z 0b97b2a76c Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
mazmazz b4c87d585e Add SDL Mixer 2.0.4 VC package 2018-11-13 22:05:05 -05:00
mazmazz 85fc8a1d47 Add SDL 2.0.9 VC package 2018-11-13 22:02:18 -05:00
Steel Titanium 4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00