Commit graph

5689 commits

Author SHA1 Message Date
mazmazz
19a8b15912 Actually fix empty prompt text crash 2018-11-10 00:10:16 -05:00
mazmazz
7ac641450f Text prompt Hide HUD dehacked 2018-11-09 23:50:25 -05:00
mazmazz
9ee894f777 Make gray/black text prompt backcolor darker in OpenGL 2018-11-09 22:52:13 -05:00
mazmazz
7daf5d4727 Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
mazmazz
ae4c1e0e82 Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start 2018-11-09 22:07:32 -05:00
mazmazz
b8897db308 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
038dfb4aff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Monster Iestyn
4b8232d777 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
Alam Arias
1c22c6a1f9
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
e937d1bacb Update readme 2018-11-09 16:01:29 -05:00
Monster Iestyn
b3befae143 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
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
Monster Iestyn
f50f10ef30 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
fa80d61799 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
fd20bbb54e 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
5c61c40551 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
0bdbdd1b1e 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
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
Monster Iestyn
c47f0045d6 ST_Ticker also should not have FUNCMATH, as it also has side effects 2018-11-07 21:45:27 +00:00
Monster Iestyn
b3e8a1ed88 HU_Start should not have FUNCMATH, it has side effects 2018-11-07 21:37:42 +00:00
Monster Iestyn
4a4e07e138 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
f66979ba1a 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
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
eb204b6cc4 Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat 2018-11-05 07:41:02 -05: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