Commit graph

63 commits

Author SHA1 Message Date
mazmazz
505fb1761d Add NOWIPE behavaior for colormap fades 2020-05-25 00:19:41 -04:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Jaime Passos
aa4e3384bb Merge remote-tracking branch 'origin/master' into wipes2 2019-12-11 12:57:59 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos
cbe17383e0 Slap colormap fades everywhere 2019-12-04 19:25:39 -03:00
Jaime Passos
476e6cc6ed Fix crossfades
Fixes NoReload using the wrong wipestyle.
Also fixes non-titlemap title screen wipes using the wrong wipestyle.
2019-11-22 17:44:42 -03:00
Jaime Passos
349dab0b4b remove UINT8 wipecolorfill 2019-11-18 20:07:37 -03:00
Jaime Passos
3ed8470b58 remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
Jaime Passos
f37e0de8c5 stuff 2019-11-18 11:39:54 -03:00
Jaime Passos
46f88101b2 Small mistake 2019-11-15 19:36:25 -03:00
Jaime Passos
bc7686c16a LEVELWIPES 2019-11-15 18:21:12 -03:00
Jaime Passos
96ce48f4f2 F_WipeColorFill 2019-11-14 21:31:20 -03:00
Jaime Passos
7168d72580 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:24:42 -03:00
toaster
35b6e8ca94 Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.) 2019-11-14 12:52:34 +00:00
Jaime Passos
4acdb54d87 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
James R
6ae6089343 That's a lot of whitespace 2019-11-07 13:42:54 -08:00
Jaime Passos
82d64fbc1c tweak fade colormaps just a little bit 2019-11-05 12:28:01 -03:00
Jaime Passos
ffc9626355 fix fades for real 2019-11-05 12:10:42 -03:00
mazmazz
a7e38c5cc5 Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions 2019-11-03 16:21:21 -05:00
mazmazz
ad0b9e40ae Alacroix title screen character frames 2019-11-03 10:34:12 -05:00
mazmazz
288d9f9e39 Load Alacroix character frames 2019-11-03 06:30:27 -05:00
mazmazz
0b6651eb00 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
Jaime Passos
76a5b60e39 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
mazmazz
31d7254d14 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
Jaime Passos
fe3ee4f8fd some adjusts 2019-09-10 16:54:40 -03:00
Jaime Passos
53568ba62f Better fades 2019-09-09 23:31:48 -03:00
mazmazz
c662413edd WIP 2.2 title screen (Alacroix) 2019-09-02 22:40:28 -04:00
Jaime Passos
af8c67c59a uh 2019-08-19 14:43:48 -03:00
Alam Ed Arias
06b339f6ae curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
toaster
dec517f224 Merge branch 'ending' into 'master'
ENDINGS

See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
toaster
c659e3f26b Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168). 2019-07-30 17:48:13 +01:00
toaster
74c32c1b2b A good and bad ending cutscene now exist.
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)

Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
mazmazz
d944156744 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
9659767e43 FORCEWIPEOFF define in place of wipegamestate = -2 2018-11-25 19:40:18 -05:00
mazmazz
0d9749f418 Merge remote-tracking branch 'origin/master' into menu-execs 2018-11-25 19:03:22 -05:00
mazmazz
f3914583c6 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
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -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
648f57f17c Sky scroll attempt 2018-11-16 14:34:28 -05:00
mazmazz
7b0ec6479f Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -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
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
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
b25cf9e0d9 Text prompt Hide HUD dehacked 2018-11-09 23:50:25 -05:00