mazmazz
|
5cb72f7071
|
tutorial-time gclist -> gcl refactor
|
2018-11-12 23:25:49 -05:00 |
|
mazmazz
|
4fd469da56
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 23:23:52 -05:00 |
|
mazmazz
|
f0dbe3900c
|
Refactor gclists
|
2018-11-12 23:23:39 -05:00 |
|
mazmazz
|
99b24d6bcf
|
Force chasecam for tutorialmode
|
2018-11-12 20:37:55 -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
|
c9f56017d2
|
Freeze camera values in tutorialmode with proper defaults
|
2018-11-12 18:08:24 -05:00 |
|
mazmazz
|
e956536bb8
|
Merge branch 'tutorial-time' into tutorial-time-camera
|
2018-11-12 17:41:49 -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
|
f6cf4de4d9
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 17:17:02 -05:00 |
|
mazmazz
|
d52f91ff7b
|
Uncomment gcs_platform
|
2018-11-12 17:16:54 -05:00 |
|
mazmazz
|
5944411c26
|
Restrict control changes if tutorialgcs is active
|
2018-11-12 16:56:06 -05:00 |
|
mazmazz
|
761a1d5ef8
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 16:54:49 -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
|
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
|
4d8f0ff04d
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 09:35:27 -05:00 |
|
mazmazz
|
36d1088d20
|
Split gclist_tutorial_check from gclist_tutorial
|
2018-11-11 09:35:15 -05:00 |
|
mazmazz
|
2ec94de082
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:22:54 -05:00 |
|
mazmazz
|
0e0164cb70
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 09:22:06 -05:00 |
|
mazmazz
|
81b470a57e
|
num_gclist_tutorial adjustment
|
2018-11-11 09:21:54 -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
|
e009919f31
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:57:07 -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
|
179bdf4cb3
|
gclist adjustments
|
2018-11-11 08:51:51 -05:00 |
|
mazmazz
|
6d6776a4d8
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:46:06 -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
|
86168a1d80
|
Tutorial mode support for control switching
|
2018-11-11 08:20:08 -05:00 |
|
mazmazz
|
b222bd61c9
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:19:44 -05:00 |
|
mazmazz
|
88e52640ad
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-10 17:30:33 -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
|
67bff00e9b
|
Branch G_Controldefault into FPS and PLATFORM
|
2018-11-10 13:28:10 -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 |
|
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
|
59417ecd4a
|
WIP: First-time tutorial prompt
|
2018-11-10 02:30:21 -05:00 |
|
mazmazz
|
722929a661
|
Force camera defaults during tutorialmode (doesn't work in all cases)
|
2018-11-10 01:31:30 -05:00 |
|
mazmazz
|
d406809ee8
|
Hide Tutorial menu option if no tutorialmap
|
2018-11-10 01:17:11 -05:00 |
|