Commit graph

5078 commits

Author SHA1 Message Date
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
Steel Titanium
8d714f8522 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Monster Iestyn
5532882303 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
Alam Arias
cdf6ef7cc5 Merge pull request #320 from monster-psychic-cat/remote_view_fixes
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
Steel Titanium
25bbfe0610 Update readme 2018-11-09 16:01:29 -05:00
Monster Iestyn
ebb27b1c3c Merge branch 'public-op-nightsbumper-fix' into 'next'
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS

See merge request STJr/SRB2!299
2018-11-09 12:11:11 -05:00
Monster Iestyn
32a2c6dc3c Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
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
Monster Iestyn
91a44addd9 d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0 2018-11-08 20:09:00 +00:00
Monster Iestyn
389b39d541 byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness 2018-11-08 17:16:54 +00:00
Monster Iestyn
1d0065f16a More doomtype.h cleaning up:
* Move the misc types in the file to bottom, so that ATTRPACK at least is usable for RGBA_t
* Include endian.h, so that UINT2RGBA can be defined correctly for big endian builds
* Add more comments to make clear the main sections of the file
2018-11-08 17:05:35 +00:00
Monster Iestyn
a4a975224a Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable 2018-11-08 16:31:20 +00:00
Monster Iestyn
b34e8c5390 Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00: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
Monster Iestyn
6042ac0c78 ST_Ticker also should not have FUNCMATH, as it also has side effects 2018-11-07 21:45:27 +00:00
Monster Iestyn
95c2d12d94 HU_Start should not have FUNCMATH, it has side effects 2018-11-07 21:37:42 +00:00
Monster Iestyn
7c0fb1702f D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function. 2018-11-07 21:21:36 +00:00
Monster Iestyn
856afe0708 P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway) 2018-11-07 21:00:38 +00: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
20f1eb6e8e Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat 2018-11-05 07:41:02 -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