73be0c33ae
Use get_number in dehacked readmenu
2018-11-25 15:16:53 -05:00
e2ca92a3db
Remove unused menu hierarchy methods
2018-11-25 15:09:25 -05:00
0439479b3e
Remove M_ApplyMenuPresState
2018-11-25 15:08:36 -05:00
eb95289ea4
Rearranged menu presentation methods
...
* Menu parameter retrieval and hierarchy in m_menu
* Presentation logic (background display) in f_finale
2018-11-25 15:08:12 -05:00
dcac157ccd
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
5870d145b2
Draw connection screen correctly; make scroll speed inherit global setting
2018-11-20 18:13:18 -05:00
094ec7ce3c
Performance improvements
...
* Don't loop every frame for menu drawing parameters
* Fixed in-game escape menu not dimming correctly
* Fixed glitches on default title screen parameters
2018-11-20 17:28:26 -05:00
b2c3a39a2f
I forgot to do this earlier, welp
2018-11-20 21:17:46 +00:00
224c0fccdb
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
948466658f
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
...
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
2d1f927a17
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...
...that was a mouthful
2018-11-19 22:12:26 +00:00
f34e1edb4d
Travis-CI: allow GCC 8.x to fail
2018-11-18 21:25:33 -05:00
a290c4727b
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
42afd3532d
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
0b5069f36c
We need to include the NUL char
2018-11-18 20:21:32 -05:00
5a09d44fd2
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
ab39534ef6
Merge branch 'mingw-64bit' into 'master'
...
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
243f4eedd8
Statically link stdc++ and libgcc into libgme
...
Should fix libgme depending on two DLLs externally.
2018-11-18 18:09:34 -05:00
4fa6895f60
Fixed skullAnimCounter type for text prompts
2018-11-18 12:56:37 -05:00
8c71cd0b90
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
a400bb9ef6
Merge branch 'camera-subsector-crash-fix' into 'master'
...
Camera subsector crash fix
See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
53b956f540
Mirror a wipe if it's forced off and the counter-wipe is specified
2018-11-18 04:39:34 -05:00
765e4b3134
Compiler fixes
2018-11-18 04:32:38 -05:00
3d1e5fa7e8
Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings)
2018-11-18 03:32:19 -05:00
5fc91e8405
Fix lingering titlemapcameraref when reloading title screen
2018-11-18 03:19:32 -05:00
3acabdab93
Fix MN_SPECIAL check for menu meta state
2018-11-18 03:19:07 -05:00
3c2d30072e
Allow backgrounds for player select
2018-11-18 02:49:08 -05:00
f3be97a95a
Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too
2018-11-18 02:41:35 -05:00
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
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
1e6369e8de
Implement scrolling menu backgrounds
2018-11-16 18:26:26 -05:00
32dc47207d
Merge branch 'menu-execs' into menu-execs-skyscroll
2018-11-16 15:11:02 -05:00
0e0437b894
Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg
2018-11-16 15:01:28 -05:00
4d3ddda5b5
Sky scroll attempt
2018-11-16 14:34:28 -05:00
9c76c61384
Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg
2018-11-16 14:18:35 -05:00
c4cddf8741
Menumeta iterators
2018-11-16 14:16:41 -05:00
199bc155bc
Make MENU dehacked block top-level; TITLESCREEN is not necessary
2018-11-16 12:12:11 -05:00
15c0bab0c9
Title screen menu SOC
2018-11-16 12:07:47 -05:00
75dab7850f
Refactor MM_ menu types to MN_
2018-11-16 09:56:22 -05:00
3ec96d8b99
Menutypes for dehacked
2018-11-16 09:46:32 -05:00
b69756f5e5
Use bitshifting for menu IDs and hierarchy instead
2018-11-16 09:22:27 -05:00
9dab65fce0
Add MM menutype flags to menu defs
2018-11-15 19:41:27 -05:00
c8f5aa688a
Express menu defs as flags
2018-11-15 19:41:05 -05:00
f7cc62d9d9
Define menu enum, encode hierachy by number places
2018-11-15 15:51:29 -05:00
c26c850f5d
Add missing 64-bit libgme dll
2018-11-15 13:30:59 -05:00
02c08a3e10
Some small changes
2018-11-14 21:01:54 -05:00
f02105732e
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
4695841b8d
fix format-truncation: need bigger string buffers
2018-11-14 16:50:52 -05:00
mazmazz