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
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
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
5d558ffed9
Updated SRB2.cbp for hw_clip.c/h
2018-11-10 16:10:08 +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
Monster Iestyn
b7dc441e10
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00: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
Monster Iestyn
8fac10505f
Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion
2018-11-10 13:08:26 +00: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
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
