thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5623 commits 1 branch 12 tags 205 MiB
Commit graph

372 commits

Author SHA1 Message Date
Monster Iestyn
a6a4b74692 Merge branch '21-controls' into 'next' 
Default control changes for 2.1.21

See merge request STJr/SRB2!343
 2018-11-27 11:50:42 -05:00
Digiku
dcba8ab654 "Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk 2018-11-26 15:48:08 -05:00
Steel Titanium
157502310f Save sound toggles to config 2018-11-25 14:22:52 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz
21095ad813 Added chasefreecam to menu 2018-11-22 17:32:03 -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
472caaf277 Adjust menu for movement and camera controls 2018-11-22 14:13:28 -05:00
mazmazz
e72df07c6c Change camera control names to Look 2018-11-22 11:28:32 -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
Monster Iestyn
cfa4bbd75b change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
mazmazz
3c168afc60 Check specifically for gcs_fps when starting tutorial 2018-11-13 01:57:51 -05:00
mazmazz
5cb72f7071 tutorial-time gclist -> gcl refactor 2018-11-12 23:25:49 -05:00
mazmazz
14199fd516 First time tutorial prompt fixes 2018-11-12 19:10:41 -05:00
mazmazz
8b1624576f Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-12 18:08:48 -05:00
mazmazz
658ecce249 ->defalutvalue -- .defaultvalue adjustment 2018-11-12 17:37:54 -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
8bd5b62a9d Fix CopyControls not firing when starting tutorial while keeping current controls 2018-11-11 23:42:02 -05:00
mazmazz
4e004571b6 Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-11 09:37:36 -05:00
mazmazz
54265477b4 Check reduced control set for tutorial time; change the entire tutorial control set when prompted 2018-11-11 09:37:19 -05:00
mazmazz
b60335fd57 Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-11 09:21:10 -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
mazmazz
59417ecd4a WIP: First-time tutorial prompt 2018-11-10 02:30:21 -05:00
mazmazz
d406809ee8 Hide Tutorial menu option if no tutorialmap 2018-11-10 01:17:11 -05:00
mazmazz
acbbe3daf8 Merge remote-tracking branch 'origin/master' into tutorial-time 2018-11-03 10:58:11 -04: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
c64d52c1f9 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
 2018-09-14 16:39:10 -04:00
mazmazz
e7d87ea486 Menu sound toggle fixes (and add starpost sfx to menu) 2018-09-14 11:24:28 -04:00
mazmazz
89dcae23a2 Play the opposite type music (Digital/MIDI) when toggling between them in menu 
* S_MusicInfo method to retrieve name, flags, and looping

(cherry picked from commit f6ec93198f0dcfa1d053cca88172c3e3c7ba310c)
 2018-09-14 10:38:32 -04:00
mazmazz
b51cf6c060 Toggle Digi/MIDI music in menu accurately; add S_MusicType 
(cherry picked from commit 4aa100aa575cc7fc14a743085222c806ba2c714a)
 2018-09-14 10:37:08 -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
cc20eed183 Merge branch 'master' into tutorial-time 2018-09-04 15:54:50 +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
d60ade9f95 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +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
Monster Iestyn
dc6b52a449 Add INFLIVES macro, to make it easier to find infinite lives-related code 2018-08-23 20:09:39 +01:00
Latapostrophe
da3fb0913b Changed chat position, 
Added chat back tint
Fixed word wrapping glitches
 2018-08-19 10:58:29 +02:00
Monster Iestyn
f31dcb6357 Added "Tutorialmap" MainCfg option for SOC 2018-08-12 14:30:49 +01:00
Monster Iestyn
4ab0742604 Make "Tutorial" warp directly to MAPZ0 (not configurable yet) 2018-08-11 21:17:52 +01:00
Monster Iestyn
5534c0519c Add "Tutorial" to the 1P menu, above "Start Game". It doesn't actually do anything yet, mind! 
Also, change said menu's def to start at "Start Game" when entering it for the first time.
 2018-08-11 18:01:54 +01:00
mazmazz
9591ac92ec Pandora's Box support for player->spheres 
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
 2018-08-10 13:15:54 -04:00
Monster Iestyn
502c80eaac Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
Monster Iestyn
f6b8206660 Merge branch 'public_next' 
# Conflicts:
#	src/hardware/hw_md2.c
 2018-07-31 19:41:54 +01:00
Latapostrophe
a4bded8e9e SRB2chat test rework 2018-07-31 11:10:02 +02:00