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
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
mazmazz
2106ff30f0
Make gray/black text prompt backcolor darker in OpenGL
2018-11-09 22:52:13 -05:00
mazmazz
b7af1e385b
Set up separate background color for prompts vs. console
2018-11-09 22:38:55 -05:00
mazmazz
90c83962d1
Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start
2018-11-09 22:07:32 -05:00
mazmazz
6c785cff56
Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES
2018-11-09 21:55:14 -05:00
mazmazz
3d86cbc729
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
mazmazz
0169847e06
Pause TextPrompt when game is paused
2018-11-04 22:32:47 -05:00
mazmazz
039b7b17cf
Support underscores -> spaces in TextPrompt name
2018-11-04 22:32:47 -05:00
mazmazz
f8d64c93d7
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
568d87f254
Lowercase font for body text; added ICONFLIP parameter
2018-11-04 22:32:46 -05:00
mazmazz
7246b6e9a6
Changed Line 449 post exec tag to line tag
2018-11-04 22:32:46 -05:00
mazmazz
3e8238f745
Implemented auto-advancing TextPrompts
...
* Fixed TextSpeed
* New TimeToNext
* Other bugs
2018-11-04 22:32:46 -05:00
mazmazz
247580a168
Implemented progressive text printing for TextPrompt
2018-11-04 22:32:46 -05:00
Monster Iestyn
1831df3b2e
added HWR_DrawTutorialBack for OpenGL
2018-11-04 22:32:46 -05:00
Monster Iestyn
5a8e256ca1
Fix errors found when compiling
2018-11-04 22:32:46 -05:00
mazmazz
6469efc661
EndTextPrompt: Fix tmthing crash with P_LinedefExecute
2018-11-04 22:32:46 -05:00
mazmazz
30dbb6a644
TextPrompt: Implement player blocked controls and post-close run line
2018-11-04 22:32:46 -05:00
mazmazz
8d812ab24e
Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling
2018-11-04 22:32:46 -05:00
mazmazz
c914be07ab
Line 449 param rearranging
2018-11-04 22:32:46 -05:00
mazmazz
2b36943bf0
Basic TextPrompt line action implemented
2018-11-04 22:32:45 -05:00
mazmazz
77c5774e51
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
d69cd4b9c6
Text prompt: Fix V_DrawFixedPatch call for non-green resos
2018-11-04 22:32:45 -05:00
mazmazz
0865497e66
Linedef Exec 449 Control Text Prompt - beginnings
2018-11-04 22:32:45 -05:00
mazmazz
e0620d70b2
Text prompt features: Name, Icon, IconAlign, Lines
2018-11-04 22:32:42 -05:00
mazmazz
28d5add0cf
Kind of support line breaks with PAGETEXT. Can't trim trailing whitespace yet.
2018-11-04 22:31:52 -05:00
mazmazz
c1d6fcccf0
Broken attempt at supporting linebreaks for PageText, like cutscenes
2018-11-04 22:31:52 -05:00
mazmazz
f8f3795927
TextPrompt/Page freeslots; SOC Prompt/Page parsing
2018-11-04 22:31:52 -05:00
Monster Iestyn
0373207db5
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
c75853c92a
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
a0c822fec8
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
a44b368ee0
Merge branch 'master' into next
2018-10-20 14:13:13 +01:00
Monster Iestyn
86032b308e
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
0840f2e9ae
Merge branch 'smashspike-hotfix' into 'master'
...
Smashspike hotfix
See merge request STJr/SRB2Internal!197
2018-10-20 08:30:03 -04:00
Monster Iestyn
27435053a1
Fix slipup from when the smashing spikeballs from HHZ were hardcoded
2018-10-20 12:54:40 +01:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
0b70c725c8
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
55a3e4c81f
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
37f32fa251
Merge branch 'master' into next
2018-10-14 20:49:35 +01:00
Monster Iestyn
acdd303b46
Merge branch 'sound-handle-fix' into 'master'
...
Handle fix for SDL Mixer
See merge request STJr/SRB2!301
2018-10-14 15:46:25 -04:00
Monster Iestyn
8cb5bfe356
Merge branch 'pris_accurate-gif-delay' into 'master'
...
More accurate GIF delay
See merge request STJr/SRB2!276
2018-10-14 15:44:33 -04:00
Monster Iestyn
ae68bae4a7
Merge branch 'no-doubling-texture-heights-plz-backport' into 'next'
...
No doubling texture heights plz
See merge request STJr/SRB2!296
2018-10-14 15:43:57 -04:00
Monster Iestyn
008bb9accc
Merge branch 'mi-a-bit-of-cleanup-backport' into 'master'
...
MI's unimportant code cleanup
See merge request STJr/SRB2!295
2018-10-14 15:43:32 -04:00
Sryder
394075fbe9
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
Sryder
4132b39b9a
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
