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
Monster Iestyn
ad8f789935
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
59b309be0f
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
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
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
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
MPC
1fcf3c8863
Render the skies correctly on splitscreen in OpenGL mode
2018-11-10 16:19:41 -03:00
Monster Iestyn
4c3bfe81bd
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
f3d129e1a6
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
Monster Iestyn
d3271c5797
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
Monster Iestyn
8cacd3f876
Merge branch 'alias-recursion-hotfix' into 'next'
...
Alias recursion hotfix
See merge request STJr/SRB2!314
2018-11-10 13:56:43 -05:00
Monster Iestyn
51ee510b85
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
MPC
7c18702f84
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03: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
Monster Iestyn
2373a6d209
fix using abs() on unsigned
2018-11-10 17:40:09 +00:00
Monster Iestyn
58c8cbf71d
Whoops, this broke my non-NEWCLIP test build
2018-11-10 16:10:25 +00:00
Monster Iestyn
3e0ec0ed6e
clipping code didn't seem so bad this time (at least compared to without), let's enable it now?
2018-11-10 16:09:52 +00:00
Monster Iestyn
210ea25a1b
Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly
...
R_IsEmptyLine is now a thing too btw
2018-11-10 16:09:21 +00:00
Monster Iestyn
ad860e0d01
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
