Jaime Passos
58c1adf3ef
ST_drawLivesArea stuff.
2019-12-27 16:58:55 -03:00
Jaime Passos
be32397562
Respawn delay gametype rule
2019-12-27 01:44:27 -03:00
Jaime Passos
31eeb90056
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
James R
248e452d7d
Merge branch 'titlecard2' into 'next'
...
More customisable title card
See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
Jaime Passos
c6dd9f016e
Title card fixes.
2019-12-24 16:22:25 -03:00
Jaime Passos
ad317cd8a2
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
Jaime Passos
35f783ab24
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 20:12:52 -03:00
Jaime Passos
dcc8cdc143
Ringslinger tweaks
2019-12-18 19:26:45 -03:00
Jaime Passos
8f4ea4a11e
More spectator tweaks
2019-12-18 15:14:24 -03:00
Jaime Passos
164c1b15e7
Spectator HUD tweaks
2019-12-18 12:28:01 -03:00
Jaime Passos
789e881abc
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
Jaime Passos
448494e19b
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
Jaime Passos
607d066c01
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
Tatsuru
06f02e81dd
Let Lua toggle Match/CTF team scores HUD element
2019-12-16 17:58:00 -03:00
MascaraSnake
fffd385151
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
0fa1525749
Remove unnecessary function parameters from title card code
2019-12-05 01:58:19 -03:00
toaster
0f287c9b30
Actually, wait; this is way better and cleaner.
2019-11-29 20:41:13 +00:00
toaster
2aafcf9e5b
Match final countdown timer to timer ( resolves #400 ).
2019-11-29 20:35:59 +00:00
toaster
937cd7688a
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
Jaime Passos
2527e85108
fix showfps with st_translucency
2019-11-23 18:41:28 -03:00
Jaime Passos
bb3958d463
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
toaster
9aeed5f146
Fix the coords of the subtitle.
2019-11-19 12:59:01 +00:00
Jaime Passos
9939e1f775
change vertical alignment
2019-11-18 21:45:30 -03:00
Jaime Passos
51e4153ec0
fix subttl
2019-11-18 21:44:02 -03:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
e30d85e265
adjust duration
2019-11-18 19:08:04 -03:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
Jaime Passos
8ce00492c2
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
MascaraSnake
abdfc2d237
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
Jaime Passos
649d040cfe
restore zigzags
2019-11-18 15:32:48 -03:00
Jaime Passos
0f9aa2fcb0
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
Jaime Passos
1f9dc8aaa1
missing prototype
2019-11-18 15:13:31 -03:00
Jaime Passos
e3ad4f5731
perplayer
2019-11-18 15:12:55 -03:00
Jaime Passos
8005112879
invert conditional
2019-11-18 15:06:07 -03:00
Jaime Passos
bb8b49b738
LF_WARNINGTITLE
2019-11-18 15:04:40 -03:00
Jaime Passos
a644fe6e77
oh sh
2019-11-18 14:32:34 -03:00
Jaime Passos
75468a1d5d
map header option
2019-11-18 14:08:47 -03:00
Jaime Passos
23a5801a09
lua
2019-11-18 13:50:44 -03:00
Jaime Passos
8ad20c1108
Organize
2019-11-18 12:56:41 -03:00
Jaime Passos
7bd19aaed1
arg
2019-11-18 11:42:45 -03:00
Jaime Passos
f37e0de8c5
stuff
2019-11-18 11:39:54 -03:00
Jaime Passos
53c1914501
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-17 23:57:18 -03:00
Louis-Antoine
738bfdf99b
Add missing checks for PF_FINISHED in HUD code
2019-11-18 03:27:39 +01:00
Nev3r
e3e93016cd
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
MascaraSnake
aeedb86d8c
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
toaster
2663c79d21
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
toaster
50b92afc4e
* 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
Steel Titanium
2aa72aa2d4
Merge branch 'master' into newmenus
2019-10-13 20:12:48 -04:00
toaster
ce85daeaca
Hide NiGHTS grade in singleplayer if ranking is below GRADE_A, on Rob's request.
...
(Resolves #250 )
2019-10-13 16:30:29 +01:00
