Monster Iestyn
|
74f221d73f
|
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
|
c1a4a62d87
|
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
|
7d31440ca6
|
WHY DID I FORGET THIS
|
2018-11-08 21:22:45 +00:00 |
|
Monster Iestyn
|
150fe29988
|
Merge branch 'no-hasslope' into 'next'
No hasslope
See merge request STJr/SRB2!312
|
2018-11-08 16:20:28 -05:00 |
|
Monster Iestyn
|
8440664c2f
|
Remove hasslope, per colette's warning about it potentially causing desyncs
|
2018-11-08 21:13:58 +00:00 |
|
Monster Iestyn
|
1200793a94
|
Merge branch 'Playerquit_hook' into 'next'
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
|
2018-11-08 15:53:35 -05:00 |
|
Monster Iestyn
|
5f7c333625
|
Merge branch 'lua-slopes' into 'next'
Lua support for slopes
See merge request STJr/SRB2!307
|
2018-11-08 15:52:44 -05:00 |
|
Monster Iestyn
|
68305c3b18
|
Merge branch 'master' into next
|
2018-11-08 20:50:58 +00:00 |
|
Monster Iestyn
|
8c2a163f5d
|
Merge branch 'winsock-error-handling-fixes' into 'master'
Winsock error handling fixes
See merge request STJr/SRB2!303
|
2018-11-08 15:49:35 -05:00 |
|
Alam Arias
|
899452e9bc
|
Merge pull request #321 from GoldenTails/next-add-a-lua-variable-to-ultimate-mode-so-people-can-check-it
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-07 17:53:20 -05:00 |
|
TCLScrufflet
|
2c73512a23
|
Merge branch 'master' into remote_view_fixes
|
2018-11-07 17:57:49 -02:00 |
|
GoldenTails
|
71f97a4a92
|
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-06 18:09:45 -06:00 |
|
MPC
|
eef8119123
|
Minor remote viewpoint bugfixes.
|
2018-11-05 20:40:51 -02: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
|
fcee38d647
|
Merge branch 'master' into next
|
2018-11-03 12:29:04 +00:00 |
|
Monster Iestyn
|
3e4ab68264
|
Merge branch 'soc-sanitising-the-sequel' into 'next'
SOC sanitising the sequel!
See merge request STJr/SRB2!308
|
2018-11-03 08:18:16 -04:00 |
|
Monster Iestyn
|
3b6e8bcf09
|
Merge branch 'file-loading-hotfix' into 'master'
File loading hotfix
See merge request STJr/SRB2!310
|
2018-11-02 19:03:59 -04:00 |
|
Monster Iestyn
|
a67dd8821f
|
Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
|
2018-11-02 20:48:12 +00:00 |
|
Monster Iestyn
|
f2623aaa90
|
Merge branch 'lua-hudlib-addition' into 'next'
Lua: hud.enabled and v.getLocalTransFlag()
See merge request STJr/SRB2!306
|
2018-11-02 14:29:02 -04:00 |
|
Monster Iestyn
|
b4ef5c4060
|
Merge branch 'master' into next
|
2018-11-02 11:02:35 +00:00 |
|
Monster Iestyn
|
529f38d1e9
|
Merge branch 'patch-offsets-fix' into 'master'
Patch offsets fix
See merge request STJr/SRB2!305
|
2018-11-02 07:00:37 -04:00 |
|
Steel Titanium
|
d7a0a3c94b
|
Update copyright info on some files
|
2018-11-01 14:47:19 -04:00 |
|
Monster Iestyn
|
aa35e4206a
|
Merge branch 'master' into next
|
2018-10-31 23:10:57 +00:00 |
|
Monster Iestyn
|
c941971a0a
|
Merge branch 'mi-minor-refactoring-backport' into 'master'
MI minor refactoring
See merge request STJr/SRB2!294
|
2018-10-31 16:49:30 -04:00 |
|
Monster Iestyn
|
22734fa585
|
Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master'
Multi-patch texture support for transparency AND translucency
See merge request STJr/SRB2!293
|
2018-10-31 16:48:38 -04:00 |
|
Monster Iestyn
|
7cef400f0e
|
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
|
2018-10-31 19:26:29 +00:00 |
|
Latapostrophe
|
24580087d0
|
got rid of the settop as well
|
2018-10-30 22:51:05 +01:00 |
|
Latapostrophe
|
5ef97a6ec8
|
remove gL check
|
2018-10-30 22:29:28 +01:00 |
|