54dc5d1892
Merge branch 'text-prompts' into text-prompts-hidehud
2018-11-10 00:10:42 -05:00
19a8b15912
Actually fix empty prompt text crash
2018-11-10 00:10:16 -05:00
7ac641450f
Text prompt Hide HUD dehacked
2018-11-09 23:50:25 -05:00
9ee894f777
Make gray/black text prompt backcolor darker in OpenGL
2018-11-09 22:52:13 -05:00
7daf5d4727
Set up separate background color for prompts vs. console
2018-11-09 22:38:55 -05:00
ae4c1e0e82
Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start
2018-11-09 22:07:32 -05:00
b8897db308
Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES
2018-11-09 21:55:14 -05:00
311cb27818
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
96e9b4143a
Pause TextPrompt when game is paused
2018-11-04 22:32:47 -05:00
c16c59fd73
Support underscores -> spaces in TextPrompt name
2018-11-04 22:32:47 -05:00
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
6356a6cf2e
Lowercase font for body text; added ICONFLIP parameter
2018-11-04 22:32:46 -05:00
1ca8fca602
Changed Line 449 post exec tag to line tag
2018-11-04 22:32:46 -05:00
73ae273348
Implemented auto-advancing TextPrompts
...
* Fixed TextSpeed
* New TimeToNext
* Other bugs
2018-11-04 22:32:46 -05:00
0a766dc93b
Implemented progressive text printing for TextPrompt
2018-11-04 22:32:46 -05:00
444462732b
added HWR_DrawTutorialBack for OpenGL
2018-11-04 22:32:46 -05:00
d327f82e85
Fix errors found when compiling
2018-11-04 22:32:46 -05:00
98d532f119
EndTextPrompt: Fix tmthing crash with P_LinedefExecute
2018-11-04 22:32:46 -05:00
57d9e0aef6
TextPrompt: Implement player blocked controls and post-close run line
2018-11-04 22:32:46 -05:00
971151ab83
Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling
2018-11-04 22:32:46 -05:00
5f1052729c
Line 449 param rearranging
2018-11-04 22:32:46 -05:00
7778507a70
Basic TextPrompt line action implemented
2018-11-04 22:32:45 -05:00
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
edcdf79b60
Text prompt: Fix V_DrawFixedPatch call for non-green resos
2018-11-04 22:32:45 -05:00
63e5cfecff
Linedef Exec 449 Control Text Prompt - beginnings
2018-11-04 22:32:45 -05:00
cbcb6a0d6c
Text prompt features: Name, Icon, IconAlign, Lines
2018-11-04 22:32:42 -05:00
a3d000a37e
Kind of support line breaks with PAGETEXT. Can't trim trailing whitespace yet.
2018-11-04 22:31:52 -05:00
ef241b4521
Broken attempt at supporting linebreaks for PageText, like cutscenes
2018-11-04 22:31:52 -05:00
95c68c331a
TextPrompt/Page freeslots; SOC Prompt/Page parsing
2018-11-04 22:31:52 -05:00
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
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
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
d57c54f93b
Merge branch 'master' into next
2018-10-20 14:13:13 +01:00
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
b1552fad7f
Merge branch 'smashspike-hotfix' into 'master'
...
Smashspike hotfix
See merge request STJr/SRB2Internal!197
2018-10-20 08:30:03 -04:00
7d61201194
Fix slipup from when the smashing spikeballs from HHZ were hardcoded
2018-10-20 12:54:40 +01:00
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
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
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
fe2af34ee5
Merge branch 'master' into next
2018-10-14 20:49:35 +01:00
423403eab5
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
b720cb10dc
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
b2f196d418
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
cc7d9509f2
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
3886888b30
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
6184f91dd3
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
8ab4915b5b
Whoops these should be L not gL here (not that it makes much difference normally though)
2018-10-11 21:44:25 +01:00
feceaf6d30
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission
...
Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2018-10-11 21:25:15 +01:00
2bb7df5f49
G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt
2018-10-11 21:25:04 +01:00
31f3f8b8e7
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01:00
mazmazz