Commit graph

5078 commits

Author SHA1 Message Date
mazmazz
4b63f20e9d Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-11-13 14:34:40 -05:00
mazmazz
22ce982335 Merge branch 'master' into musicplus-core 2018-11-13 14:19:04 -05:00
mazmazz
336610c042 Remove misplaced tutorialmode = false due to debugging 2018-11-13 14:12:22 -05:00
mazmazz
df7d23f00d Merge branch 'master' into musicplus-core 2018-11-13 13:46:30 -05:00
Digiku
656a471908 Merge branch 'text-prompts' into 'master'
SOC and Line Exec Text Prompts

See merge request STJr/SRB2Internal!200
2018-11-13 11:14:02 -05:00
mazmazz
7b0ec6479f Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
Digiku
aac4a99e99 Merge branch 'tutorial-time' into 'master'
Tutorial mode handling

See merge request STJr/SRB2Internal!201
2018-11-13 10:49:02 -05:00
Digiku
38107c9b3d Merge branch 'control-switching' into 'master'
Game control switching

See merge request STJr/SRB2Internal!202
2018-11-13 10:48:18 -05:00
Digiku
3f7df0561d Merge branch 'tracerangle' into 'master'
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away

See merge request STJr/SRB2Internal!198
2018-11-13 10:48:01 -05:00
Digiku
d10191ea5d Merge branch 'monitor-exec' into 'master'
Run linedef exec upon popping a monitor

See merge request STJr/SRB2Internal!199
2018-11-13 10:47:37 -05:00
mazmazz
9a36d559dc Compile errors 2018-11-13 10:43:40 -05:00
mazmazz
c92df614f0 Compile errors 2018-11-13 10:31:06 -05:00
mazmazz
7b224cdcd5 Tutorial named tag detection adjustment 2018-11-13 02:00:58 -05:00
mazmazz
3c168afc60 Check specifically for gcs_fps when starting tutorial 2018-11-13 01:57:51 -05:00
mazmazz
5270743a42 F_AdvanceToNextPage adjustment 2018-11-13 01:38:20 -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
deb036058c text-prompts gclist -> gcl refactor 2018-11-12 23:31:10 -05:00
mazmazz
25857f04c0 Merge branch 'control-selector' into text-prompts 2018-11-12 23:26:27 -05:00
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
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
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
69d0b76259 Fix PICSMETAPAGE 2018-11-11 14:50:10 -05:00
mazmazz
0ed806f281 Dehacked typos 2018-11-11 14:44:57 -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