Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a66d43c
Sprays - Initial commit
nullsystem Sep 28, 2024
206a74e
Fix windows compile, possible fix for sprays not showing?
nullsystem Oct 27, 2024
2c9de26
Refactored to NeoUtils, VTF copy/remake
nullsystem Oct 28, 2024
ef6e50b
Improve NeoUI settings on sprays, partial image render
nullsystem Oct 28, 2024
32fb412
spray picker, NeoUI ButtonTexture, limit decal enforce to local
nullsystem Oct 30, 2024
0d03c16
NeoUI - Expand to png/jpg/vtf direct, fix scroll
nullsystem Oct 30, 2024
7b7fcef
NeoUI Texture func, correct ratio + center image
nullsystem Oct 30, 2024
4eb5b2c
Spray - Output to both spray.vtf and custom name's vtf
nullsystem Oct 31, 2024
8bfa08d
Expand to using DXT5 if there's alpha value
nullsystem Oct 31, 2024
73689cb
Merge branch 'master' into GH-602_Sprays3
nullsystem Dec 14, 2024
78a7b98
Reorder the multiplayer settings arrangements
nullsystem Dec 14, 2024
0576863
Merge branch 'master' into GH-602_Sprays3
nullsystem Dec 14, 2024
ddebab0
Save scroll values for more sub-states
nullsystem Dec 14, 2024
3e8f052
Merge remote-tracking branch 'upstream/master' into GH-602_Sprays3
nullsystem Feb 8, 2025
5b7b81e
Merge remote-tracking branch 'upstream/master' into GH-602_Sprays3
nullsystem Feb 13, 2025
1695688
github comments changes
nullsystem Feb 17, 2025
2249333
Spray deleter
nullsystem Feb 17, 2025
fbaeddd
Merge remote-tracking branch 'upstream/master' into GH-602_Sprays3
nullsystem Feb 17, 2025
950dcfa
Fix crash on not having font set
nullsystem Feb 17, 2025
fd5209e
Merge branch 'master' into GH-602_Sprays3
nullsystem Mar 9, 2025
7f374d6
sv_neo_spraydisable
nullsystem Mar 9, 2025
23e7bd8
Merge branch 'master' into GH-602_Sprays3
nullsystem Mar 9, 2025
71b1cbc
Texture on vtf itself, display no spray applied label
nullsystem Mar 10, 2025
510788a
fix some stuff
nullsystem Mar 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/game/client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ target_include_directories(client
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons
${CMAKE_SOURCE_DIR}/public
${CMAKE_SOURCE_DIR}/thirdparty/sixensesdk/include
${CMAKE_SOURCE_DIR}/vendor
${CMAKE_SOURCE_DIR}/game/client/NextBot
game_controls
hl2
Expand Down Expand Up @@ -1510,6 +1511,16 @@ target_sources_grouped(
neo/c_neo_bloom_controller.cpp
)

target_sources_grouped(
TARGET client
NAME "Source Files\\NEO_Vendor"
FILES
neo/vendor_impl.cpp
${CMAKE_SOURCE_DIR}/vendor/stb_image.h
${CMAKE_SOURCE_DIR}/vendor/stb_image_resize2.h
${CMAKE_SOURCE_DIR}/vendor/stb_dxt.h
)

target_sources_grouped(
TARGET client
NAME "Source Files\\NEO\\Game_Controls"
Expand Down Expand Up @@ -1545,6 +1556,8 @@ target_sources_grouped(
neo/ui/neo_loading.h
neo/ui/neo_ui.cpp
neo/ui/neo_ui.h
neo/ui/neo_utils.cpp
neo/ui/neo_utils.h
neo/ui/IOverrideInterface.h
neo/ui/OverrideInterface.cpp
neo/ui/neo_hud_ammo.cpp
Expand Down
31 changes: 30 additions & 1 deletion src/game/client/c_te_playerdecal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ static ConVar cl_spraydisable( "cl_spraydisable", "1", FCVAR_CLIENTDLL | FCVAR_A
static ConVar cl_spraydisable( "cl_spraydisable", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE, "Disable player sprays." );
#endif

#ifdef NEO
extern ConVar sv_neo_spraydisable;
#endif

#ifndef _XBOX
CLIENTEFFECT_REGISTER_BEGIN( PrecachePlayerDecal )
CLIENTEFFECT_MATERIAL( "decals/playerlogo01" )
Expand Down Expand Up @@ -178,11 +182,29 @@ IMaterial *CreateTempMaterialForPlayerLogo( int iPlayerIndex, player_info_t *inf

if ( !filesystem->FileExists( fulltexname ) )
{
#ifdef NEO
if (engine->GetLocalPlayer() == iPlayerIndex)
{
// NEO NOTE (nullsystem): Limit copying spray.vtf over for local player
engine->CopyLocalFile("materials/vgui/logos/spray.vtf", fulltexname);
}
#endif

char custname[ 512 ];
Q_snprintf( custname, sizeof( custname ), "download/user_custom/%c%c/%s.dat", logohex[0], logohex[1], logohex );
// it may have been downloaded but not copied under materials folder
if ( !filesystem->FileExists( custname ) )
if (!filesystem->FileExists(custname))
{
#ifdef NEO
if (engine->GetLocalPlayer() != iPlayerIndex ||
!engine->CopyLocalFile(fulltexname, custname))
{
return nullptr;
}
#else
return NULL; // not downloaded yet
#endif
}

// copy from download folder to materials/temp folder
// this is done since material system can access only materials/*.vtf files
Expand All @@ -208,6 +230,13 @@ void TE_PlayerDecal( IRecipientFilter& filter, float delay,
if ( cl_spraydisable.GetBool() )
return;

#ifdef NEO
if (sv_neo_spraydisable.GetBool())
{
return;
}
#endif

// No valid target?
C_BaseEntity *ent = cl_entitylist->GetEnt( entity );
if ( !ent )
Expand Down
Loading