Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00: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
823b75797e
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
mazmazz
340b5e9d4f
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -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
mazmazz
b37a2016c7
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -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
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
Alam Ed Arias
aef0d9a421
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
mazmazz
7b0ec6479f
Merge branch 'master' into text-prompts
2018-11-13 11:12:44 -05:00
mazmazz
ccffb0538d
Merge branch 'control-selector' into text-prompts
2018-11-12 21:11:53 -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
c12462e737
Uncomment gcs_platform defaults
2018-11-12 16:54:42 -05:00
mazmazz
42fe8b78c1
Add tutorialgcs variable for optional control scheme loading
2018-11-12 16:50:03 -05:00
mazmazz
7bd7c001d5
New gclists and const modifier; added tutorialmode declarations to this branch
2018-11-11 08:44:08 -05:00
mazmazz
b1bfc35ad7
Hardcode tutorial prompt offset index
2018-11-10 10:15:16 -05: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
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
f8f3795927
TextPrompt/Page freeslots; SOC Prompt/Page parsing
2018-11-04 22:31:52 -05:00
LJSonik
3a8ee79cb1
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
Louis-Antoine
2dc6a102bb
Fix desynch when toggling analog mode or flipcam
...
Special thanks to Lat' for asking weird questions
2018-10-29 00:49:23 +01:00
Monster Iestyn
55a3e4c81f
Merge branch 'endgame-code-refactor-backport' into 'next'
...
Endgame code refactor
See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
Monster Iestyn
85b18c963f
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission
...
Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2018-10-11 21:25:15 +01:00
Monster Iestyn
abc083e5e8
G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt
2018-10-11 21:25:04 +01:00
Monster Iestyn
3c981c913a
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01: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
54d02e1d9a
musicplus-feature-endoflevel 2.2 -> 2.1 backport
2018-09-18 15:50:12 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
631a053e92
Merge remote-tracking branch 'origin/master' into nights-inufixes
2018-08-30 08:13:34 -04:00
Monster Iestyn
d9440f419c
Use INFLIVES macro in place of 0x7f for infinite lives check
2018-08-29 21:31:15 +01:00
Monster Iestyn
d60ade9f95
Merge branch 'master' into hud-n-menu-tidbits
2018-08-29 21:28:11 +01:00
mazmazz
2ee3228ee4
Merge remote-tracking branch 'origin/master' into nightsplus-laplogic
2018-08-29 10:16:49 -04: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
Monster Iestyn
2d7263c7f1
Merge branch 'public_next'
...
# Conflicts:
# src/r_things.c
# src/v_video.c
2018-08-28 19:31:08 +01:00
toaster
ace4c46d5f
Fix up them there ghosts!
...
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
2018-08-25 17:11:49 +01:00
Latapostrophe
da3fb0913b
Changed chat position,
...
Added chat back tint
Fixed word wrapping glitches
2018-08-19 10:58:29 +02:00
mazmazz
052bd347bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic
...
# Conflicts:
# src/p_setup.c
2018-08-10 13:35:59 -04:00
mazmazz
4d4e52d981
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-09 23:14:14 -04:00
Latapostrophe
ac8920ac7a
Repositionning chat & bugfixes
2018-07-31 15:57:19 +02:00
Latapostrophe
a4bded8e9e
SRB2chat test rework
2018-07-31 11:10:02 +02:00
Monster Iestyn
1c30318bd3
fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype)
2018-07-02 21:03:04 +01:00
Monster Iestyn
a1f742a0d4
Fix special stage map end var defaults to use the correct map numbers
2018-06-30 18:14:04 +01:00
toaster
e22f158453
Some cvar fudging.
...
* Turn off mlook and mousemove by default, as requested by Prime/Mystic.
* Change all the analog cvar names (and hide them from the help function so they aren't so easily rediscovered) to invalidate 2.1-era copies of config.cfg, given I've seen a common sentiment is that they won't try the new controls at all and will just copy their old ones across, and I'd like to sabotage the deprecated feature.
2018-06-18 17:39:34 +01:00
toaster
0ce1e60519
Correct some minor deficiencies in the hold-for-retry system in record attack.
2018-06-15 21:42:36 +01:00
toaster
bdee4dd694
Improve retrying text presentation.
...
* Now reads "HOLD TO RETRY...".
* Behind the white flash.
* Shows on button tap for about half a second.
2018-06-14 14:41:14 +01:00