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
|
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 |
|
|
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 |
|
|
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 |
|
|
mazmazz
|
311cb27818
|
Close text prompt upon level load
|
2018-11-04 22:32:47 -05:00 |
|
|
mazmazz
|
96e9b4143a
|
Pause TextPrompt when game is paused
|
2018-11-04 22:32:47 -05:00 |
|
|
mazmazz
|
c16c59fd73
|
Support underscores -> spaces in TextPrompt name
|
2018-11-04 22:32:47 -05:00 |
|
|
mazmazz
|
722da815ea
|
Move Line 449 to Line 459; allow post exec tag by either Back X offset or line tag
|
2018-11-04 22:32:47 -05:00 |
|
|
mazmazz
|
6356a6cf2e
|
Lowercase font for body text; added ICONFLIP parameter
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
1ca8fca602
|
Changed Line 449 post exec tag to line tag
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
73ae273348
|
Implemented auto-advancing TextPrompts
* Fixed TextSpeed
* New TimeToNext
* Other bugs
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
0a766dc93b
|
Implemented progressive text printing for TextPrompt
|
2018-11-04 22:32:46 -05:00 |
|
|
Monster Iestyn
|
444462732b
|
added HWR_DrawTutorialBack for OpenGL
|
2018-11-04 22:32:46 -05:00 |
|
|
Monster Iestyn
|
d327f82e85
|
Fix errors found when compiling
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
98d532f119
|
EndTextPrompt: Fix tmthing crash with P_LinedefExecute
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
57d9e0aef6
|
TextPrompt: Implement player blocked controls and post-close run line
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
971151ab83
|
Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
5f1052729c
|
Line 449 param rearranging
|
2018-11-04 22:32:46 -05:00 |
|
|
mazmazz
|
7778507a70
|
Basic TextPrompt line action implemented
|
2018-11-04 22:32:45 -05:00 |
|
|
mazmazz
|
1855359ac0
|
Moved TextPrompt logic to f_finale.c
* Added basic TextPrompt ticker and drawer functions
* Added chevron animation
|
2018-11-04 22:32:45 -05:00 |
|
|
mazmazz
|
edcdf79b60
|
Text prompt: Fix V_DrawFixedPatch call for non-green resos
|
2018-11-04 22:32:45 -05:00 |
|
|
mazmazz
|
63e5cfecff
|
Linedef Exec 449 Control Text Prompt - beginnings
|
2018-11-04 22:32:45 -05:00 |
|
|
mazmazz
|
cbcb6a0d6c
|
Text prompt features: Name, Icon, IconAlign, Lines
|
2018-11-04 22:32:42 -05:00 |
|
|
mazmazz
|
a3d000a37e
|
Kind of support line breaks with PAGETEXT. Can't trim trailing whitespace yet.
|
2018-11-04 22:31:52 -05:00 |
|
|
mazmazz
|
ef241b4521
|
Broken attempt at supporting linebreaks for PageText, like cutscenes
|
2018-11-04 22:31:52 -05:00 |
|
|
mazmazz
|
95c68c331a
|
TextPrompt/Page freeslots; SOC Prompt/Page parsing
|
2018-11-04 22:31:52 -05:00 |
|
|
Monster Iestyn
|
77447492ec
|
Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test
|
2018-11-04 22:31:49 -05:00 |
|
|
Monster Iestyn
|
e5d16c520d
|
Merge branch 'lua-action-userdata-quickfix' into 'master'
Lua action userdata quickfix
See merge request STJr/SRB2Internal!196
|
2018-10-21 06:00:35 -04:00 |
|
|
Monster Iestyn
|
b5c4b476a6
|
Merge branch 'public_next'
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
|
2018-10-20 15:31:48 +01:00 |
|
|
Monster Iestyn
|
d57c54f93b
|
Merge branch 'master' into next
|
2018-10-20 14:13:13 +01:00 |
|
|
Monster Iestyn
|
445a6737ea
|
Merge branch 'public-music-cleanup' into 'master'
Music Code Cleanup
See merge request STJr/SRB2!278
|
2018-10-20 09:12:09 -04:00 |
|
|
Monster Iestyn
|
b1552fad7f
|
Merge branch 'smashspike-hotfix' into 'master'
Smashspike hotfix
See merge request STJr/SRB2Internal!197
|
2018-10-20 08:30:03 -04:00 |
|
|
Monster Iestyn
|
7d61201194
|
Fix slipup from when the smashing spikeballs from HHZ were hardcoded
|
2018-10-20 12:54:40 +01:00 |
|
|
mazmazz
|
a288b95458
|
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
|
2018-10-19 22:04:26 -04:00 |
|
|
Monster Iestyn
|
d4e11762fa
|
Merge branch 'public_next'
# Conflicts:
# src/nds/i_sound.c
# src/r_data.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
|
2018-10-19 22:46:19 +01:00 |
|
|
Monster Iestyn
|
29b242a5bd
|
Merge branch 'endgame-code-refactor-backport' into 'next'
Endgame code refactor
See merge request STJr/SRB2!297
|
2018-10-19 17:31:19 -04:00 |
|
|
Monster Iestyn
|
fe2af34ee5
|
Merge branch 'master' into next
|
2018-10-14 20:49:35 +01:00 |
|