Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added assets/gfx/2d/crosshaira.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshairb.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshairc.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshaird.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshaire.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshairf.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshairg.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshairh.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshairi.tga
Binary file not shown.
Binary file added assets/gfx/2d/crosshairj.tga
Binary file not shown.
90 changes: 90 additions & 0 deletions assets/scripts/crosshair.shader
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
gfx/2d/crosshaira
{
nopicmip
{
map gfx/2d/crosshaira.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshairb
{
nopicmip
{
map gfx/2d/crosshairb.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshairc
{
nopicmip
{
map gfx/2d/crosshairc.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshaird
{
nopicmip
{
map gfx/2d/crosshaird.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshaire
{
nopicmip
{
map gfx/2d/crosshaire.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshairf
{
nopicmip
{
map gfx/2d/crosshairf.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshairg
{
nopicmip
{
map gfx/2d/crosshairg.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshairh
{
nopicmip
{
map gfx/2d/crosshairh.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshairi
{
nopicmip
{
map gfx/2d/crosshairi.tga
blendFunc BLEND
rgbGen exactVertex
}
}
gfx/2d/crosshairj
{
nopicmip
{
map gfx/2d/crosshairj.tga
blendFunc BLEND
rgbGen exactVertex
}
}
Empty file modified build/linux-qvm/tools/q3asm
100644 → 100755
Empty file.
Empty file modified build/linux-qvm/tools/q3cpp
100644 → 100755
Empty file.
Empty file modified build/linux-qvm/tools/q3lcc
100644 → 100755
Empty file.
Empty file modified build/linux-qvm/tools/q3rcc
100644 → 100755
Empty file.
15 changes: 10 additions & 5 deletions build/win32-msvc/baseq3e.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{FF0DC79F-C1D1-4DE3-BBD0-91B6146FD69C}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34622.214
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcxproj", "{FF0DC79F-C1D1-4DE3-BBD0-91B6146FD69C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{25F3B624-E060-4DAD-93D6-479AB6CD782F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcxproj", "{25F3B624-E060-4DAD-93D6-479AB6CD782F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui.vcproj", "{96D17D51-0760-4732-89C1-26DFD5B581BF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui.vcxproj", "{96D17D51-0760-4732-89C1-26DFD5B581BF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -43,4 +45,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1C55EC9F-CEA6-492E-8CBD-D086B4777FAF}
EndGlobalSection
EndGlobal
205 changes: 205 additions & 0 deletions build/win32-msvc/cgame.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
<ProjectGuid>{FF0DC79F-C1D1-4DE3-BBD0-91B6146FD69C}</ProjectGuid>
<RootNamespace>cgame</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\$(Platform)\$(Configuration)\</OutDir>
<IntDir>.\$(Platform)\$(Configuration)_$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<TargetName>$(ProjectName)$(ARCHL)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\$(Platform)\$(Configuration)\</OutDir>
<IntDir>.\$(Platform)\$(Configuration)_$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<TargetName>$(ProjectName)$(ARCHL)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>.\$(Platform)\$(Configuration)\</OutDir>
<IntDir>.\$(Platform)\$(Configuration)_$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)cgamex86.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>copy $(ProjectDir)$(ARCH)\$(Configuration)\$(TargetName)$(TargetExt) "$(QUAKE3DIR)\$(MODDIR)"
copy $(ProjectDir)$(ARCH)\$(Configuration)\$(TargetName).pdb "$(QUAKE3DIR)\$(MODDIR)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<OutputFile>$(OutDir)cgamex86.dll</OutputFile>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)cgamex86_64.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
<Command>copy $(ProjectDir)$(ARCH)\$(Configuration)\$(TargetName)$(TargetExt) "$(QUAKE3DIR)\$(MODDIR)"
copy $(ProjectDir)$(ARCH)\$(Configuration)\$(TargetName).pdb "$(QUAKE3DIR)\$(MODDIR)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<OutputFile>$(OutDir)cgamex86_64.dll</OutputFile>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\code\cgame\cg_consolecmds.c" />
<ClCompile Include="..\..\code\cgame\cg_draw.c" />
<ClCompile Include="..\..\code\cgame\cg_drawtools.c" />
<ClCompile Include="..\..\code\cgame\cg_effects.c" />
<ClCompile Include="..\..\code\cgame\cg_ents.c" />
<ClCompile Include="..\..\code\cgame\cg_event.c" />
<ClCompile Include="..\..\code\cgame\cg_info.c" />
<ClCompile Include="..\..\code\cgame\cg_localents.c" />
<ClCompile Include="..\..\code\cgame\cg_main.c" />
<ClCompile Include="..\..\code\cgame\cg_marks.c" />
<ClCompile Include="..\..\code\cgame\cg_players.c" />
<ClCompile Include="..\..\code\cgame\cg_playerstate.c" />
<ClCompile Include="..\..\code\cgame\cg_predict.c" />
<ClCompile Include="..\..\code\cgame\cg_scoreboard.c" />
<ClCompile Include="..\..\code\cgame\cg_servercmds.c" />
<ClCompile Include="..\..\code\cgame\cg_snapshot.c" />
<ClCompile Include="..\..\code\cgame\cg_syscalls.c" />
<ClCompile Include="..\..\code\cgame\cg_view.c" />
<ClCompile Include="..\..\code\cgame\cg_weapons.c" />
<ClCompile Include="..\..\code\game\bg_lib.c" />
<ClCompile Include="..\..\code\game\bg_misc.c" />
<ClCompile Include="..\..\code\game\bg_pmove.c" />
<ClCompile Include="..\..\code\game\bg_slidemove.c" />
<ClCompile Include="..\..\code\game\q_math.c" />
<ClCompile Include="..\..\code\game\q_shared.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\code\cgame\cg_local.h" />
<ClInclude Include="..\..\code\cgame\cg_public.h" />
<ClInclude Include="..\..\code\cgame\tr_types.h" />
<ClInclude Include="..\..\code\game\bg_lib.h" />
<ClInclude Include="..\..\code\game\bg_local.h" />
<ClInclude Include="..\..\code\game\bg_public.h" />
<ClInclude Include="..\..\code\game\match.h" />
<ClInclude Include="..\..\code\game\q_shared.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\code\cgame\cgame.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading