Monster Iestyn
|
17223aa520
|
Merge branch 'master' into next
|
2018-11-09 16:09:49 +00:00 |
|
Monster Iestyn
|
f974bb96ac
|
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
|
df28e2b2a6
|
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
|
98fd9f8e42
|
WHY DID I FORGET THIS
|
2018-11-08 21:22:45 +00:00 |
|
Monster Iestyn
|
316cf27a7a
|
Merge branch 'no-hasslope' into 'next'
No hasslope
See merge request STJr/SRB2!312
|
2018-11-08 16:20:28 -05:00 |
|
Monster Iestyn
|
82c738ea4b
|
Remove hasslope, per colette's warning about it potentially causing desyncs
|
2018-11-08 21:13:58 +00:00 |
|
Monster Iestyn
|
d8f3a20e65
|
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
|
a9cfd6a781
|
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
|
91113cb79c
|
Merge branch 'master' into next
|
2018-11-08 20:50:58 +00:00 |
|
Monster Iestyn
|
7cc5caf69c
|
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
|
b8c4d7ddff
|
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
|
1602904011
|
Merge branch 'master' into remote_view_fixes
|
2018-11-07 17:57:49 -02:00 |
|
GoldenTails
|
a3bc7ddfa0
|
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-06 18:09:45 -06:00 |
|
MPC
|
1cc8619c9e
|
Minor remote viewpoint bugfixes.
|
2018-11-05 20:40:51 -02: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
|
02b14959cc
|
Merge branch 'master' into next
|
2018-11-03 12:29:04 +00:00 |
|
Monster Iestyn
|
924c3164b0
|
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
|
86ad6de35b
|
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
|
0f37411e2b
|
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
|
7b268d15b1
|
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
|
f37a573834
|
Merge branch 'master' into next
|
2018-11-02 11:02:35 +00:00 |
|
Monster Iestyn
|
ba5f5be3bb
|
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
|
5a0cfc10f4
|
Update copyright info on some files
|
2018-11-01 14:47:19 -04:00 |
|
Monster Iestyn
|
4dd5abf534
|
Merge branch 'master' into next
|
2018-10-31 23:10:57 +00:00 |
|
Monster Iestyn
|
c450a1aee2
|
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
|
61c1b12960
|
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
|
e9ea1b47d5
|
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
|
6841458546
|
got rid of the settop as well
|
2018-10-30 22:51:05 +01:00 |
|