mazmazz
|
870ee89371
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 23:23:52 -05:00 |
|
|
mazmazz
|
1d86cc348d
|
Refactor gclists
|
2018-11-12 23:23:39 -05:00 |
|
|
mazmazz
|
eb7718bfeb
|
PicToStart implementation; fix NumPrompts limitation error
|
2018-11-12 23:16:24 -05:00 |
|
|
mazmazz
|
d31b4b792b
|
F_GetTextPromptTutorialTag implementation
|
2018-11-12 22:47:20 -05:00 |
|
|
mazmazz
|
a362407886
|
Merge branch 'control-selector' into text-prompts
|
2018-11-12 21:11:53 -05:00 |
|
|
mazmazz
|
7ec4a42d9f
|
Force chasecam for tutorialmode
|
2018-11-12 20:37:55 -05:00 |
|
|
mazmazz
|
a0926b5314
|
First time tutorial prompt fixes
|
2018-11-12 19:10:41 -05:00 |
|
|
mazmazz
|
5200f55e40
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-12 18:08:48 -05:00 |
|
|
mazmazz
|
118da60615
|
Freeze camera values in tutorialmode with proper defaults
|
2018-11-12 18:08:24 -05:00 |
|
|
mazmazz
|
a58461c29e
|
Merge branch 'tutorial-time' into tutorial-time-camera
|
2018-11-12 17:41:49 -05:00 |
|
|
mazmazz
|
80c613561c
|
->defalutvalue -- .defaultvalue adjustment
|
2018-11-12 17:37:54 -05:00 |
|
|
mazmazz
|
40e5a2104b
|
Also set cv_analog for tutorialgcs
* M_TutorialSaveControlResponse CV_Set adjustment
|
2018-11-12 17:34:56 -05:00 |
|
|
mazmazz
|
acd922886a
|
Change mouse cv vars temporarily alongside control scheme
|
2018-11-12 17:30:21 -05:00 |
|
|
mazmazz
|
44b42af22b
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 17:17:02 -05:00 |
|
|
mazmazz
|
1a5ccb2781
|
Uncomment gcs_platform
|
2018-11-12 17:16:54 -05:00 |
|
|
mazmazz
|
4986d5945b
|
Restrict control changes if tutorialgcs is active
|
2018-11-12 16:56:06 -05:00 |
|
|
mazmazz
|
45381058b3
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-12 16:54:49 -05:00 |
|
|
mazmazz
|
31c1145cf3
|
Uncomment gcs_platform defaults
|
2018-11-12 16:54:42 -05:00 |
|
|
mazmazz
|
ab084f1bc9
|
Add tutorialgcs variable for optional control scheme loading
|
2018-11-12 16:50:03 -05:00 |
|
|
Monster Iestyn
|
e85f73117c
|
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
|
2018-11-12 20:07:45 +00:00 |
|
|
Monster Iestyn
|
63ba59341b
|
Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing
|
2018-11-12 16:23:59 +00:00 |
|
|
mazmazz
|
8f7c1e7f71
|
Fix CopyControls not firing when starting tutorial while keeping current controls
|
2018-11-11 23:42:02 -05:00 |
|
|
mazmazz
|
ce7f168568
|
Fix PICSMETAPAGE
|
2018-11-11 14:50:10 -05:00 |
|
|
mazmazz
|
424bc557c2
|
Dehacked typos
|
2018-11-11 14:44:57 -05:00 |
|
|
mazmazz
|
3f1ade35f3
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:37:36 -05:00 |
|
|
mazmazz
|
703cb6be0f
|
Check reduced control set for tutorial time; change the entire tutorial control set when prompted
|
2018-11-11 09:37:19 -05:00 |
|
|
mazmazz
|
9fc58d0a68
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 09:35:27 -05:00 |
|
|
mazmazz
|
c7a855de7a
|
Split gclist_tutorial_check from gclist_tutorial
|
2018-11-11 09:35:15 -05:00 |
|
|
mazmazz
|
e553d90b63
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:22:54 -05:00 |
|
|
mazmazz
|
3be9981231
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 09:22:06 -05:00 |
|
|
mazmazz
|
fd83e1ed5c
|
num_gclist_tutorial adjustment
|
2018-11-11 09:21:54 -05:00 |
|
|
mazmazz
|
c883b13b5d
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:21:10 -05:00 |
|
|
mazmazz
|
54f04fa5cf
|
Tutorial control message adjustments
|
2018-11-11 09:15:43 -05:00 |
|
|
mazmazz
|
ea9f499936
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:57:07 -05:00 |
|
|
mazmazz
|
181d13fe73
|
gclist_tutorial include lookup/lookdown for conflict reasons
|
2018-11-11 08:56:40 -05:00 |
|
|
mazmazz
|
80b19ff566
|
gclist adjustments
|
2018-11-11 08:52:21 -05:00 |
|
|
mazmazz
|
9ff27ebbae
|
gclist adjustments
|
2018-11-11 08:51:51 -05:00 |
|
|
mazmazz
|
6be583eac6
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:46:06 -05:00 |
|
|
mazmazz
|
3f72e1bacf
|
New gclists and const modifier; added tutorialmode declarations to this branch
|
2018-11-11 08:44:08 -05:00 |
|
|
mazmazz
|
9f1c40f881
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:21:11 -05:00 |
|
|
mazmazz
|
85bcf6d389
|
Tutorial mode support for control switching
|
2018-11-11 08:20:08 -05:00 |
|
|
mazmazz
|
75fc91644b
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:19:44 -05:00 |
|
|
mazmazz
|
1e00381075
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-10 17:30:33 -05:00 |
|
|
mazmazz
|
775b34e3f2
|
Made gamecontrol tables more portable
* G_DefineDefaultControls
* G_GetControlScheme
* G_CopyControls
* G_SaveKeySetting
* gamecontrolschemes_e
|
2018-11-10 17:26:30 -05:00 |
|
|
mazmazz
|
7deeb8bac4
|
Stub netgame support; ignore bots on linedef special
|
2018-11-10 15:34:56 -05:00 |
|
|
mazmazz
|
0c72d7e70a
|
Let triggering splitscreen player control the text prompt
|
2018-11-10 14:47:30 -05:00 |
|
|
mazmazz
|
80973e8b65
|
Splitscreen "support" (one prompt only, both players freeze controls)
|
2018-11-10 14:30:59 -05:00 |
|
|
Monster Iestyn
|
e4f157786c
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
|
2018-11-10 19:18:34 +00:00 |
|
|
Monster Iestyn
|
fced19d291
|
Merge branch 'master' into next
|
2018-11-10 19:05:33 +00:00 |
|
|
Monster Iestyn
|
c7e58b7cd5
|
Merge branch 'opengl-new-clipping-backport' into 'master'
OpenGL new clipping backport
See merge request STJr/SRB2!315
|
2018-11-10 13:57:16 -05:00 |
|