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
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
mazmazz
b7c6661c76
Add MTF_EXTRA flag to monitors, to run linedef exec by Angle (Tag + 16384) upon pop
2018-11-04 20:16:33 -05:00
mazmazz
eaf89cf7b9
TRACERANGLE: Run exec *after* resetting mobj values
2018-11-04 17:34:00 -05:00
mazmazz
4fc335a26b
Line 458: Only do disable operation if MFE_TRACERANGLE is set
2018-11-04 16:48:18 -05:00