mazmazz
a5887d06e1
Fix mainwads check in d_main
2018-12-23 00:29:59 -05:00
Latapostrophe
4c88271cfb
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
mazmazz
6bdff246a8
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
mazmazz
ede6b183b1
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
MPC
91abc8ae9c
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
MPC
3e70ce2565
Fix the automap
2018-12-12 18:01:52 -03:00
Steel Titanium
77d12473ae
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -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
656b4efaed
Remove M_ApplyMenuPresState
2018-11-25 15:08:36 -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
91f2c4f8a7
Whitespace
2018-11-25 08:17:57 -05:00
mazmazz
22d0d8cb2e
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Steel Titanium
97ea1966fd
Make the error less confusing
2018-11-22 22:59:46 -05:00
mazmazz
3bb75690c4
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -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
mazmazz
d95ccd371c
Compiler fixes
2018-11-18 04:32:38 -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
df7d23f00d
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -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
mazmazz
5cb72f7071
tutorial-time gclist -> gcl refactor
2018-11-12 23:25:49 -05:00
mazmazz
eb5f05848c
Also set cv_analog for tutorialgcs
...
* M_TutorialSaveControlResponse CV_Set adjustment
2018-11-12 17:34:56 -05:00
mazmazz
dfb395ab37
Change mouse cv vars temporarily alongside control scheme
2018-11-12 17:30:21 -05:00
mazmazz
5944411c26
Restrict control changes if tutorialgcs is active
2018-11-12 16:56:06 -05:00
mazmazz
bef8f2dbce
Tutorial control message adjustments
2018-11-11 09:15:43 -05:00
mazmazz
6d6776a4d8
Merge branch 'control-selector' into tutorial-time
2018-11-11 08:46:06 -05:00
mazmazz
86168a1d80
Tutorial mode support for control switching
2018-11-11 08:20:08 -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
Monster Iestyn
51ee510b85
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
Monster Iestyn
91a44addd9
d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0
2018-11-08 20:09:00 +00:00
Monster Iestyn
7c0fb1702f
D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.
2018-11-07 21:21:36 +00:00
mazmazz
77c5774e51
Moved TextPrompt logic to f_finale.c
...
* Added basic TextPrompt ticker and drawer functions
* Added chevron animation
2018-11-04 22:32:45 -05:00
mazmazz
acbbe3daf8
Merge remote-tracking branch 'origin/master' into tutorial-time
2018-11-03 10:58:11 -04:00
Monster Iestyn
7a43272e13
Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway)
2018-10-27 18:52:34 +01:00
Monster Iestyn
a0c822fec8
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
34728b3031
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
mazmazz
af2496de9e
Compile fixes
2018-09-14 10:58:41 -04:00
mazmazz
23acc47b39
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
...
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
2018-09-14 10:35:51 -04:00
mazmazz
f41ad3073d
Refactoring, music statues
...
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
(cherry picked from commit f5f0b5e76c2fd405c8cc895dde653c5ed2652622)
2018-09-14 10:28:29 -04:00
Monster Iestyn
dbff92ea30
Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works
2018-09-04 16:58:49 +01:00
Monster Iestyn
46be411454
Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts
2018-08-29 22:07:38 +01:00
Monster Iestyn
6c85af79f6
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
mazmazz
675bb16521
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
2018-08-23 12:42:57 -04:00
mazmazz
ff26baa6a1
Refactoring, music statues
...
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
2018-08-23 12:30:47 -04:00
mazmazz
69bee086bf
Revert "Nix'd midimusicvolume", don't know what I want to do with this yet
...
This reverts commit 5a2663704e .
# Conflicts:
# src/i_sound.h
# src/s_sound.c
# src/s_sound.h
# src/sdl/mixer_sound.c
2018-08-23 09:06:13 -04:00