Small fixes
This commit is contained in:
parent
46ebf18234
commit
301959d0ae
3 changed files with 216 additions and 2 deletions
|
|
@ -36,8 +36,6 @@
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<StackReserveSize>4194304</StackReserveSize>
|
<StackReserveSize>4194304</StackReserveSize>
|
||||||
<AdditionalDependencies>assimp$(LibExt);libxml2$(LibExt);libpng$(LibExt);zlib$(LibExt);ws2_32.lib;bcrypt.lib;libjpeg-turbo$(LibExt);%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>assimp$(LibExt);libxml2$(LibExt);libpng$(LibExt);zlib$(LibExt);ws2_32.lib;bcrypt.lib;libjpeg-turbo$(LibExt);%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories Condition="'$(BuildType)'=='Release'">$(ProjectRoot)build\$(Platform)\Release QC\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalLibraryDirectories Condition="'$(BuildType)'=='Debug'">$(ProjectRoot)build\$(Platform)\Debug QC\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,9 @@
|
||||||
<ProjectReference Include="zlib.vcxproj">
|
<ProjectReference Include="zlib.vcxproj">
|
||||||
<Project>{e1a0a3b1-2001-4001-8001-000000000001}</Project>
|
<Project>{e1a0a3b1-2001-4001-8001-000000000001}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="libjpeg-turbo.vcxproj">
|
||||||
|
<Project>{e1a0a3b1-2001-4001-8001-000000000006}</Project>
|
||||||
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
213
workdir/baseq3/maps/qqq.map
Normal file
213
workdir/baseq3/maps/qqq.map
Normal file
|
|
@ -0,0 +1,213 @@
|
||||||
|
|
||||||
|
//@$& layerdef "0" -1 0 0 0
|
||||||
|
// entity 0
|
||||||
|
{
|
||||||
|
"classname" "worldspawn"
|
||||||
|
// brush 0
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 1024 480 576 ) ( 1024 -544 576 ) ( -768 480 576 ) ( ( 0.0416666679 0 0 ) ( 0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( 1024 320 192 ) ( -768 320 192 ) ( 1024 320 128 ) ( ( 0.0416666679 0 0 ) ( 0 0.0416666679 0.3333334923 ) ) common/caulk 0 0 0
|
||||||
|
( 768 512 192 ) ( 768 512 128 ) ( 768 -512 192 ) ( ( 0.0416666679 0 0 ) ( 0 0.0416666679 0.3333334923 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -320 128 ) ( -768 -320 192 ) ( 1024 -320 128 ) ( ( 0.0416666679 0 0 ) ( 0 0.0416666679 0.3333334923 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 128 ) ( -768 512 128 ) ( -768 -512 192 ) ( ( 0.0416666679 0 0 ) ( 0 0.0416666679 0.3333334923 ) ) common/caulk 0 0 0
|
||||||
|
( -768 512 512 ) ( 1024 -512 512 ) ( 1024 512 512 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 1
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 1024 384 64 ) ( -768 384 64 ) ( 1024 384 0 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( 768 512 64 ) ( 768 512 0 ) ( 768 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 -64 ) ( 1024 -512 -64 ) ( -768 512 -64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 0 ) ( -768 512 0 ) ( -768 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( 1024 320 128 ) ( -768 320 192 ) ( 1024 320 192 ) ( ( 0.0052083335 0 -0 ) ( -0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 832 0 512 ) ( 832 96 512 ) ( 928 0 512 ) ( ( 0.125 0 -0 ) ( -0 0.125 0 ) ) common/caulk 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 2
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 1024 320 192 ) ( -768 320 192 ) ( 1024 320 128 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( 832 512 64 ) ( 832 512 0 ) ( 832 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 -64 ) ( 1024 -512 -64 ) ( -768 512 -64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -320 128 ) ( -768 -320 192 ) ( 1024 -320 128 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( 768 -512 64 ) ( 768 512 0 ) ( 768 512 64 ) ( ( 0.0052083335 0 -0 ) ( -0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 832 0 512 ) ( 832 96 512 ) ( 928 0 512 ) ( ( 0.125 0 -0 ) ( -0 0.125 0 ) ) common/caulk 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 3
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 1024 320 64 ) ( -768 320 64 ) ( 1024 320 0 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( 768 512 64 ) ( 768 512 0 ) ( 768 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 -96 ) ( 1024 -512 -96 ) ( -768 512 -96 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -320 0 ) ( -768 -320 64 ) ( 1024 -320 0 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 0 ) ( -768 512 0 ) ( -768 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 512 -64 ) ( 1024 -512 -64 ) ( -768 -512 -64 ) ( ( 0.0052083335 0 -0 ) ( -0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 4
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 768 512 64 ) ( 768 512 0 ) ( 768 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 -64 ) ( 1024 -512 -64 ) ( -768 512 -64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -384 0 ) ( -768 -384 64 ) ( 1024 -384 0 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 0 ) ( -768 512 0 ) ( -768 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( 1024 -320 128 ) ( -768 -320 192 ) ( -768 -320 128 ) ( ( 0.0052083335 0 -0 ) ( -0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 832 0 512 ) ( 832 96 512 ) ( 928 0 512 ) ( ( 0.125 0 -0 ) ( -0 0.125 0 ) ) common/caulk 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 5
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 1024 320 192 ) ( -768 320 192 ) ( 1024 320 128 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 -64 ) ( 1024 -512 -64 ) ( -768 512 -64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -320 128 ) ( -768 -320 192 ) ( 1024 -320 128 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -832 -512 0 ) ( -832 512 0 ) ( -832 -512 64 ) ( ( 0.0416666679 0 -0 ) ( -0 0.0416666679 0 ) ) common/caulk 0 0 0
|
||||||
|
( -768 -512 64 ) ( -768 512 0 ) ( -768 -512 0 ) ( ( 0.0052083335 0 -0 ) ( -0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 832 0 512 ) ( 832 96 512 ) ( 928 0 512 ) ( ( 0.125 0 -0 ) ( -0 0.125 0 ) ) common/caulk 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 6
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( -448 288 64 ) ( -448 -32 64 ) ( -480 288 64 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 0.3333333433 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -448 320 512 ) ( -480 320 512 ) ( -448 320 -64 ) ( ( 0.0052083335 0 -0.3333333433 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -448 320 512 ) ( -448 320 -64 ) ( -448 0 512 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -480 0 -64 ) ( -448 0 -64 ) ( -480 320 -64 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 -0.3333333433 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -480 0 -64 ) ( -480 0 512 ) ( -448 0 -64 ) ( ( 0.0052083335 0 0.3333333433 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -480 0 -64 ) ( -480 320 -64 ) ( -480 0 512 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 7
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( -128 -32 192 ) ( -128 -352 192 ) ( -160 -32 192 ) ( ( 0.0052083335 0 0.6666667461 ) ( 0 0.0052083335 -0.3333334029 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -128 0 640 ) ( -160 0 640 ) ( -128 0 64 ) ( ( 0.0052083335 0 0.3333334029 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -128 0 512 ) ( -128 0 -64 ) ( -128 -320 512 ) ( ( 0.0052083335 0 0.6666667461 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -160 -320 -64 ) ( -128 -320 -64 ) ( -160 0 -64 ) ( ( 0.0052083335 0 0.6666667461 ) ( 0 0.0052083335 0.3333334029 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -160 -320 -64 ) ( -160 -320 512 ) ( -128 -320 -64 ) ( ( 0.0052083335 0 -0.3333334029 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( -160 -320 -64 ) ( -160 0 -64 ) ( -160 -320 512 ) ( ( 0.0052083335 0 -0.6666667461 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 8
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 192 288 192 ) ( 192 -32 192 ) ( 160 288 192 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 -0.0000001192 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 192 320 512 ) ( 160 320 512 ) ( 192 320 -64 ) ( ( 0.0052083335 0 0.0000001192 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 192 320 512 ) ( 192 320 -64 ) ( 192 0 512 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 160 0 -64 ) ( 192 0 -64 ) ( 160 320 -64 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 0.0000001192 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 160 0 64 ) ( 160 0 640 ) ( 192 0 64 ) ( ( 0.0052083335 0 -0.0000001192 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 160 0 -64 ) ( 160 320 -64 ) ( 160 0 512 ) ( ( 0.0052083335 0 0 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// brush 9
|
||||||
|
{
|
||||||
|
brushDef
|
||||||
|
{
|
||||||
|
( 512 -32 64 ) ( 512 -352 64 ) ( 480 -32 64 ) ( ( 0.0052083335 0 0.6666667461 ) ( 0 0.0052083335 -0.6666668653 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 512 0 512 ) ( 480 0 512 ) ( 512 0 -64 ) ( ( 0.0052083335 0 0.6666668653 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 512 0 512 ) ( 512 0 -64 ) ( 512 -320 512 ) ( ( 0.0052083335 0 0.6666667461 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 480 -320 -64 ) ( 512 -320 -64 ) ( 480 0 -64 ) ( ( 0.0052083335 0 0.6666667461 ) ( 0 0.0052083335 0.6666668653 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 480 -320 -64 ) ( 480 -320 512 ) ( 512 -320 -64 ) ( ( 0.0052083335 0 -0.6666668653 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
( 480 -320 -64 ) ( 480 0 -64 ) ( 480 -320 512 ) ( ( 0.0052083335 0 -0.6666667461 ) ( 0 0.0052083335 0 ) ) gothic_floor/largerblock3b2 0 0 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// entity 1
|
||||||
|
{
|
||||||
|
"classname" "info_player_deathmatch"
|
||||||
|
"origin" "-704 0 -40"
|
||||||
|
}
|
||||||
|
// entity 2
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "-624 160 -48"
|
||||||
|
"light" "135"
|
||||||
|
"_color" "1 .9 .8"
|
||||||
|
}
|
||||||
|
// entity 3
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "-288 -192 -16"
|
||||||
|
"light" "250"
|
||||||
|
"_color" ".6 1 .7"
|
||||||
|
}
|
||||||
|
// entity 4
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "80 -224 -16"
|
||||||
|
"light" "135"
|
||||||
|
"_color" "1 .5 .7"
|
||||||
|
}
|
||||||
|
// entity 5
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "400 -128 -16"
|
||||||
|
"light" "135"
|
||||||
|
"_color" "1 .3 .8"
|
||||||
|
}
|
||||||
|
// entity 6
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "16 128 -32"
|
||||||
|
"light" "135"
|
||||||
|
}
|
||||||
|
// entity 7
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "400 192 0"
|
||||||
|
"light" "150"
|
||||||
|
"_color" ".5 .85 1"
|
||||||
|
}
|
||||||
|
// entity 8
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "688 32 32"
|
||||||
|
"light" "75"
|
||||||
|
"_color" ".3 .5 1"
|
||||||
|
}
|
||||||
|
// entity 9
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "720 -224 0"
|
||||||
|
"light" "250"
|
||||||
|
"_color" ".85 .8 .6"
|
||||||
|
}
|
||||||
|
// entity 10
|
||||||
|
{
|
||||||
|
"classname" "weapon_rocketlauncher"
|
||||||
|
"origin" "-288 0 -32"
|
||||||
|
}
|
||||||
|
// entity 11
|
||||||
|
{
|
||||||
|
"classname" "item_armor_body"
|
||||||
|
"origin" "352 0 -32"
|
||||||
|
}
|
||||||
|
// entity 12
|
||||||
|
{
|
||||||
|
"classname" "item_health_large"
|
||||||
|
"origin" "-288 256 -32"
|
||||||
|
}
|
||||||
|
// entity 13
|
||||||
|
{
|
||||||
|
"classname" "item_health"
|
||||||
|
"origin" "288 -256 -32"
|
||||||
|
}
|
||||||
|
// entity 14
|
||||||
|
{
|
||||||
|
"classname" "light"
|
||||||
|
"origin" "384 0 448"
|
||||||
|
"light" "300"
|
||||||
|
"_color" "1 .5 .65"
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue