thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-13 02:02:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6358 commits 2 branches 14 tags 206 MiB
Commit graph

90 commits

Author SHA1 Message Date
toaster
8ac6d43886 * Made the evaluation screen even more attractive. 
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
 2019-07-29 14:55:36 +01:00
Monster Iestyn
0fb5a82215 Merge branch 'public_next' 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
#	src/p_user.c
#	src/r_data.c
 2019-06-29 20:55:58 +01:00
Steel Titanium
8a80426408 Merge branch 'public-musicplus-feature-endoflevel' into 'next' 
Fade out music at end of level, before intermission

See merge request STJr/SRB2!472
 2019-06-28 18:21:07 -04:00
Steel Titanium
25e67ee061 Add startrings level header option 2019-06-23 18:15:40 -04:00
mazmazz
d944156744 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
 2019-03-18 22:00:23 +00:00
mazmazz
a181f12af3 Declare exitfadestarted properly 2019-03-15 11:01:41 -04:00
mazmazz
822b4d12bf Merge branch 'public_next' 2019-03-15 01:43:03 -04:00
mazmazz
1381343a2e Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
mazmazz
a34daa4a0c Merge remote-tracking branch 'origin/master' 2019-03-15 00:33:12 -04:00
mazmazz
83e89ba62c Merge branch 'public_next' 2019-03-15 00:33:06 -04:00
mazmazz
5e06530829 Implement MIXNIGHTSCOUNTDOWN 
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
 2019-03-14 23:10:14 -04:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
Monster Iestyn
74cb384be2 revert to LF_SAVEGAME system code, removing all traces of saveoverride 
(I believe Sal wanted us to do this anyway, so...)
 2019-01-08 17:14:21 +00:00
Steel Titanium
2ba11a6d69 Support for per-map intermission music 2019-01-02 05:15:23 -05: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
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
TehRealSalt
079c0ec709 Save override for level header 
Kind of like 2.2's, but with backwards-compatability with 2.1
 2018-12-16 20:09:59 -05:00
Monster Iestyn
94ad0b880f Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
Wolfy
42fc67a639 Remove hardcoded limit on admins 
# Conflicts:
#	src/d_netcmd.c
 2018-11-29 07:05:49 -06:00
Wolfy
cabe9871e3 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35: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
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
mazmazz
7663c0828e PicToStart implementation; fix NumPrompts limitation error 2018-11-12 23:16:24 -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
7bd7c001d5 New gclists and const modifier; added tutorialmode declarations to this branch 2018-11-11 08:44:08 -05:00
mazmazz
58c9232210 Implemented GFX for text prompts 
* PicMode SOC
* PicToLoop SOC
 2018-11-10 12:42:13 -05:00
mazmazz
e48156ed66 SOC for prompt gfx and music 2018-11-10 10:33:58 -05:00
mazmazz
b1bfc35ad7 Hardcode tutorial prompt offset index 2018-11-10 10:15:16 -05:00
mazmazz
9660c0e3c8 Prompt page string field length adjustment; check empty named tag before prompt search 2018-11-10 09:38:32 -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
b25cf9e0d9 Text prompt Hide HUD dehacked 2018-11-09 23:50:25 -05:00
mazmazz
b7af1e385b Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
mazmazz
6c785cff56 Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES 2018-11-09 21:55:14 -05:00
mazmazz
568d87f254 Lowercase font for body text; added ICONFLIP parameter 2018-11-04 22:32:46 -05:00
mazmazz
3e8238f745 Implemented auto-advancing TextPrompts 
* Fixed TextSpeed
* New TimeToNext
* Other bugs
 2018-11-04 22:32:46 -05:00
mazmazz
8d812ab24e Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling 2018-11-04 22:32:46 -05:00
mazmazz
f8f3795927 TextPrompt/Page freeslots; SOC Prompt/Page parsing 2018-11-04 22:31:52 -05: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
41fbdce21e debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else 2018-10-11 19:59:09 +01:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -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
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
mazmazz
53303174c1 MaxBonusLives level header option for # of lives in score tally 2018-08-13 14:17:38 -04:00