stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-11 13:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
4732 commits 172 branches 41 tags 242 MiB
Commit graph

4732 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mazmazz
8f7c1e7f71 Fix CopyControls not firing when starting tutorial while keeping current controls 2018-11-11 23:42:02 -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
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
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
727ca143b5 Branch G_Controldefault into FPS and PLATFORM 2018-11-10 13:28:10 -05:00
Monster Iestyn
896de73c60 ....ow this slipup hurt me badly 2018-11-10 16:00:33 +00:00
Monster Iestyn
d456a5362c Whoops, mucked up this part of the conflict resolving 2018-11-10 15:55:09 +00:00
Monster Iestyn
a8291c122a adding lua_maplib.c comments for new slope-related userdata types 2018-11-10 15:47:04 +00:00
Monster Iestyn
268bde3fdf 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
31301660cd Merge branch 'master' into next 2018-11-10 14:27:27 +00:00
Monster Iestyn
925a56ad98 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
de6cb124cb Merge branch 'readme-update' into 'master' 
Update readme

See merge request STJr/SRB2!313
 2018-11-10 08:39:02 -05:00
Monster Iestyn
e01c7ae743 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
ffed9f4d20 Force camera defaults during tutorialmode (doesn't work in all cases) 2018-11-10 01:31:30 -05:00
mazmazz
a542006ae8 Hide Tutorial menu option if no tutorialmap 2018-11-10 01:17:11 -05:00
Steel Titanium
038dfb4aff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Monster Iestyn
4b8232d777 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
Alam Arias
1c22c6a1f9
Merge pull request #320 from monster-psychic-cat/remote_view_fixes 
Minor remote viewpoint bugfixes.
 2018-11-09 16:09:20 -05:00
Steel Titanium
e937d1bacb Update readme 2018-11-09 16:01:29 -05:00
Monster Iestyn
b3befae143 Merge branch 'public-op-nightsbumper-fix' into 'next' 
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS

See merge request STJr/SRB2!299
 2018-11-09 12:11:11 -05:00
Monster Iestyn
17223aa520 Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
Monster Iestyn
f974bb96ac Merge branch 'music-clean' into 'master' 
Some code cleanup.

See merge request STJr/SRB2!298
 2018-11-09 10:58:57 -05:00
Monster Iestyn
df28e2b2a6 Merge branch 'no-hasslope' into next 
yes I'm an idiot for rushing things like this
 2018-11-08 21:25:51 +00:00
Monster Iestyn
98fd9f8e42 WHY DID I FORGET THIS 2018-11-08 21:22:45 +00:00
Monster Iestyn
316cf27a7a Merge branch 'no-hasslope' into 'next' 
No hasslope

See merge request STJr/SRB2!312
 2018-11-08 16:20:28 -05:00