1fb244d87f
GTR_HIDETIME, not GTR_TAG
2019-12-27 18:24:08 -03:00
1f96f70173
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 17:08:20 -03:00
ed29efd9eb
ST_drawLivesArea stuff.
2019-12-27 16:58:55 -03:00
51404130af
Respawn delay gametype rule
2019-12-27 01:44:27 -03:00
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
0780e48f86
Merge branch 'titlecard2' into 'next'
...
More customisable title card
See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
9319014d8d
Title card fixes.
2019-12-24 16:22:25 -03:00
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
d0e18444fb
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 20:12:52 -03:00
396106829a
Ringslinger tweaks
2019-12-18 19:26:45 -03:00
7768e2c7f9
More spectator tweaks
2019-12-18 15:14:24 -03:00
86ac94817a
Spectator HUD tweaks
2019-12-18 12:28:01 -03:00
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
ea5e0d28ed
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
254d812901
More customisable title card
...
Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC.
Add the same fields to Lua under their internal names.
Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)
2019-12-18 00:28:58 -03:00
0ab31b3de0
Let Lua toggle Match/CTF team scores HUD element
2019-12-16 17:58:00 -03:00
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
c0cc742fb8
Remove unnecessary function parameters from title card code
2019-12-05 01:58:19 -03:00
fdcc8c912a
Actually, wait; this is way better and cleaner.
2019-11-29 20:41:13 +00:00
ed0529b9d5
Match final countdown timer to timer ( resolves #400 ).
2019-11-29 20:35:59 +00:00
ef556ca6d5
Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
...
Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.
2019-11-25 18:52:38 +00:00
2a9db29c58
fix showfps with st_translucency
2019-11-23 18:41:28 -03:00
e0a9b3d695
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
2ac44240db
Fix the coords of the subtitle.
2019-11-19 12:59:01 +00:00
99d4db956c
change vertical alignment
2019-11-18 21:45:30 -03:00
8de7ff0c86
fix subttl
2019-11-18 21:44:02 -03:00
1e4060af8c
remove unused levelwipes
2019-11-18 19:22:46 -03:00
1698e2d986
adjust duration
2019-11-18 19:08:04 -03:00
8a05afa1aa
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
aa659836ee
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
233ff8bd27
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
dc70a24b30
restore zigzags
2019-11-18 15:32:48 -03:00
b7f2b74d9a
V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements
2019-11-18 15:18:27 -03:00
29792c7a2b
missing prototype
2019-11-18 15:13:31 -03:00
cf24b57d8f
perplayer
2019-11-18 15:12:55 -03:00
5c55c86dd2
invert conditional
2019-11-18 15:06:07 -03:00
85f1b847e9
LF_WARNINGTITLE
2019-11-18 15:04:40 -03:00
444953d0bb
oh sh
2019-11-18 14:32:34 -03:00
6920d20a0f
map header option
2019-11-18 14:08:47 -03:00
e40bf85a6f
lua
2019-11-18 13:50:44 -03:00
4ea3513076
Organize
2019-11-18 12:56:41 -03:00
9d17614c55
arg
2019-11-18 11:42:45 -03:00
6c98dde736
stuff
2019-11-18 11:39:54 -03:00
8a7b3d7022
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-17 23:57:18 -03:00
b4987636fe
Add missing checks for PF_FINISHED in HUD code
2019-11-18 03:27:39 +01:00
5dc494da16
Mapname lowercase support ( #146 )
...
* Moved levelname parsing to before where uppercase conversion occurs.
* Extended titlecard font range.
* Replaced misc. "ZONE" strings with "Zone" for titlecard purposes.
* Don't convert to uppercase when rendering the titlecard name.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-11-16 20:36:25 -05:00
14477748be
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
d8ad0b4eaa
STOP THE CLOCK linedef exectutor!
...
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.
Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
fc22d1adc3
* Restart Metal recording from beginning if retry is used.
...
* Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot).
* Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
Jaime Passos