Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems

420 lines
41 KiB
Plaintext
Raw Normal View History

added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<ItemsProjectGuid>{be3a1791-5bce-4cea-92cd-0e2d86dde27a}</ItemsProjectGuid>
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 22:24:23 +08:00
<ItemsRootNamespace>cocos2d</ItemsRootNamespace>
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ItemsProjectName>cpp-tests.Shared</ItemsProjectName>
<SharedGUID>f6ae64be-127a-4f7d-ad15-53a0fddb7f41</SharedGUID>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 22:24:23 +08:00
<ApplicationDefinition Include="$(MSBuildThisFileDirectory)App.xaml">
<SubType>Designer</SubType>
</ApplicationDefinition>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\Cocos2dRenderer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLES.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml.cpp">
<DependentUpon>$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml</DependentUpon>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\pch.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionManagerTest\ActionManagerTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionsEaseTest\ActionsEaseTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionsProgressTest\ActionsProgressTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionsTest\ActionsTest.cpp" />
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:45:29 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\AllocatorTest\AllocatorTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\AppDelegate.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BaseTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BillBoardTest\BillBoardTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Box2dView.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\GLES-Render.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Test.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\TestEntries.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTest\Box2dTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-1159.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-1174.cpp" />
add sprite frame flash line bug test case.
2015-07-22 13:42:10 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-12847.cpp" />
fix: compile on linux, android and windows
2016-05-27 03:02:24 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-15594.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-350.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-422.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-458\Bug-458.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-458\QuestionContainerSprite.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-624.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-886.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-899.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-914.cpp" />
Fix windows universal project file
2015-07-07 19:44:18 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-CCDrawNode.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-Child.cpp" />
Fix windows universal project file
2015-07-07 19:44:18 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-PageViewLayout.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\BugsTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Camera3DTest\Camera3DTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ChipmunkTest\ChipmunkTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ClickAndMoveTest\ClickAndMoveTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ClippingNodeTest\ClippingNodeTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\CocosDenshionTest\CocosDenshionTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ConfigurationTest\ConfigurationTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ConsoleTest\ConsoleTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\controller.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\CurlTest\CurlTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\CurrentLanguageTest\CurrentLanguageTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\DataVisitorTest\DataVisitorTest.cpp" />
Squashed commit of the following: commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92 Merge: 61788a0 082caaf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 13 00:13:38 2015 -0700 Merge branch 'v3' into downloader_decouple commit 61788a0b34188fed5367cab121817db97198bcd8 Merge: 8c1e211 5e21580 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:45:12 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f Merge: 2ea66af 8d73883 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:42:04 2015 -0700 Merge pull request #6 from minggo/downloader_decouple fix js binding error commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98 Author: minggo <ming@cocos2d-x.org> Date: Thu Aug 13 11:09:58 2015 +0800 fix js binding error commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40 Merge: 8cdb0b6 bc964e8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 09:14:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806 Merge: 9272765 08eeca9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 20:11:46 2015 -0700 Merge pull request #5 from minggo/downloader_decouple fix lua-binding error commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15 Author: minggo <ming@cocos2d-x.org> Date: Wed Aug 12 10:34:05 2015 +0800 fix lua-binding error commit 927276589d57432477f8ffc033e19a21a215b246 Merge: 8252464 6f4ed8a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 10:39:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b Merge: 5dddbb6 138df42 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 06:53:48 2015 -0700 Merge pull request #4 from minggo/downloader_decouple fix linking error in lua-tests on Android commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145 Author: minggo <ming@cocos2d-x.org> Date: Tue Aug 11 16:23:53 2015 +0800 fix link error in lua-tests commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 23:22:50 2015 -0700 works for real on win32 commit ddadaf82231b60c8e343718561c0d78657afe7c2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 22:26:59 2015 -0700 compiles on win32 commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:57:49 2015 -0700 compiles on iOS!! commit f706f97962eb393bf7dfec79739ff8dfdec103d5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:27:03 2015 -0700 compiles and runs Ok on windows. Tested all downloadertests + assetmanagertest commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 20:24:28 2015 -0700 updates windows projects commit e77fd8a278594fefc24ff13cbee038508429294d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 19:56:10 2015 -0700 compiles on Android commit 5f515e3519a0688d11476ea6ef235007e8378c96 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:34:33 2015 -0700 trying to fix a compile issue on iOS WIP commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:25:11 2015 -0700 make bug fixes adds public `getHeader` commit a228799ba74eb8642c43d215a802f811a576a4aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 17:42:19 2015 -0700 some linux fixes commit 2cab23d87acc138823ebe9dcec9d42f827690d99 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:58:53 2015 -0700 Squashed commit of the following: commit 86227e9138c1fb523bd28186d355de65cc64c588 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:55:17 2015 -0700 works %100 and uses less memory than before commit a9cafa6f2fe7847e279934d2c162287680760dda Merge: 0bbc62e 0cbd71f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:49:33 2015 -0700 Merge branch 'v3' into cocos_net commit 0bbc62ee1fbfd107a935131d5d93994e87865afa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:46:55 2015 -0700 more tests... and works but there is huge bug. ProgData <vector> needs the position of DownloadUnits <unordered_map> but <unordered_map> does not guaranty the order. So in my next commit I"ll merge DownloadUnit with ProgressData commit 389ed8639a1942f628773616a8e340bc66a0c1d7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 13:47:07 2015 -0700 debugging info commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:47:31 2015 -0700 sync and async tests working ok commit 999fa7a7bfb28565492f47b39caef7f1a079c183 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:38:38 2015 -0700 adding tests commit 91ee294942510718400edc0d00d3c744d00339ee Merge: 76ab703 7f215e9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 10:03:50 2015 -0700 Merge branch 'v3' into cocos_net commit 76ab7032d3a21156f05395a021391a16649f755a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 00:22:20 2015 -0700 Downloader tests commit b65c4dad7089660bfe697c0dab3e9290d1a6d013 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 21:34:54 2015 -0700 compiles on Xcode 7 commit ec0d66340b8daf0b042d36333dff759cd424f465 Merge: 878e4b5 0d77838 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 11:02:24 2015 -0700 Merge branch 'v3' into cocos_net commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 18:07:02 2015 -0700 working, yeah! commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 17:49:59 2015 -0700 code is more thread-safe friendly commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 16:39:02 2015 -0700 fixes callbacks commit ddab4d753106c6ff11304c1c69739c5611e3f20a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 15:43:51 2015 -0700 cleaner code runs callbacks in cocos2d thread only if needed commit ef75844aaa010633e6e27ae6e69460174460d5c7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:58:04 2015 -0700 removed weak_ptr<> from ProgressData that logic of the code is added in the callbacks commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:54:07 2015 -0700 checks whether or not the callbacks are in the cocos2d thread commit ae6594a6f866f6b5015ba293db23343887063d2f Merge: 4c61069 6831e24 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 10:48:34 2015 -0700 Merge branch 'v3' into cocos_net commit 4c61069a7e0e33fa0332df700cc8df4807178caf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 21:36:50 2015 -0700 almost there... Downloader has std::vector<FILE*> instead of FileDescriptors code cleaner... commit c34d04a8218d2be5c316e0487e5ac46792bbed76 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 20:38:44 2015 -0700 passes progressData to batch no need to alloc memory for each ProgressData commit f7e8bbd8b85f214b919bce6118d4158dd6d26368 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 17:47:23 2015 -0700 tidier code and more optimizations commit a486dc78aedcf9c6178e490292edd572f8a7b374 Merge: 4178327 a06421b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 14:03:22 2015 -0700 Merge branch 'v3' into cocos_net commit 417832705910a6ebd16a876cd98064ea16f0f45c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 18:13:13 2015 -0700 not finished yet... ...but trying to have a common inteface with batched and non-batched downloads commit 1d0e4652763c2e1511ac102a62defae6c6a89220 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 16:29:39 2015 -0700 ErrorCallback compiles starting the batching code commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18 Merge: c180425 8d836da Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 10:28:51 2015 -0700 Merge branch 'v3' into cocos_net commit c180425d8181b8e6f53be766d8d2b94f908ae168 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 15:35:53 2015 -0700 More progress on migrating multiple-file downloader to the implementation file commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 14:00:02 2015 -0700 Dowloader moved to `cocos2d::network` commit 14b1d0825106701b5435a266b255f09291b6486b Merge: 13cfc8d f744383 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:13:55 2015 -0700 Merge branch 'v3' into cocos_net commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:11:45 2015 -0700 DownloadUnits belong to network commit e6e17564ead1fb7f6f7df343b0627a104cd756f8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 12:23:36 2015 -0700 adds `check for option` commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 10:37:51 2015 -0700 Downloader: using URLDownload in one case. 3 more to go. Not tested yet commit 9b26e9cfac425635027189ccab835054b68bc83d Merge: 20fe063 253d9c4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 08:35:53 2015 -0700 Merge branch 'v3' into cocos_net commit 20fe0636e36ae7f1da048545b3345f526d5b64de Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 17:36:07 2015 -0700 URLDownload: initial commit HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d guidelines Adds `CCIRULDownload` interface. Adds `CCURLDownload` implementation based on libcurl. Not working yet. `Downloader` uses `URLDownload` for some of its functions. WIP commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0 Merge: e408fe0 642ccac Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 14:00:43 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into cocos_net commit e408fe0b9303813d20bab2f7bf548f3b7af416a6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 13:59:46 2015 -0700 Adds more files to Xcode project ...even if they are not being compiled. Much easier to add missing functionality to the rest of the platforms commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 11:36:57 2015 -0700 removes unneeded headers
2015-08-13 15:14:10 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\DownloaderTest\DownloaderTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\DrawPrimitivesTest\DrawPrimitivesTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\EffectsTest\EffectsTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\AssetsManagerExTest\AssetsManagerExTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\ButtonTest\ButtonTestLayer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\CocosBuilderTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\HelloCocosBuilder\HelloCocosBuilderLayer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\MenuTest\MenuTestLayer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\TestHeader\TestHeaderLayer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackTestLayer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlButtonTest\CCControlButtonTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlColourPicker\CCControlColourPickerTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlScene.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSliderTest\CCControlSliderTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest\CCControlSwitchTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ExtensionsTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NetworkTest\HttpClientTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NetworkTest\SocketIOTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NetworkTest\WebSocketTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NotificationCenterTest\NotificationCenterTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\TableViewTest\CustomTableViewCell.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\FileUtilsTest\FileUtilsTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\FontTest\FontTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\InputTest\MouseTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\IntervalTest\IntervalTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\LabelTest\LabelTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\LabelTest\LabelTestNew.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\LayerTest\LayerTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\LightTest\LightTest.cpp" />
Squashed commit of the following: commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 11:46:57 2015 -0700 compiles on win32 commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 11:01:04 2015 -0700 compiles on windows! commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 10:20:13 2015 -0700 windows fix CALLBACK is defined in windows. Use CALLBACK_FN instead commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15 Merge: 17c5102 f843466 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 09:51:02 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 17:05:49 2015 -0700 Material system works Ok. Deftaul states are being applyied to RenderState::StateBlock::_default state as well! commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 15:52:09 2015 -0700 more fixes for material blending works as expected commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 12:14:00 2015 -0700 compiles on Android compiles on Android commit 5feef67410a6e8408414230887c177a5cc3d8c35 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 11:01:46 2015 -0700 Cmakefiles works with Cmake again commit 1366da20efd4f63f683ac9264e18aa71d84bcc71 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat May 2 18:17:50 2015 -0700 Particle3D working Ok with its own uniforms commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 17:32:00 2015 -0700 MeshCommand now works 100% on Material! commit 92d641e29675ffc58daba48fcdcc5ec6459be02f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 15:49:14 2015 -0700 multiple meshes work Ok commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 13:43:56 2015 -0700 Adds `clone` to GLProgramState commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 18:54:34 2015 -0700 adds comment about the glprogramstate bug commit 2d008ec90557025507e0b17284e60b39fc9b42d3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 18:28:39 2015 -0700 some uniforms moved to Material commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 16:52:07 2015 -0700 depth test moved to Material! commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 13:12:28 2015 -0700 Material/Technique/Pass subclass of RenderState Inheritance of RenderState. Code from GamePlay3D commit a8b888dc30cf7ab4fae186acec2a366dfb967116 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 12:05:26 2015 -0700 same as v3 commit c026de5318a2a03beed1de6d7a0efda431569a5c Merge: 4561e3f 254a4b0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 11:37:40 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 18:02:21 2015 -0700 fixes on blending commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 17:51:05 2015 -0700 better defaults for StateBlock commit 3a661c35908aa075754d7b9dfac45be1af3b38e9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 17:46:36 2015 -0700 RenderState::bind() binds lots of states commit 074d5fb4a485e4ac32996c345e314594806e3cf0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 16:40:07 2015 -0700 Adds REnderState parsing in .material commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 16:06:31 2015 -0700 RenderState added into RenderState Code based on GamePlay3D. Adds GamePlay3d License. commit 04a6295ca5839e2e1202881b8a10733685c113d6 Merge: 52c916f 5671818 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 11:27:55 2015 -0700 Merge branch 'v3' into material_system commit 52c916fb4df04558433b1370102a5e9269f73607 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 18:15:12 2015 -0700 order files alphabetically order files alphabetically commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 17:46:07 2015 -0700 Adds cmake and android support commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 16:33:50 2015 -0700 for some reason the callback was crashing ... bug in the callback code? in any case, we didn't need it and it was making the code slower. commit 7844d32d04cb411ddae139d9598adcb04b899606 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 14:00:24 2015 -0700 more little fixes commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 12:11:28 2015 -0700 MeshCommand using Material internally works commit 67a435d66b4e554b4d24e462ca2ad42408157e69 Merge: 6dee7ca b9a994f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 10:34:03 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 6dee7cac6a51b4c123aabb111b0f8951082b1507 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 17:41:27 2015 -0700 improved readebility of MeshCommand code commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 15:41:07 2015 -0700 mesh supports Material `Mesh` supports `Material` Now `MeshCommand` needs to implement it correctly. commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73 Merge: 05b16f5 bd5f4e0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 11:23:28 2015 -0700 Merge branch 'v3' into material_system commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 17:40:48 2015 -0700 Adding Material into Mesh WIP. commit bc62f1a146ff9ad9864d8ff317f6a9540760066a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:39:54 2015 -0700 cosmetic commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:26:41 2015 -0700 moves even more code form Sprite3D to Mesh commit 04643bed3c277f0a775e962a5c87f550b1a59e74 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:15:21 2015 -0700 Moves "draw" from `Sprite3D` to `Mesh` commit 4bf884cdcb1a8df7522adeab364368493aba11e0 Merge: 2f305fc 2199bf1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 15:00:50 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 14:46:28 2015 -0700 cosmetic commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 16:44:21 2015 -0700 revert my changes... ...actually the GLProgramState code was Ok... ouch commit 36323c62eae2f8dbdcd7e13075758752cce44132 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 15:40:54 2015 -0700 parsing GLProgramState validates the attributes commit a406d6236a78244f73e81ded0b4148199a8677e5 Merge: 3be7fde cf177bb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 12:10:31 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 17:45:34 2015 -0700 little progress on Sprite3D + Material GLProgramState needs to decouple Uniforms from Attributes in `applyGLProgram`. binding the attributes is something that needs to be done at a different order. Perhaps the attributes are part of a VAO or something else. the method `applyAttributes()` has a variable to avoid that... but everything looks very hackish. commit f82496c61c9cb5a0787f883a4fb2d475889fa711 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 15:46:02 2015 -0700 doesn't crash :) but doesn't show anything either commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 13:35:45 2015 -0700 adding sprit3d test commit e716da63fe053b48db06f2aed9e0280256dd5f1b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 12:10:32 2015 -0700 MeshCommand: initial draw with Material commit d758041d81c3e6275997205e6395c46006bcc4ca Merge: 8cdc99f ca1a95f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 10:41:05 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 21:57:28 2015 -0700 adding Material to MeshCommand commit 0121872709c5e584b9b9f102e0f8dfc9c836841b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 19:39:09 2015 -0700 pre commit before merging MeshCommand commit 06c0ac2a67e303bde98dff75ac436ec22de59263 Merge: 736feb1 0287b42 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 18:19:00 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 736feb1b6495b7411525afb130015bdb31b5c471 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 17:22:03 2015 -0700 Pass conforms to create()/init() pattern commit 6103ffbb8479681b6665e81f0572bc3287919d07 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 17:04:19 2015 -0700 defines are strings better error checking when creating objects autorelase added in Pass, Material, Technique commit 1efcbab63c7ca4259d50825144184baee1b577ac Merge: 5b233bc fd3e38b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 11:23:47 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 5b233bc879bd65123092d366257843465ec1d306 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:31:37 2015 -0700 blur effect works with alpha commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89 Merge: e4c1dd2 425b2b6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:04:35 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:04:07 2015 -0700 Material, Technique, Pass: they have parent commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 21:48:06 2015 -0700 multipass works commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 17:31:04 2015 -0700 yeah! more materials... a lot to do yet commit d54d24ed185071ce1350bbf71914a64c9f6f228e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 17:06:46 2015 -0700 yeah! works! commit 1e70cb553148e6c136df42a789bf85184e73762d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 16:43:54 2015 -0700 simple test of material system works!!! commit c8581dfe9e970a3004254987416d75cccc644ccd Merge: 83aeec4 5d5fa3d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 13:51:45 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 15 18:04:23 2015 -0700 JSON file curated fixes minor bugs commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 15 17:22:36 2015 -0700 parsers shaders! including uniforms commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 23:24:18 2015 -0700 Material parses texture commit 1f678faf9d6c25f6405591f052da511281be8768 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 18:22:33 2015 -0700 material parsing almost working commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d Merge: d0ff296 d54ddbd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 09:23:23 2015 -0700 Merge branch 'v3' into material_system commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 13 18:42:42 2015 -0700 json parsing broken ha... I need to parse the content of the file, to the name of the file. to be fixed tomorrow commit e5aab39e5774d997f848155fc7209e9fbbd03bbc Merge: 81e93fa bc34554 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 13 10:19:11 2015 -0700 Merge branch 'v3' into material_system commit 81e93faac9d80888e975ee19d7412c54daf439a0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 17:41:12 2015 -0700 Adds more dummy files for material commit 5552a1e099bcf960d962c5369973ea663f802895 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 17:01:16 2015 -0700 adds empty test commit 7027c85fb24109f1ed4c50877dbec35618b5b39c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 15:36:24 2015 -0700 more material fixes multiple passes added in renderer commit db6745ead9879c6ce66b1921f32bf927421c54d9 Merge: 58d2412 8a160d7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 11:52:30 2015 -0700 Merge branch 'v3' into material_system commit 58d241266bdbd88162bb7ae9a7e868af173e6375 Merge: 0eccb23 b409f20 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:42:35 2015 -0700 Merge branch 'v3' into material_system commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0 Merge: 83494de 967f35a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:18:34 2015 -0700 Merge branch 'cpp_compiles_on_mac' into material_system commit 83494dedd0f4e7092f0267187cf07bd7de7723c2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:09:59 2015 -0700 compiles on Mac commit cca5b060164182b67df21fa330dce938e17fb324 Merge: dfc3740 09c50c4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 13:54:59 2015 -0700 Merge branch 'v3' into material_system commit dfc374099ca02e547478d24fa8fd61817a85862c Merge: fa2152b 64c45fa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 8 14:16:27 2015 -0700 Merge branch 'v3' into material_system commit fa2152b3402e3519d35f98309c4acc03b6790370 Merge: 90b7b6f b648d1f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 3 10:15:28 2015 +0800 Merge branch 'v3' into material_system commit 90b7b6f6540edff156e22fdf38021a5c83194deb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 3 10:13:24 2015 +0800 little changes to pass commit 7f8b83017f03572a3698f431b6af497d62fcfa25 Merge: 7460614 0779d05 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 2 08:36:43 2015 +0800 Merge branch 'v3' into material_system commit 7460614dd8b7eff5d8c759be54dd205333b26033 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 2 08:23:17 2015 +0800 small changes commit fa0354e74983795adafad3bedc9c50f6e8e328c9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Mar 26 18:20:46 2015 -0700 initial Material system
2015-05-06 04:07:32 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\MaterialSystemTest\MaterialSystemTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\MenuTest\MenuTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\MotionStreakTest\MotionStreakTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\MutiTouchTest\MutiTouchTest.cpp" />
configure recast project for win8.1 project
2015-06-03 14:31:12 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\NavMeshTest\NavMeshTest.cpp" />
Added new audio engine with wav support
2015-05-16 09:17:52 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\NewAudioEngineTest\NewAudioEngineTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\NewRendererTest\NewRendererTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\NodeTest\NodeTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\OpenURLTest\OpenURLTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ParallaxTest\ParallaxTest.cpp" />
added missing Particle3D files and tests
2015-02-17 02:01:09 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Particle3DTest\Particle3DTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ParticleTest\ParticleTest.cpp" />
add physics3d support
2015-05-08 15:49:33 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Physics3DTest\Physics3DTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PhysicsTest\PhysicsTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ReleasePoolTest\ReleasePoolTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\RenderTextureTest\RenderTextureTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\RotateWorldTest\RotateWorldTest.cpp" />
Add Scene3DTest source to cpp-tests win32/win8 project.
2015-05-14 15:19:39 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Scene3DTest\Scene3DTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SceneTest\SceneTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SchedulerTest\SchedulerTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ShaderTest\ShaderTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ShaderTest\ShaderTest2.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpineTest\SpineTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\DrawNode3D.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\Sprite3DTest.cpp" />
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
2015-04-26 23:08:14 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpritePolygonTest\SpritePolygonTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteTest\SpriteTest.cpp" />
add win rt support
2015-04-03 14:36:29 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\testBasic.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TextInputTest\TextInputTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Texture2dTest\Texture2dTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TextureCacheTest\TextureCacheTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TileMapTest\TileMapTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TileMapTest\TileMapTest2.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TouchesTest\Ball.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TouchesTest\Paddle.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TouchesTest\TouchesTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TransitionsTest\TransitionsTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\CocosGUIScene.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIButtonTest\UIButtonTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest.cpp" />
Add the missing file into CMake and Windows project configurations.
2015-07-01 14:36:53 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIRadioButtonTest\UIRadioButtonTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIFocusTest\UIFocusTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIImageViewTest\UIImageViewTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UILayoutTest\UILayoutTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIListViewTest\UIListViewTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UILoadingBarTest\UILoadingBarTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIPageViewTest\UIPageViewTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIRichTextTest\UIRichTextTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIScale9SpriteTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIScene.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UISceneManager.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIScrollViewTest\UIScrollViewTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UISliderTest\UISliderTest.cpp" />
Squashed commit of the following: commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0 Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 13:43:04 2016 +0800 change enum to enum class use tabitem as pointer to replace _currentTabItemIndex commit c0830cc581b8a07d6eed63268bf5be6a828c113a Merge: 3663156 166931a Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 11:48:44 2016 +0800 Merge remote-tracking branch 'gero/tabview' into tabcontrol commit 366315624143ff01c3e2b22b415ab79050e381e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 11:48:15 2016 +0800 Squashed commit of the following: commit 166931a28c8736ab58b7c4319c1139b5e4865a9e Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:35:06 2016 +0800 fix commit e0eb069846a8ceb4b726c3c945801c944404b102 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:30:44 2016 +0800 fix active deactive in tabcontrol commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 20:16:22 2016 +0800 fix active -1 commit e57796cbbae851e8cff52656b3265c80c2e8f6f7 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 16:00:51 2016 +0800 fix merge file commit cdd44f1c577ad190bc175896107a48fbb36b65bb Merge: 1658ad6 6bf55ed Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:57:48 2016 +0800 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview # Conflicts: # cocos/ui/CMakeLists.txt commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:27:31 2016 +0800 configure for win8.1 commit ec236bff711b72952d48ec4d8b9137b4812b7a72 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:20:23 2016 +0800 configure for iOS mac twos android linux commit 9d6678a4388461a791abe968fa637df2fc6839d3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:02:17 2016 +0800 add lack files commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 22:05:22 2016 +0800 add test case for TabControl commit 97b8d8d87a37881b33ebe90478392150ef341b3e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 15:43:29 2016 +0800 add const to getter setter commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 14:50:04 2016 +0800 format the comments commit a1989a8f89d33ef8d9eefff6c8117b45977308ad Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:51:06 2016 +0800 remove reference commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:40:04 2016 +0800 configure for win8.1 commit c015ac54028534202f62ff85f9a9d4b62b12801e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:27:54 2016 +0800 fix error commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:25:51 2016 +0800 add interface commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:21:22 2016 +0800 fix compile error for tw-os commit 3bfaa2976751e844a591ae5524bfd81249927c7c Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:04:23 2016 +0800 fix linux compile error commit fafe3ad660e644924fd02665b77e1df4076a4802 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:54:34 2016 +0800 re-indent code with X-Code commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:37:51 2016 +0800 add reader configure for android commit 07033f7b6074edf8a333e40c2382a09a2b2325e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:22:00 2016 +0800 format code, remove some warning commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:02:27 2016 +0800 configure for mac project commit de21cea12c0a898ea95f9951022be85bdddeefaf Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 18:28:10 2016 +0800 add comment for apis commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 15:32:46 2016 +0800 fix parse objects in container commit 53bcce68b053a5b918a29735fed393c210d9cc2c Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 22:10:54 2016 +0800 fix flatbuffer parse commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055 Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 18:26:07 2016 +0800 Init ui::TabControl commit 166931a28c8736ab58b7c4319c1139b5e4865a9e Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:35:06 2016 +0800 fix commit e0eb069846a8ceb4b726c3c945801c944404b102 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:30:44 2016 +0800 fix active deactive in tabcontrol commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 20:16:22 2016 +0800 fix active -1 commit e57796cbbae851e8cff52656b3265c80c2e8f6f7 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 16:00:51 2016 +0800 fix merge file commit cdd44f1c577ad190bc175896107a48fbb36b65bb Merge: 1658ad6 6bf55ed Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:57:48 2016 +0800 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview # Conflicts: # cocos/ui/CMakeLists.txt commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:27:31 2016 +0800 configure for win8.1 commit ec236bff711b72952d48ec4d8b9137b4812b7a72 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:20:23 2016 +0800 configure for iOS mac twos android linux commit 9d6678a4388461a791abe968fa637df2fc6839d3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:02:17 2016 +0800 add lack files commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 22:05:22 2016 +0800 add test case for TabControl commit 97b8d8d87a37881b33ebe90478392150ef341b3e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 15:43:29 2016 +0800 add const to getter setter commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 14:50:04 2016 +0800 format the comments commit a1989a8f89d33ef8d9eefff6c8117b45977308ad Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:51:06 2016 +0800 remove reference commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:40:04 2016 +0800 configure for win8.1 commit c015ac54028534202f62ff85f9a9d4b62b12801e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:27:54 2016 +0800 fix error commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:25:51 2016 +0800 add interface commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:21:22 2016 +0800 fix compile error for tw-os commit 3bfaa2976751e844a591ae5524bfd81249927c7c Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:04:23 2016 +0800 fix linux compile error commit fafe3ad660e644924fd02665b77e1df4076a4802 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:54:34 2016 +0800 re-indent code with X-Code commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:37:51 2016 +0800 add reader configure for android commit 07033f7b6074edf8a333e40c2382a09a2b2325e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:22:00 2016 +0800 format code, remove some warning commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:02:27 2016 +0800 configure for mac project commit de21cea12c0a898ea95f9951022be85bdddeefaf Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 18:28:10 2016 +0800 add comment for apis commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 15:32:46 2016 +0800 fix parse objects in container commit 53bcce68b053a5b918a29735fed393c210d9cc2c Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 22:10:54 2016 +0800 fix flatbuffer parse commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055 Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 18:26:07 2016 +0800 Init ui::TabControl
2016-03-03 14:17:48 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITabControlTest\UITabControlTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextAtlasTest\UITextAtlasTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextBMFontTest\UITextBMFontTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextTest\UITextTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIWidgetAddNodeTest\UIWidgetAddNodeTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\UITest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UnitTest\RefPtrTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UnitTest\UnitTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\UserDefaultTest\UserDefaultTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\VisibleRect.cpp" />
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-25 17:36:57 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\VibrateTest\VibrateTest.cpp" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ZwoptexTest\ZwoptexTest.cpp" />
Add SpriteFrameCacheTest to Android, Windows, Linux project files
2016-02-18 01:52:30 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteFrameCacheTest\SpriteFrameCacheTest.cpp" />
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 22:24:23 +08:00
<ClCompile Include="$(MSBuildThisFileDirectory)App.xaml.cpp">
<DependentUpon>$(MSBuildThisFileDirectory)App.xaml</DependentUpon>
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\Cocos2dRenderer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLES.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml.h">
<DependentUpon>$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml</DependentUpon>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\pch.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionManagerTest\ActionManagerTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionsEaseTest\ActionsEaseTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionsProgressTest\ActionsProgressTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionsTest\ActionsTest.h" />
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:45:29 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\AllocatorTest\AllocatorTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\AppDelegate.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BaseTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BillBoardTest\BillBoardTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Box2dView.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\GLES-Render.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Test.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\AddPair.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\ApplyForce.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\BodyTypes.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Breakable.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Bridge.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\BulletTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Cantilever.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Car.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Chain.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\CharacterCollision.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\CollisionFiltering.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\CollisionProcessing.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\CompoundShapes.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Confined.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\ContinuousTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\ConvexHull.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\ConveyorBelt.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\DistanceTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Dominos.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\DumpShell.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\DynamicTreeTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\EdgeShapes.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\EdgeTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Gears.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Mobile.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\MobileBalanced.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\MotorJoint.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\OneSidedPlatform.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Pinball.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\PolyCollision.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\PolyShapes.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Prismatic.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Pulleys.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Pyramid.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\RayCast.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Revolute.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Rope.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\RopeJoint.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\SensorTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\ShapeEditing.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\SliderCrank.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\SphereStack.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\TheoJansen.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Tiles.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\TimeOfImpact.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Tumbler.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\VaryingFriction.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\VaryingRestitution.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\VerticalStack.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTestBed\Tests\Web.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Box2DTest\Box2dTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-1159.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-1174.h" />
add sprite frame flash line bug test case.
2015-07-22 13:42:10 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-12847.h" />
fix: compile on linux, android and windows
2016-05-27 03:02:24 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-15594.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-350.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-422.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-458\Bug-458.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-458\QuestionContainerSprite.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-624.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-886.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-899.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-914.h" />
Fix windows universal project file
2015-07-07 19:44:18 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-CCDrawNode.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-Child.h" />
Fix windows universal project file
2015-07-07 19:44:18 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\Bug-PageViewLayout.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\BugsTest\BugsTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Camera3DTest\Camera3DTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ChipmunkTest\ChipmunkTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ClickAndMoveTest\ClickAndMoveTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ClippingNodeTest\ClippingNodeTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\CocosDenshionTest\CocosDenshionTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ConfigurationTest\ConfigurationTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ConsoleTest\ConsoleTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\controller.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\CurlTest\CurlTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\CurrentLanguageTest\CurrentLanguageTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\DataVisitorTest\DataVisitorTest.h" />
Squashed commit of the following: commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92 Merge: 61788a0 082caaf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 13 00:13:38 2015 -0700 Merge branch 'v3' into downloader_decouple commit 61788a0b34188fed5367cab121817db97198bcd8 Merge: 8c1e211 5e21580 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:45:12 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f Merge: 2ea66af 8d73883 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 20:42:04 2015 -0700 Merge pull request #6 from minggo/downloader_decouple fix js binding error commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98 Author: minggo <ming@cocos2d-x.org> Date: Thu Aug 13 11:09:58 2015 +0800 fix js binding error commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40 Merge: 8cdb0b6 bc964e8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 12 09:14:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806 Merge: 9272765 08eeca9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 20:11:46 2015 -0700 Merge pull request #5 from minggo/downloader_decouple fix lua-binding error commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15 Author: minggo <ming@cocos2d-x.org> Date: Wed Aug 12 10:34:05 2015 +0800 fix lua-binding error commit 927276589d57432477f8ffc033e19a21a215b246 Merge: 8252464 6f4ed8a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 10:39:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b Merge: 5dddbb6 138df42 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 11 06:53:48 2015 -0700 Merge pull request #4 from minggo/downloader_decouple fix linking error in lua-tests on Android commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145 Author: minggo <ming@cocos2d-x.org> Date: Tue Aug 11 16:23:53 2015 +0800 fix link error in lua-tests commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 23:22:50 2015 -0700 works for real on win32 commit ddadaf82231b60c8e343718561c0d78657afe7c2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 22:26:59 2015 -0700 compiles on win32 commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:57:49 2015 -0700 compiles on iOS!! commit f706f97962eb393bf7dfec79739ff8dfdec103d5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 21:27:03 2015 -0700 compiles and runs Ok on windows. Tested all downloadertests + assetmanagertest commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 20:24:28 2015 -0700 updates windows projects commit e77fd8a278594fefc24ff13cbee038508429294d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 19:56:10 2015 -0700 compiles on Android commit 5f515e3519a0688d11476ea6ef235007e8378c96 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:34:33 2015 -0700 trying to fix a compile issue on iOS WIP commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 18:25:11 2015 -0700 make bug fixes adds public `getHeader` commit a228799ba74eb8642c43d215a802f811a576a4aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 17:42:19 2015 -0700 some linux fixes commit 2cab23d87acc138823ebe9dcec9d42f827690d99 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:58:53 2015 -0700 Squashed commit of the following: commit 86227e9138c1fb523bd28186d355de65cc64c588 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 16:55:17 2015 -0700 works %100 and uses less memory than before commit a9cafa6f2fe7847e279934d2c162287680760dda Merge: 0bbc62e 0cbd71f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:49:33 2015 -0700 Merge branch 'v3' into cocos_net commit 0bbc62ee1fbfd107a935131d5d93994e87865afa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 15:46:55 2015 -0700 more tests... and works but there is huge bug. ProgData <vector> needs the position of DownloadUnits <unordered_map> but <unordered_map> does not guaranty the order. So in my next commit I"ll merge DownloadUnit with ProgressData commit 389ed8639a1942f628773616a8e340bc66a0c1d7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 13:47:07 2015 -0700 debugging info commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:47:31 2015 -0700 sync and async tests working ok commit 999fa7a7bfb28565492f47b39caef7f1a079c183 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 11:38:38 2015 -0700 adding tests commit 91ee294942510718400edc0d00d3c744d00339ee Merge: 76ab703 7f215e9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 10:03:50 2015 -0700 Merge branch 'v3' into cocos_net commit 76ab7032d3a21156f05395a021391a16649f755a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Aug 7 00:22:20 2015 -0700 Downloader tests commit b65c4dad7089660bfe697c0dab3e9290d1a6d013 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 21:34:54 2015 -0700 compiles on Xcode 7 commit ec0d66340b8daf0b042d36333dff759cd424f465 Merge: 878e4b5 0d77838 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Aug 6 11:02:24 2015 -0700 Merge branch 'v3' into cocos_net commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 18:07:02 2015 -0700 working, yeah! commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 17:49:59 2015 -0700 code is more thread-safe friendly commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 16:39:02 2015 -0700 fixes callbacks commit ddab4d753106c6ff11304c1c69739c5611e3f20a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 15:43:51 2015 -0700 cleaner code runs callbacks in cocos2d thread only if needed commit ef75844aaa010633e6e27ae6e69460174460d5c7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:58:04 2015 -0700 removed weak_ptr<> from ProgressData that logic of the code is added in the callbacks commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 11:54:07 2015 -0700 checks whether or not the callbacks are in the cocos2d thread commit ae6594a6f866f6b5015ba293db23343887063d2f Merge: 4c61069 6831e24 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Aug 5 10:48:34 2015 -0700 Merge branch 'v3' into cocos_net commit 4c61069a7e0e33fa0332df700cc8df4807178caf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 21:36:50 2015 -0700 almost there... Downloader has std::vector<FILE*> instead of FileDescriptors code cleaner... commit c34d04a8218d2be5c316e0487e5ac46792bbed76 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 20:38:44 2015 -0700 passes progressData to batch no need to alloc memory for each ProgressData commit f7e8bbd8b85f214b919bce6118d4158dd6d26368 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 17:47:23 2015 -0700 tidier code and more optimizations commit a486dc78aedcf9c6178e490292edd572f8a7b374 Merge: 4178327 a06421b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Aug 4 14:03:22 2015 -0700 Merge branch 'v3' into cocos_net commit 417832705910a6ebd16a876cd98064ea16f0f45c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 18:13:13 2015 -0700 not finished yet... ...but trying to have a common inteface with batched and non-batched downloads commit 1d0e4652763c2e1511ac102a62defae6c6a89220 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 16:29:39 2015 -0700 ErrorCallback compiles starting the batching code commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18 Merge: c180425 8d836da Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Aug 3 10:28:51 2015 -0700 Merge branch 'v3' into cocos_net commit c180425d8181b8e6f53be766d8d2b94f908ae168 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 15:35:53 2015 -0700 More progress on migrating multiple-file downloader to the implementation file commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 14:00:02 2015 -0700 Dowloader moved to `cocos2d::network` commit 14b1d0825106701b5435a266b255f09291b6486b Merge: 13cfc8d f744383 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:13:55 2015 -0700 Merge branch 'v3' into cocos_net commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Jul 31 11:11:45 2015 -0700 DownloadUnits belong to network commit e6e17564ead1fb7f6f7df343b0627a104cd756f8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 12:23:36 2015 -0700 adds `check for option` commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 10:37:51 2015 -0700 Downloader: using URLDownload in one case. 3 more to go. Not tested yet commit 9b26e9cfac425635027189ccab835054b68bc83d Merge: 20fe063 253d9c4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Jul 30 08:35:53 2015 -0700 Merge branch 'v3' into cocos_net commit 20fe0636e36ae7f1da048545b3345f526d5b64de Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 17:36:07 2015 -0700 URLDownload: initial commit HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d guidelines Adds `CCIRULDownload` interface. Adds `CCURLDownload` implementation based on libcurl. Not working yet. `Downloader` uses `URLDownload` for some of its functions. WIP commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0 Merge: e408fe0 642ccac Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 14:00:43 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into cocos_net commit e408fe0b9303813d20bab2f7bf548f3b7af416a6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 13:59:46 2015 -0700 Adds more files to Xcode project ...even if they are not being compiled. Much easier to add missing functionality to the rest of the platforms commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Jul 29 11:36:57 2015 -0700 removes unneeded headers
2015-08-13 15:14:10 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\DownloaderTest\DownloaderTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\DrawPrimitivesTest\DrawPrimitivesTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\EffectsTest\EffectsTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\AssetsManagerExTest\AssetsManagerExTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\ButtonTest\ButtonTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\ButtonTest\ButtonTestLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\CocosBuilderTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\HelloCocosBuilder\HelloCocosBuilderLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\HelloCocosBuilder\HelloCocosBuilderLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\LabelTest\LabelTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\LabelTest\LabelTestLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\MenuTest\MenuTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\MenuTest\MenuTestLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\ParticleSystemTest\ParticleSystemTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\ParticleSystemTest\ParticleSystemTestLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\ScrollViewTest\ScrollViewTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\ScrollViewTest\ScrollViewTestLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\SpriteTest\SpriteTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\SpriteTest\SpriteTestLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\TestHeader\TestHeaderLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\TestHeader\TestHeaderLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackLayerLoader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackTestLayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlButtonTest\CCControlButtonTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlColourPicker\CCControlColourPickerTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlScene.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSliderTest\CCControlSliderTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSwitchTest\CCControlSwitchTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\ExtensionsTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NetworkTest\HttpClientTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NetworkTest\SocketIOTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NetworkTest\WebSocketTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\NotificationCenterTest\NotificationCenterTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\TableViewTest\CustomTableViewCell.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\FileUtilsTest\FileUtilsTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\FontTest\FontTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\InputTest\MouseTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\IntervalTest\IntervalTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\LabelTest\LabelTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\LabelTest\LabelTestNew.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\LayerTest\LayerTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\LightTest\LightTest.h" />
Squashed commit of the following: commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 11:46:57 2015 -0700 compiles on win32 commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 11:01:04 2015 -0700 compiles on windows! commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 10:20:13 2015 -0700 windows fix CALLBACK is defined in windows. Use CALLBACK_FN instead commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15 Merge: 17c5102 f843466 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue May 5 09:51:02 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 17:05:49 2015 -0700 Material system works Ok. Deftaul states are being applyied to RenderState::StateBlock::_default state as well! commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 15:52:09 2015 -0700 more fixes for material blending works as expected commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 12:14:00 2015 -0700 compiles on Android compiles on Android commit 5feef67410a6e8408414230887c177a5cc3d8c35 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon May 4 11:01:46 2015 -0700 Cmakefiles works with Cmake again commit 1366da20efd4f63f683ac9264e18aa71d84bcc71 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat May 2 18:17:50 2015 -0700 Particle3D working Ok with its own uniforms commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 17:32:00 2015 -0700 MeshCommand now works 100% on Material! commit 92d641e29675ffc58daba48fcdcc5ec6459be02f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 15:49:14 2015 -0700 multiple meshes work Ok commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 1 13:43:56 2015 -0700 Adds `clone` to GLProgramState commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 18:54:34 2015 -0700 adds comment about the glprogramstate bug commit 2d008ec90557025507e0b17284e60b39fc9b42d3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 18:28:39 2015 -0700 some uniforms moved to Material commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 16:52:07 2015 -0700 depth test moved to Material! commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 13:12:28 2015 -0700 Material/Technique/Pass subclass of RenderState Inheritance of RenderState. Code from GamePlay3D commit a8b888dc30cf7ab4fae186acec2a366dfb967116 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 12:05:26 2015 -0700 same as v3 commit c026de5318a2a03beed1de6d7a0efda431569a5c Merge: 4561e3f 254a4b0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 30 11:37:40 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 18:02:21 2015 -0700 fixes on blending commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 17:51:05 2015 -0700 better defaults for StateBlock commit 3a661c35908aa075754d7b9dfac45be1af3b38e9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 17:46:36 2015 -0700 RenderState::bind() binds lots of states commit 074d5fb4a485e4ac32996c345e314594806e3cf0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 16:40:07 2015 -0700 Adds REnderState parsing in .material commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 16:06:31 2015 -0700 RenderState added into RenderState Code based on GamePlay3D. Adds GamePlay3d License. commit 04a6295ca5839e2e1202881b8a10733685c113d6 Merge: 52c916f 5671818 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 29 11:27:55 2015 -0700 Merge branch 'v3' into material_system commit 52c916fb4df04558433b1370102a5e9269f73607 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 18:15:12 2015 -0700 order files alphabetically order files alphabetically commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 17:46:07 2015 -0700 Adds cmake and android support commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 16:33:50 2015 -0700 for some reason the callback was crashing ... bug in the callback code? in any case, we didn't need it and it was making the code slower. commit 7844d32d04cb411ddae139d9598adcb04b899606 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 14:00:24 2015 -0700 more little fixes commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 12:11:28 2015 -0700 MeshCommand using Material internally works commit 67a435d66b4e554b4d24e462ca2ad42408157e69 Merge: 6dee7ca b9a994f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 28 10:34:03 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 6dee7cac6a51b4c123aabb111b0f8951082b1507 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 17:41:27 2015 -0700 improved readebility of MeshCommand code commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 15:41:07 2015 -0700 mesh supports Material `Mesh` supports `Material` Now `MeshCommand` needs to implement it correctly. commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73 Merge: 05b16f5 bd5f4e0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 27 11:23:28 2015 -0700 Merge branch 'v3' into material_system commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 17:40:48 2015 -0700 Adding Material into Mesh WIP. commit bc62f1a146ff9ad9864d8ff317f6a9540760066a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:39:54 2015 -0700 cosmetic commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:26:41 2015 -0700 moves even more code form Sprite3D to Mesh commit 04643bed3c277f0a775e962a5c87f550b1a59e74 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 16:15:21 2015 -0700 Moves "draw" from `Sprite3D` to `Mesh` commit 4bf884cdcb1a8df7522adeab364368493aba11e0 Merge: 2f305fc 2199bf1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 15:00:50 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 24 14:46:28 2015 -0700 cosmetic commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 16:44:21 2015 -0700 revert my changes... ...actually the GLProgramState code was Ok... ouch commit 36323c62eae2f8dbdcd7e13075758752cce44132 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 15:40:54 2015 -0700 parsing GLProgramState validates the attributes commit a406d6236a78244f73e81ded0b4148199a8677e5 Merge: 3be7fde cf177bb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 23 12:10:31 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 17:45:34 2015 -0700 little progress on Sprite3D + Material GLProgramState needs to decouple Uniforms from Attributes in `applyGLProgram`. binding the attributes is something that needs to be done at a different order. Perhaps the attributes are part of a VAO or something else. the method `applyAttributes()` has a variable to avoid that... but everything looks very hackish. commit f82496c61c9cb5a0787f883a4fb2d475889fa711 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 15:46:02 2015 -0700 doesn't crash :) but doesn't show anything either commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 13:35:45 2015 -0700 adding sprit3d test commit e716da63fe053b48db06f2aed9e0280256dd5f1b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 12:10:32 2015 -0700 MeshCommand: initial draw with Material commit d758041d81c3e6275997205e6395c46006bcc4ca Merge: 8cdc99f ca1a95f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 22 10:41:05 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 21:57:28 2015 -0700 adding Material to MeshCommand commit 0121872709c5e584b9b9f102e0f8dfc9c836841b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 19:39:09 2015 -0700 pre commit before merging MeshCommand commit 06c0ac2a67e303bde98dff75ac436ec22de59263 Merge: 736feb1 0287b42 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 21 18:19:00 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 736feb1b6495b7411525afb130015bdb31b5c471 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 17:22:03 2015 -0700 Pass conforms to create()/init() pattern commit 6103ffbb8479681b6665e81f0572bc3287919d07 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 17:04:19 2015 -0700 defines are strings better error checking when creating objects autorelase added in Pass, Material, Technique commit 1efcbab63c7ca4259d50825144184baee1b577ac Merge: 5b233bc fd3e38b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 20 11:23:47 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 5b233bc879bd65123092d366257843465ec1d306 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:31:37 2015 -0700 blur effect works with alpha commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89 Merge: e4c1dd2 425b2b6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:04:35 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 17 15:04:07 2015 -0700 Material, Technique, Pass: they have parent commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 21:48:06 2015 -0700 multipass works commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 17:31:04 2015 -0700 yeah! more materials... a lot to do yet commit d54d24ed185071ce1350bbf71914a64c9f6f228e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 17:06:46 2015 -0700 yeah! works! commit 1e70cb553148e6c136df42a789bf85184e73762d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 16:43:54 2015 -0700 simple test of material system works!!! commit c8581dfe9e970a3004254987416d75cccc644ccd Merge: 83aeec4 5d5fa3d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 16 13:51:45 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into material_system commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 15 18:04:23 2015 -0700 JSON file curated fixes minor bugs commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 15 17:22:36 2015 -0700 parsers shaders! including uniforms commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 23:24:18 2015 -0700 Material parses texture commit 1f678faf9d6c25f6405591f052da511281be8768 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 18:22:33 2015 -0700 material parsing almost working commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d Merge: d0ff296 d54ddbd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Apr 14 09:23:23 2015 -0700 Merge branch 'v3' into material_system commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 13 18:42:42 2015 -0700 json parsing broken ha... I need to parse the content of the file, to the name of the file. to be fixed tomorrow commit e5aab39e5774d997f848155fc7209e9fbbd03bbc Merge: 81e93fa bc34554 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Apr 13 10:19:11 2015 -0700 Merge branch 'v3' into material_system commit 81e93faac9d80888e975ee19d7412c54daf439a0 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 17:41:12 2015 -0700 Adds more dummy files for material commit 5552a1e099bcf960d962c5369973ea663f802895 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 17:01:16 2015 -0700 adds empty test commit 7027c85fb24109f1ed4c50877dbec35618b5b39c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 15:36:24 2015 -0700 more material fixes multiple passes added in renderer commit db6745ead9879c6ce66b1921f32bf927421c54d9 Merge: 58d2412 8a160d7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 10 11:52:30 2015 -0700 Merge branch 'v3' into material_system commit 58d241266bdbd88162bb7ae9a7e868af173e6375 Merge: 0eccb23 b409f20 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:42:35 2015 -0700 Merge branch 'v3' into material_system commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0 Merge: 83494de 967f35a Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:18:34 2015 -0700 Merge branch 'cpp_compiles_on_mac' into material_system commit 83494dedd0f4e7092f0267187cf07bd7de7723c2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 15:09:59 2015 -0700 compiles on Mac commit cca5b060164182b67df21fa330dce938e17fb324 Merge: dfc3740 09c50c4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 9 13:54:59 2015 -0700 Merge branch 'v3' into material_system commit dfc374099ca02e547478d24fa8fd61817a85862c Merge: fa2152b 64c45fa Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Apr 8 14:16:27 2015 -0700 Merge branch 'v3' into material_system commit fa2152b3402e3519d35f98309c4acc03b6790370 Merge: 90b7b6f b648d1f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 3 10:15:28 2015 +0800 Merge branch 'v3' into material_system commit 90b7b6f6540edff156e22fdf38021a5c83194deb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Apr 3 10:13:24 2015 +0800 little changes to pass commit 7f8b83017f03572a3698f431b6af497d62fcfa25 Merge: 7460614 0779d05 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 2 08:36:43 2015 +0800 Merge branch 'v3' into material_system commit 7460614dd8b7eff5d8c759be54dd205333b26033 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Apr 2 08:23:17 2015 +0800 small changes commit fa0354e74983795adafad3bedc9c50f6e8e328c9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Mar 26 18:20:46 2015 -0700 initial Material system
2015-05-06 04:07:32 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\MaterialSystemTest\MaterialSystemTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\MenuTest\MenuTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\MotionStreakTest\MotionStreakTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\MutiTouchTest\MutiTouchTest.h" />
configure recast project for win8.1 project
2015-06-03 14:31:12 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\NavMeshTest\NavMeshTest.h" />
Added new audio engine with wav support
2015-05-16 09:17:52 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\NewAudioEngineTest\NewAudioEngineTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\NewRendererTest\NewRendererTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\NodeTest\NodeTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\OpenURLTest\OpenURLTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ParallaxTest\ParallaxTest.h" />
added missing Particle3D files and tests
2015-02-17 02:01:09 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Particle3DTest\Particle3DTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ParticleTest\ParticleTest.h" />
add physics3d support
2015-05-08 15:49:33 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Physics3DTest\Physics3DTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PhysicsTest\PhysicsTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ReleasePoolTest\ReleasePoolTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\RenderTextureTest\RenderTextureTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\RotateWorldTest\RotateWorldTest.h" />
Add Scene3DTest source to cpp-tests win32/win8 project.
2015-05-14 15:19:39 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Scene3DTest\Scene3DTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SceneTest\SceneTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SchedulerTest\SchedulerTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ShaderTest\ShaderTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ShaderTest\shaderTest.psh.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ShaderTest\ShaderTest.vsh.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ShaderTest\ShaderTest2.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpineTest\SpineTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\DrawNode3D.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\Sprite3DTest.h" />
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
2015-04-26 23:08:14 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpritePolygonTest\SpritePolygonTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteTest\SpriteTest.h" />
add win rt support
2015-04-03 14:36:29 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\testBasic.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\testResource.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\tests.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TextInputTest\TextInputTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Texture2dTest\Texture2dTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TextureCacheTest\TextureCacheTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TileMapTest\TileMapTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TileMapTest\TileMapTest2.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TouchesTest\Ball.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TouchesTest\Paddle.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TouchesTest\TouchesTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TransitionsTest\TransitionsTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\CocosGUIScene.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\GUIEditorTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIButtonTest\UIButtonTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIFocusTest\UIFocusTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIImageViewTest\UIImageViewTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UILayoutTest\UILayoutTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIListViewTest\UIListViewTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UILoadingBarTest\UILoadingBarTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIPageViewTest\UIPageViewTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIRichTextTest\UIRichTextTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIScale9SpriteTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIScene.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UISceneManager.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIScene_Editor.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIScrollViewTest\UIScrollViewTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UISliderTest\UISliderTest.h" />
Squashed commit of the following: commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0 Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 13:43:04 2016 +0800 change enum to enum class use tabitem as pointer to replace _currentTabItemIndex commit c0830cc581b8a07d6eed63268bf5be6a828c113a Merge: 3663156 166931a Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 11:48:44 2016 +0800 Merge remote-tracking branch 'gero/tabview' into tabcontrol commit 366315624143ff01c3e2b22b415ab79050e381e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 11:48:15 2016 +0800 Squashed commit of the following: commit 166931a28c8736ab58b7c4319c1139b5e4865a9e Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:35:06 2016 +0800 fix commit e0eb069846a8ceb4b726c3c945801c944404b102 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:30:44 2016 +0800 fix active deactive in tabcontrol commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 20:16:22 2016 +0800 fix active -1 commit e57796cbbae851e8cff52656b3265c80c2e8f6f7 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 16:00:51 2016 +0800 fix merge file commit cdd44f1c577ad190bc175896107a48fbb36b65bb Merge: 1658ad6 6bf55ed Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:57:48 2016 +0800 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview # Conflicts: # cocos/ui/CMakeLists.txt commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:27:31 2016 +0800 configure for win8.1 commit ec236bff711b72952d48ec4d8b9137b4812b7a72 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:20:23 2016 +0800 configure for iOS mac twos android linux commit 9d6678a4388461a791abe968fa637df2fc6839d3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:02:17 2016 +0800 add lack files commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 22:05:22 2016 +0800 add test case for TabControl commit 97b8d8d87a37881b33ebe90478392150ef341b3e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 15:43:29 2016 +0800 add const to getter setter commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 14:50:04 2016 +0800 format the comments commit a1989a8f89d33ef8d9eefff6c8117b45977308ad Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:51:06 2016 +0800 remove reference commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:40:04 2016 +0800 configure for win8.1 commit c015ac54028534202f62ff85f9a9d4b62b12801e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:27:54 2016 +0800 fix error commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:25:51 2016 +0800 add interface commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:21:22 2016 +0800 fix compile error for tw-os commit 3bfaa2976751e844a591ae5524bfd81249927c7c Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:04:23 2016 +0800 fix linux compile error commit fafe3ad660e644924fd02665b77e1df4076a4802 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:54:34 2016 +0800 re-indent code with X-Code commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:37:51 2016 +0800 add reader configure for android commit 07033f7b6074edf8a333e40c2382a09a2b2325e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:22:00 2016 +0800 format code, remove some warning commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:02:27 2016 +0800 configure for mac project commit de21cea12c0a898ea95f9951022be85bdddeefaf Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 18:28:10 2016 +0800 add comment for apis commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 15:32:46 2016 +0800 fix parse objects in container commit 53bcce68b053a5b918a29735fed393c210d9cc2c Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 22:10:54 2016 +0800 fix flatbuffer parse commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055 Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 18:26:07 2016 +0800 Init ui::TabControl commit 166931a28c8736ab58b7c4319c1139b5e4865a9e Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:35:06 2016 +0800 fix commit e0eb069846a8ceb4b726c3c945801c944404b102 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:30:44 2016 +0800 fix active deactive in tabcontrol commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 20:16:22 2016 +0800 fix active -1 commit e57796cbbae851e8cff52656b3265c80c2e8f6f7 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 16:00:51 2016 +0800 fix merge file commit cdd44f1c577ad190bc175896107a48fbb36b65bb Merge: 1658ad6 6bf55ed Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:57:48 2016 +0800 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview # Conflicts: # cocos/ui/CMakeLists.txt commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:27:31 2016 +0800 configure for win8.1 commit ec236bff711b72952d48ec4d8b9137b4812b7a72 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:20:23 2016 +0800 configure for iOS mac twos android linux commit 9d6678a4388461a791abe968fa637df2fc6839d3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:02:17 2016 +0800 add lack files commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 22:05:22 2016 +0800 add test case for TabControl commit 97b8d8d87a37881b33ebe90478392150ef341b3e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 15:43:29 2016 +0800 add const to getter setter commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 14:50:04 2016 +0800 format the comments commit a1989a8f89d33ef8d9eefff6c8117b45977308ad Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:51:06 2016 +0800 remove reference commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:40:04 2016 +0800 configure for win8.1 commit c015ac54028534202f62ff85f9a9d4b62b12801e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:27:54 2016 +0800 fix error commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:25:51 2016 +0800 add interface commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:21:22 2016 +0800 fix compile error for tw-os commit 3bfaa2976751e844a591ae5524bfd81249927c7c Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:04:23 2016 +0800 fix linux compile error commit fafe3ad660e644924fd02665b77e1df4076a4802 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:54:34 2016 +0800 re-indent code with X-Code commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:37:51 2016 +0800 add reader configure for android commit 07033f7b6074edf8a333e40c2382a09a2b2325e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:22:00 2016 +0800 format code, remove some warning commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:02:27 2016 +0800 configure for mac project commit de21cea12c0a898ea95f9951022be85bdddeefaf Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 18:28:10 2016 +0800 add comment for apis commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 15:32:46 2016 +0800 fix parse objects in container commit 53bcce68b053a5b918a29735fed393c210d9cc2c Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 22:10:54 2016 +0800 fix flatbuffer parse commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055 Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 18:26:07 2016 +0800 Init ui::TabControl
2016-03-03 14:17:48 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITabControlTest\UITabControlTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextAtlasTest\UITextAtlasTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextBMFontTest\UITextBMFontTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UITextTest\UITextTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\CocoStudioGUITest\UIWidgetAddNodeTest\UIWidgetAddNodeTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UITest\UITest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UnitTest\RefPtrTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UnitTest\UnitTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\UserDefaultTest\UserDefaultTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\VisibleRect.h" />
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-25 17:36:57 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\VibrateTest\VibrateTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ZwoptexTest\ZwoptexTest.h" />
Add SpriteFrameCacheTest to Android, Windows, Linux project files
2016-02-18 01:52:30 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteFrameCacheTest\SpriteFrameCacheTest.h" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
<ClInclude Include="$(MSBuildThisFileDirectory)App.xaml.h">
<DependentUpon>$(MSBuildThisFileDirectory)App.xaml</DependentUpon>
</ClInclude>
</ItemGroup>
<ItemGroup>
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 22:24:23 +08:00
<ProjectCapability Include="SourceItemsFromImports" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
</ItemGroup>
<ItemGroup>
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 22:24:23 +08:00
<Page Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml" />
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
</ItemGroup>
<ItemGroup>
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 22:24:23 +08:00
<_CustomResource Include="$(MSBuildThisFileDirectory)..\..\Resources\**\*">
<Link>Assets\Resources\%(RecursiveDir)%(FileName)%(Extension)</Link>
<DeploymentContent>true</DeploymentContent>
</_CustomResource>
added universal app cpp-test project files
2014-10-17 02:11:41 +08:00
</ItemGroup>
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 22:24:23 +08:00
<Target Name="_CollectCustomResources" BeforeTargets="AssignTargetPaths">
<Message Text="Adding resource: %(_CustomResource.Identity) -&gt; %(_CustomResource.Link)" />
<ItemGroup>
<None Include="@(_CustomResource)" />
</ItemGroup>
</Target>
fix: compile on linux, android and windows
2016-05-27 03:02:24 +08:00
</Project>