Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into minmax

Browse Source
This commit is contained in:
xawotihs
2014-01-24 23:49:30 +01:00
parent 746a486e7a 30d92eb68c
commit 541698f98e
100 changed files with 5124 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/template.vcxproj
+22
View File
@@ -319,6 +319,12 @@
<ClCompile Include="src\CardPrimitive.cpp" />
<ClCompile Include="src\CardSelector.cpp" />
<ClCompile Include="src\CardSelectorSingleton.cpp" />
<ClCompile Include="src\CarouselDeckView.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='HQ Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\Counters.cpp" />
<ClCompile Include="src\Credits.cpp" />
<ClCompile Include="src\Damage.cpp" />
@@ -330,6 +336,12 @@
<ClCompile Include="src\DeckMenuItem.cpp" />
<ClCompile Include="src\DeckMetaData.cpp" />
<ClCompile Include="src\DeckStats.cpp" />
<ClCompile Include="src\DeckView.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='HQ Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\DuelLayers.cpp" />
<ClCompile Include="src\ExtraCost.cpp" />
<ClCompile Include="src\GameApp.cpp">
@@ -363,6 +375,12 @@
<ClCompile Include="src\GameStateShop.cpp" />
<ClCompile Include="src\GameStateStory.cpp" />
<ClCompile Include="src\GameStateTransitions.cpp" />
<ClCompile Include="src\GridDeckView.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='HQ Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\GuiAvatars.cpp" />
<ClCompile Include="src\GuiBackground.cpp" />
<ClCompile Include="src\GuiCardsController.cpp" />
@@ -461,6 +479,7 @@
<ClInclude Include="include\CardPrimitive.h" />
<ClInclude Include="include\CardSelector.h" />
<ClInclude Include="include\CardSelectorSingleton.h" />
<ClInclude Include="include\CarouselDeckView.h" />
<ClInclude Include="include\config.h" />
<ClInclude Include="include\Counters.h" />
<ClInclude Include="include\Credits.h" />
@@ -473,7 +492,9 @@
<ClInclude Include="include\DeckMenuItem.h" />
<ClInclude Include="include\DeckMetaData.h" />
<ClInclude Include="include\DeckStats.h" />
<ClInclude Include="include\DeckView.h" />
<ClInclude Include="include\DuelLayers.h" />
<ClInclude Include="include\Easing.h" />
<ClInclude Include="include\Effects.h" />
<ClInclude Include="include\ExtraCost.h" />
<ClInclude Include="include\GameApp.h" />
@@ -488,6 +509,7 @@
<ClInclude Include="include\GameStateShop.h" />
<ClInclude Include="include\GameStateStory.h" />
<ClInclude Include="include\GameStateTransitions.h" />
<ClInclude Include="include\GridDeckView.h" />
<ClInclude Include="include\GuiAvatars.h" />
<ClInclude Include="include\GuiBackground.h" />
<ClInclude Include="include\GuiCardsController.h" />