mazmazz
|
c1c815ce6e
|
Compile errors
|
2018-11-13 10:31:06 -05:00 |
|
|
mazmazz
|
4b3dff3ef3
|
Tutorial named tag detection adjustment
|
2018-11-13 02:00:58 -05:00 |
|
|
mazmazz
|
6f435ee410
|
F_AdvanceToNextPage adjustment
|
2018-11-13 01:38:20 -05:00 |
|
|
mazmazz
|
75c4a96e69
|
NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
|
2018-11-13 00:13:36 -05:00 |
|
|
mazmazz
|
f4ad5ebfba
|
text-prompts gclist -> gcl refactor
|
2018-11-12 23:31:10 -05:00 |
|
|
mazmazz
|
3a00439f3a
|
Merge branch 'control-selector' into text-prompts
|
2018-11-12 23:26:27 -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
|
1a5ccb2781
|
Uncomment gcs_platform
|
2018-11-12 17:16:54 -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
|
ce7f168568
|
Fix PICSMETAPAGE
|
2018-11-11 14:50:10 -05:00 |
|
|
mazmazz
|
424bc557c2
|
Dehacked typos
|
2018-11-11 14:44:57 -05:00 |
|
|
mazmazz
|
c7a855de7a
|
Split gclist_tutorial_check from gclist_tutorial
|
2018-11-11 09:35:15 -05:00 |
|
|
mazmazz
|
fd83e1ed5c
|
num_gclist_tutorial adjustment
|
2018-11-11 09:21:54 -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
|
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
|
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 |
|
|
mazmazz
|
727ca143b5
|
Branch G_Controldefault into FPS and PLATFORM
|
2018-11-10 13:28:10 -05:00 |
|
|
mazmazz
|
8c6de7ff60
|
Pictoloop zero-based fix
|
2018-11-10 12:54:59 -05:00 |
|
|
mazmazz
|
9a038b28e1
|
Implemented GFX for text prompts
* PicMode SOC
* PicToLoop SOC
|
2018-11-10 12:42:13 -05:00 |
|
|
mazmazz
|
631c6f93f5
|
Implement music switching for prompts
|
2018-11-10 11:05:33 -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 |
|
|
mazmazz
|
3d9ce630d2
|
SOC for prompt gfx and music
|
2018-11-10 10:33:58 -05:00 |
|
|
mazmazz
|
99a0831b0b
|
Hardcode tutorial prompt offset index
|
2018-11-10 10:15:16 -05:00 |
|
|
mazmazz
|
a197c19742
|
Prompt page string field length adjustment; check empty named tag before prompt search
|
2018-11-10 09:38:32 -05:00 |
|
|
mazmazz
|
e1e94c3af2
|
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
|
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
|
33a94ba2b8
|
Prompt HUD hiding implementation
|
2018-11-10 01:00:18 -05:00 |
|
|
mazmazz
|
54dc5d1892
|
Merge branch 'text-prompts' into text-prompts-hidehud
|
2018-11-10 00:10:42 -05:00 |
|
|
mazmazz
|
19a8b15912
|
Actually fix empty prompt text crash
|
2018-11-10 00:10:16 -05:00 |
|
|
mazmazz
|
7ac641450f
|
Text prompt Hide HUD dehacked
|
2018-11-09 23:50:25 -05:00 |
|
|
mazmazz
|
9ee894f777
|
Make gray/black text prompt backcolor darker in OpenGL
|
2018-11-09 22:52:13 -05:00 |
|
|
mazmazz
|
7daf5d4727
|
Set up separate background color for prompts vs. console
|
2018-11-09 22:38:55 -05:00 |
|
|
mazmazz
|
ae4c1e0e82
|
Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start
|
2018-11-09 22:07:32 -05:00 |
|
|
mazmazz
|
b8897db308
|
Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES
|
2018-11-09 21:55:14 -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 |
|