Monster Iestyn
07f45a954c
Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.
2018-11-21 20:45:03 +00:00
mazmazz
2d01a33da5
Don't accept KEY_PAUSE for control console command
2018-11-21 11:21:17 -05:00
mazmazz
72a32696a5
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
mazmazz
21a3121b95
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 10:58:07 -05:00
mazmazz
3bb75690c4
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
Marco Z
c81857c8d8
Merge branch '5ec9ab373f5dccdc377527ecbc9d1a4f331f5d56' into nov20-build-fixes
...
# Conflicts:
# src/hardware/hw_main.c
2018-11-20 22:42:20 -05:00
Marco Z
633c28b28a
VC build fixes
2018-11-20 21:54:20 -05:00
mazmazz
2c3ed93178
build errors
2018-11-20 20:23:48 -05:00
mazmazz
b37a2016c7
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
mazmazz
e682fb919f
Draw connection screen correctly; make scroll speed inherit global setting
2018-11-20 18:13:18 -05:00
mazmazz
c65ff66383
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
Monster Iestyn
ec10b18c46
I forgot to do this earlier, welp
2018-11-20 21:17:46 +00:00
Monster Iestyn
eb4eef6104
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
Monster Iestyn
3cbe8b26b5
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
Monster Iestyn
22835af9e1
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
mazmazz
89a3c889dd
stray #if to #ifdef
2018-11-19 20:52:01 -05:00
mazmazz
59a913935e
Changed Mixer X sources to 2.2.0; added x64 gcc support
2018-11-19 20:51:54 -05:00
Monster Iestyn
8da74cb193
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
Monster Iestyn
cfa4bbd75b
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
Monster Iestyn
1fa80d57dd
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
2018-11-19 17:46:38 +00:00
Alam Ed Arias
1ff6cb01c7
Travis-CI: allow GCC 8.x to fail
2018-11-18 21:25:33 -05:00
Alam Ed Arias
674d31e808
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
Alam Ed Arias
6b3616aee6
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
Alam Ed Arias
dbf6884b37
We need to include the NUL char
2018-11-18 20:21:32 -05:00
Alam Ed Arias
913e6aeeb7
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
Monster Iestyn
07fc73dbad
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
Steel Titanium
165ea9ce25
Remove 64-bit libgme
2018-11-18 18:24:03 -05:00
Steel Titanium
e1f7717f24
Statically link stdc++ and libgcc into libgme
...
Should fix libgme depending on two DLLs externally.
2018-11-18 18:09:34 -05:00
mazmazz
647ae7ad9f
Fixed skullAnimCounter type for text prompts
2018-11-18 12:56:37 -05:00
Monster Iestyn
b912008c41
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
Monster Iestyn
dbb308e284
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
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
