Skip to content

Commit

Permalink
moved taco button to below the top menu bar
Browse files Browse the repository at this point in the history
  • Loading branch information
@BoyC
BoyC committed Aug 31, 2023
1 parent 48dbcc5 commit 023c432
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 16 deletions.
4 changes: 4 additions & 0 deletions Bedrock/BaseLib/BaseLib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -152,6 +153,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MultiByte|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -177,6 +179,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -191,6 +194,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MultiByte|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand Down
4 changes: 4 additions & 0 deletions Bedrock/CoRE2/CoRE2.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -168,6 +169,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MultiByte|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -193,6 +195,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -207,6 +210,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MultiByte|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand Down
4 changes: 4 additions & 0 deletions Bedrock/UtilLib/UtilLib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -96,6 +97,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MultiByte|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -121,6 +123,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand All @@ -135,6 +138,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MultiByte|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Expand Down
4 changes: 4 additions & 0 deletions Bedrock/Whiteboard/WhiteBoard.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,26 +93,30 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MultiByte|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MultiByte|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
6 changes: 4 additions & 2 deletions BuildCount.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
//Automatically generated build count file. DO NOT EDIT MANUALLY!

#define BUILD_COUNT_ANUBIS 91
#define BUILD_COUNT_DESKTOP_6P0HR5T 1
#define BUILD_COUNT_DESKTOP_EDTCHAL 3607

#define RELEASE_COUNT_ANUBIS 0
#define RELEASE_COUNT_DESKTOP_6P0HR5T 0
#define RELEASE_COUNT_DESKTOP_EDTCHAL 65

#define BUILDCOUNT (BUILD_COUNT_ANUBIS+BUILD_COUNT_DESKTOP_EDTCHAL)
#define RELEASECOUNT (RELEASE_COUNT_ANUBIS+RELEASE_COUNT_DESKTOP_EDTCHAL)
#define BUILDCOUNT (BUILD_COUNT_ANUBIS+BUILD_COUNT_DESKTOP_6P0HR5T+BUILD_COUNT_DESKTOP_EDTCHAL)
#define RELEASECOUNT (RELEASE_COUNT_ANUBIS+RELEASE_COUNT_DESKTOP_6P0HR5T+RELEASE_COUNT_DESKTOP_EDTCHAL)
8 changes: 8 additions & 0 deletions GW2Overlay.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
Expand All @@ -58,6 +59,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
Expand All @@ -71,6 +73,7 @@
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
Expand All @@ -85,6 +88,7 @@
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
Expand Down Expand Up @@ -389,6 +393,10 @@
</ItemGroup>
<ItemGroup>
<None Include="UI.css" />
<None Include="UI_large.css" />
<None Include="UI_larger.css" />
<None Include="UI_normal.css" />
<None Include="UI_small.css" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="GW2TacO.rc" />
Expand Down
23 changes: 21 additions & 2 deletions GW2Overlay.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="UI">
<UniqueIdentifier>{920c2207-a445-40a3-9cea-0d126e9d49a3}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="GW2TacO.cpp">
Expand Down Expand Up @@ -203,14 +206,30 @@
</ItemGroup>
<ItemGroup>
<Xml Include="poidata.xml" />
<Xml Include="UI.xml" />
<Xml Include="maptimer.xml" />
<Xml Include="TacO_Language_cn.xml">
<Filter>Resource Files</Filter>
</Xml>
<Xml Include="UI.xml">
<Filter>UI</Filter>
</Xml>
</ItemGroup>
<ItemGroup>
<None Include="UI.css" />
<None Include="UI_large.css">
<Filter>UI</Filter>
</None>
<None Include="UI_larger.css">
<Filter>UI</Filter>
</None>
<None Include="UI_normal.css">
<Filter>UI</Filter>
</None>
<None Include="UI_small.css">
<Filter>UI</Filter>
</None>
<None Include="UI.css">
<Filter>UI</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="GW2TacO.rc">
Expand Down
6 changes: 3 additions & 3 deletions UI_large.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ maptimer
{
width:35px;
height:35px;
left:320px;
top:0px;
left:0px;
top:35px;
opacity:0.5;
background-color:none;
background: skin(taco_large_dark) top left;
Expand Down Expand Up @@ -328,7 +328,7 @@ tptracker
left:0px;
top:0px;
width:391px;
height:39px;
height:78px;
background-color:none;
}

Expand Down
6 changes: 3 additions & 3 deletions UI_larger.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ maptimer
{
width:39px;
height:39px;
left:352px;
top:0px;
left:0px;
top:39px;
opacity:0.5;
background-color:none;
background: skin(taco_larger_dark) top left;
Expand Down Expand Up @@ -328,7 +328,7 @@ tptracker
left:0px;
top:0px;
width:391px;
height:39px;
height:78px;
background-color:none;
}

Expand Down
6 changes: 3 additions & 3 deletions UI_normal.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ maptimer
{
width:32px;
height:32px;
left:288px;
top:0px;
left:0px;
top:32px;
opacity:0.5;
background-color:none;
background: skin(taco_normal_dark) top left;
Expand Down Expand Up @@ -328,7 +328,7 @@ tptracker
left:0px;
top:0px;
width:391px;
height:39px;
height:78px;
background-color:none;
}

Expand Down
6 changes: 3 additions & 3 deletions UI_small.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ maptimer
{
width:29px;
height:29px;
left:260px;
top:0px;
left:0px;
top:29px;
opacity:0.5;
background-color:none;
background: skin(taco_small_dark) top left;
Expand Down Expand Up @@ -328,7 +328,7 @@ tptracker
left:0px;
top:0px;
width:391px;
height:39px;
height:78px;
background-color:none;
}

Expand Down

0 comments on commit 023c432

Please sign in to comment.