334ad93c56
Fix splitscreen Title Card act name regression
...
This fixes act names not being shown on player 2's view
2020-05-11 19:57:20 +02:00
b8d40a5783
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
380b2f87bb
Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye
2020-02-19 17:47:13 -03:00
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
19cdb002ab
More fixes for titlecard option stuff
2020-02-09 17:53:50 -06:00
1774ba22b6
Fix title card not showing up at all if focus lost
2020-01-26 23:50:36 -03:00
db22d503a4
HUD visual indicator + property fix
2020-01-19 21:55:08 -03:00
e9a8c2d21a
No more losing lives when finished
2020-01-19 14:30:05 -03:00
cbbc76b673
Fix snapping of extra multiplayer text. ( Resolves #101 )
2020-01-10 12:50:58 +00:00
f8a3e3b898
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
423d1af48d
I see trees of green
2020-01-03 16:39:39 -03:00
5568e445ed
Colored title cards
2020-01-03 16:21:08 -03:00
9931f0d58f
Merge branch 'thiccnames' into 'next'
...
Allow 6-letter character names to be drawn with the thick font
See merge request STJr/SRB2!618
2020-01-01 21:49:13 -05:00
dc7f10e17d
Allow 6-letter character names to be drawn with the thick font
2020-01-01 23:49:29 +08:00
b22de48c03
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
181a366d4a
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 18:39:31 -03:00
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
c3d14064e2
Convert simple movement to directionchar+analog
...
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
2019-12-30 15:05:24 -06:00
4b604328d5
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
2019-12-28 19:47:03 -03:00
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
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -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
Zwip-Zwap Zapony