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
4747 commits 1 branch 12 tags 205 MiB
Commit graph

4747 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
25857f04c0 Merge branch 'control-selector' into text-prompts 2018-11-12 23:26:27 -05:00
mazmazz
f0dbe3900c Refactor gclists 2018-11-12 23:23:39 -05:00
mazmazz
7663c0828e PicToStart implementation; fix NumPrompts limitation error 2018-11-12 23:16:24 -05:00
mazmazz
b68fb6ec4e F_GetTextPromptTutorialTag implementation 2018-11-12 22:47:20 -05:00
mazmazz
ccffb0538d Merge branch 'control-selector' into text-prompts 2018-11-12 21:11:53 -05:00
mazmazz
d52f91ff7b Uncomment gcs_platform 2018-11-12 17:16:54 -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
69d0b76259 Fix PICSMETAPAGE 2018-11-11 14:50:10 -05:00
mazmazz
0ed806f281 Dehacked typos 2018-11-11 14:44:57 -05:00
mazmazz
36d1088d20 Split gclist_tutorial_check from gclist_tutorial 2018-11-11 09:35:15 -05:00
mazmazz
81b470a57e num_gclist_tutorial adjustment 2018-11-11 09:21:54 -05:00
mazmazz
99a5f7d431 gclist_tutorial include lookup/lookdown for conflict reasons 2018-11-11 08:56:40 -05:00
mazmazz
c4244802e2 gclist adjustments 2018-11-11 08:52:21 -05:00
mazmazz
7bd7c001d5 New gclists and const modifier; added tutorialmode declarations to this branch 2018-11-11 08:44:08 -05:00
mazmazz
880a1d4681 G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check) 2018-11-11 08:21:11 -05:00
mazmazz
762944d0a7 Made gamecontrol tables more portable 
* G_DefineDefaultControls
* G_GetControlScheme
* G_CopyControls
* G_SaveKeySetting
* gamecontrolschemes_e
 2018-11-10 17:26:30 -05:00
mazmazz
8b434072a9 Stub netgame support; ignore bots on linedef special 2018-11-10 15:34:56 -05:00
mazmazz
4f2f5c7e6d Let triggering splitscreen player control the text prompt 2018-11-10 14:47:30 -05:00
mazmazz
9c8a3818ef Splitscreen "support" (one prompt only, both players freeze controls) 2018-11-10 14:30:59 -05:00
mazmazz
67bff00e9b Branch G_Controldefault into FPS and PLATFORM 2018-11-10 13:28:10 -05:00
mazmazz
b45fe054cb Pictoloop zero-based fix 2018-11-10 12:54:59 -05:00
mazmazz
58c9232210 Implemented GFX for text prompts 
* PicMode SOC
* PicToLoop SOC
 2018-11-10 12:42:13 -05:00
mazmazz
c607991f16 Implement music switching for prompts 2018-11-10 11:05:33 -05:00
Monster Iestyn
89eafc59e7 ....ow this slipup hurt me badly 2018-11-10 16:00:33 +00:00
Monster Iestyn
778a2b1dc7 Whoops, mucked up this part of the conflict resolving 2018-11-10 15:55:09 +00:00
Monster Iestyn
027ad8aca9 adding lua_maplib.c comments for new slope-related userdata types 2018-11-10 15:47:04 +00:00
Monster Iestyn
7989e9a482 Merge branch 'public_next' 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
 2018-11-10 15:41:57 +00: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
Monster Iestyn
c44b742112 Merge branch 'master' into next 2018-11-10 14:27:27 +00:00
Monster Iestyn
24bc2a04fa Merge branch 'opengl-improvements-backport' into 'master' 
Opengl improvements backport

See merge request STJr/SRB2!304
 2018-11-10 09:25:18 -05:00
Monster Iestyn
8e507f6e36 Merge branch 'readme-update' into 'master' 
Update readme

See merge request STJr/SRB2!313
 2018-11-10 08:39:02 -05:00
Monster Iestyn
3a926cff5a Merge branch 'copyright-info-update' into 'master' 
Update copyright info

See merge request STJr/SRB2!309
 2018-11-10 08:33:09 -05:00
mazmazz
bf9b5c5d5b Prompt HUD hiding implementation 2018-11-10 01:00:18 -05:00
mazmazz
aaf0a0a3df Merge branch 'text-prompts' into text-prompts-hidehud 2018-11-10 00:10:42 -05:00
mazmazz
19dd2b500b Actually fix empty prompt text crash 2018-11-10 00:10:16 -05:00
mazmazz
b25cf9e0d9 Text prompt Hide HUD dehacked 2018-11-09 23:50:25 -05:00
mazmazz
2106ff30f0 Make gray/black text prompt backcolor darker in OpenGL 2018-11-09 22:52:13 -05:00
mazmazz
b7af1e385b Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
mazmazz
90c83962d1 Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start 2018-11-09 22:07:32 -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
Steel Titanium
8d714f8522 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Monster Iestyn
5532882303 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
Alam Arias
cdf6ef7cc5 Merge pull request #320 from monster-psychic-cat/remote_view_fixes 
Minor remote viewpoint bugfixes.
 2018-11-09 16:09:20 -05:00
Steel Titanium
25bbfe0610 Update readme 2018-11-09 16:01:29 -05:00
Monster Iestyn
ebb27b1c3c Merge branch 'public-op-nightsbumper-fix' into 'next' 
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS

See merge request STJr/SRB2!299
 2018-11-09 12:11:11 -05:00
Monster Iestyn
32a2c6dc3c Merge branch 'master' into next 2018-11-09 16:09:49 +00:00