Commit graph

96 commits

Author SHA1 Message Date
Eidolon
be021baa02 Add extern "C" in C++ to all headers 2022-12-30 19:26:16 -06:00
James R
b5310a1f68 Add typedef.h
All typedefs for structs that were present in other header
files have been moved to here. (Except node_t because the
renderer and netcode both define node_t LOL.)
2022-11-27 17:21:40 -08:00
toaster
37214c32dd Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into chat-flood-fix
# Conflicts:
#	src/hu_stuff.c
2022-09-26 12:56:50 +01:00
AJ Martinez
e242207d10 Mindelay: Oni suggestions rollup 2022-09-20 19:01:54 -07:00
LJ Sonic
5d406375a8 Cleanup and fix chat deleting and pasting
# Conflicts:
#	src/hu_stuff.c
#	src/hu_stuff.h
2022-09-05 16:38:19 +01:00
SinnamonLat
d5e9283c2e Allow selecting profile with no changes to speed up charsel process 2022-07-20 19:35:51 +02:00
toaster
48d451cfef Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus
# Conflicts:
#	src/d_ticcmd.h
#	src/deh_soc.c
#	src/deh_soc.h
#	src/deh_tables.c
#	src/dehacked.c
#	src/f_finale.c
#	src/g_game.c
#	src/m_menu.c
2022-05-21 18:57:46 +01:00
toaster
884064049e * Allocate the "MISSING" patch only once, statically, at first boot via missingpat, and prevent it from being freed.
* Rework HU_UpdatePatch to HU_UpdateOrBlankPatch with a "required" boolean.
    * If desired graphic is not present in resources:
        * If required is true, return `missingpat`.
        * If false, return NULL as before (font compatibility).
    * Add an alias with the previous function signature, so you don't need to add a million `true`s everywhere.
* Remove a ton of irrelevant graphics the game attempts to cache only because of code inherited from vanilla SRB2.
* Remove the unused hudinfo system, also inherited from vanilla SRB2.
2022-05-14 14:56:02 +01:00
SinnamonLat
5801d67706 Add profile # and player name on the card 2022-02-20 15:23:08 +01:00
James R
8de36a9ab0 Load titlecard font with font system 2021-12-17 02:41:34 -08:00
James R
8012d00684 Add HU_UpdatePatch, recaches patch only if it exists in pwad 2021-12-17 01:07:54 -08:00
toaster
b4af07ffed Merge branch 'master' into new-menus
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/v_video.c
#	src/y_inter.c
2021-10-18 01:18:37 +01:00
Latapostrophe
f2f0a6cbe2 New titlecards 2021-04-30 18:11:36 +02:00
James R
dd5223f4d7 Draw an icon above players when they are typing in chat or console
A little speech bubble is drawn, with dots cycling as they type.
No typing = no dots.
2021-02-16 09:24:22 -08:00
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
Sally Coolatta
1500d682d2 hu_stuff & y_inter 2020-08-14 01:06:55 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
3ebc8517be Merge hu_stuff.c/h 2020-08-06 10:52:00 -04:00
Sally Coolatta
d27f16c4d5 A bunch of easy files (1-5 conflicts)
g_state.h, hu_stuff.h, lua_hud.h, m_misc.h, p_polyobj.c, p_telept.c, r_draw.c, r_draw8.c, r_sky.c
2020-08-05 14:34:17 -04:00
Sally Coolatta
3e36e15628 Merge master 2020-06-08 00:52:37 -04:00
Sally Coolatta
120dc253af Merge remote-tracking branch 'origin/iwantmychat' into nametags 2020-06-03 20:19:26 -04:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
sphere
21130dfbb0 Support act numbers up to 99 and draw both digits individually. 2020-05-12 17:17:24 +02:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
James R
26794eef46 Draw mini ping counter in splitscreen 2020-03-18 19:42:13 -07:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
MascaraSnake
59af56480e Merge branch 'titlecard-lowercase-support' into 'master'
Lowercase support in titlecards

See merge request STJr/SRB2Internal!481
2019-11-18 15:05:02 -05:00
James R
51a2b76970 Snapping for showping, so it doesn't jump way up on non-green 2019-11-17 18:52:05 -08:00
Steel Titanium
b1f39e836d Better ping implementation. 2019-11-17 20:22:47 -05: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
Steel Titanium
61ada17da1 Basic outline color support.
This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.
2019-10-10 02:00:52 -04:00
Steel Titanium
43cd0e5dd0 WIP: New character select name font 2019-10-09 00:28:01 -04:00
TehRealSalt
67e63442da Start on Cup/Level selects 2019-10-04 00:18:34 -04:00
TehRealSalt
dae7dd003a More complete character select 2019-10-02 19:13:56 -04:00
TehRealSalt
f188c290e5 Start on new menus 2019-08-09 04:25:22 -04:00
James R
0b0b7c480b Set up with the font system 2019-06-03 14:57:05 -07:00
fickleheart
c21072ec29 Show music credit for credits 2019-03-31 13:09:49 -05:00
wolfy852
733c472e1f Reorganization + kill old interfaces 2019-02-19 18:52:57 -06:00
wolfy852
5172deb345 Fix compiler warnings 2019-02-16 08:32:14 -06:00
wolfy852
db280e64a1 New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
wolfy852
ba9a6853d2 Fix the chat being incorrectly placed in splitscreen 2019-01-11 16:04:12 -06:00
wolfy852
5838c6cae8 Don't check splitscreen in OLDCHAT 2019-01-10 13:52:58 -06:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
Digiku
be931de113 Merge branch '2122-patch-dta-update' into '2122-version'
Changes related to 2.1.22 patch.dta update

See merge request STJr/SRB2!417
2018-12-23 18:08:38 -05:00
mazmazz
7906f8dcf8 Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 23:20:01 -05:00
mazmazz
fb78d462c6 Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"
This reverts commit 6806c6b175.
2018-12-22 22:40:58 -05:00
mazmazz
6806c6b175 Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 21:48:24 -05:00
mazmazz
0726a118dd Correct splitscreen check in OLDCHAT 2018-12-22 21:30:39 -05:00