Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,494 Commits 4 Branches 31 Tags 1.1 GiB
Commit Graph

25494 Commits

Author SHA1 Message Date
Huabing.Xu b4526bd9e0 spine runs on android platform 2014-10-15 11:48:47 +08:00
tangziwen cd1d2289a6 bug fix 2014-10-15 11:36:44 +08:00
samuele3hu a95e391756 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 2014-10-15 11:24:27 +08:00
Huabing.Xu 93158a1cfb update spine runtime and test case 2014-10-15 11:23:02 +08:00
samuele3hu 83d210ce7d Update the Xcode project setting for related test cases 2014-10-15 11:18:22 +08:00
tangziwen 29b255fa36 use a pure red dummy texture to indicate Sprite3d texture missing 2014-10-15 10:39:18 +08:00
minggo ae621a2a79 Merge pull request #8703 from CocosRobot/update_cocosfiles_1413340661 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-15 10:38:25 +08:00
CocosRobot da3f7ebe23 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-15 02:37:42 +00:00
minggo 30d09bef04 Merge pull request #8701 from joshuastray/v3 
ignore CMakeLists.txt.user generated by QtCreator
 2014-10-15 10:33:39 +08:00
minggo f0c3713672 Merge pull request #8699 from CocosRobot/update_lua_bindings_1413309490 
[AUTO]: updating luabinding automatically
 2014-10-15 10:32:11 +08:00
joshuastray 256e505dc7 ignore CMakeLists.txt.user generated by QtCreator 2014-10-15 10:26:19 +08:00
Dale Stammen 2b4d1c204c updated wp8 precompiled shaders 2014-10-14 18:39:12 -07:00
yangxiao 79558ab3db Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-15 09:19:03 +08:00
Dale Stammen c3cd7f6fc2 ignore wp8 and winrt specific dirs 2014-10-14 18:15:12 -07:00
Dale Stammen 420a19f222 run app after setting delegates 2014-10-14 18:12:24 -07:00
Dale Stammen d8d94d214b added missing file methods for winrt/wp8 2014-10-14 17:49:25 -07:00
Dale Stammen 4bed458371 added missing protobuf-lite files 2014-10-14 17:41:40 -07:00
Dale Stammen 4313ff8cc9 updated wp8 include file 2014-10-14 16:53:56 -07:00
Dale Stammen 2ca1479840 updated WP8 test project files 2014-10-14 16:53:31 -07:00
Dale Stammen a91ae61071 added check for WinRT and WP8 2014-10-14 16:46:23 -07:00
Dale Stammen cca5d90cbe added winrt and wp8 platforms. Cleaned up platform checks 2014-10-14 16:45:43 -07:00
Dale Stammen 0cfe930078 added new WP8 solution 2014-10-14 16:39:41 -07:00
Dale Stammen f0117239a6 added updated WP8 shader compiler project files 2014-10-14 16:38:04 -07:00
Dale Stammen d6912c3d84 updated winrt platform files 2014-10-14 16:32:39 -07:00
Dale Stammen 94f53ecaa3 added universal app project files 2014-10-14 16:30:23 -07:00
Anton Sokolchenko 518b5c2949 CMake settings for Mac Os X 
Also works with CLion
 2014-10-15 00:45:00 +03:00
Dale Stammen 180fa4c324 added new cocos2d wp8 dll project files 2014-10-14 14:28:06 -07:00
Dale Stammen 9ef5f3a48f added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
Anton Sokolchenko 40c5319f65 Merge pull request #1 from iSevenDays/v3_sevendays 
CMake fix for Mac Os X
 2014-10-15 00:26:37 +03:00
Dale Stammen 8983a57869 added Windows 8.1 universal app project files 2014-10-14 14:25:01 -07:00
Dale Stammen eb74b642da added Windows 8.1 universal app project files 2014-10-14 14:23:39 -07:00
Dale Stammen d3aa4c0475 updated winrt included 2014-10-14 14:22:41 -07:00
Dale Stammen 8700c0b07e added check for WinRT and WP8 2014-10-14 14:22:19 -07:00
Dale Stammen 21802abe13 added CC_DLL to export VolatileTextureMgr 2014-10-14 14:21:34 -07:00
Dale Stammen 20246d648b check for PixelFormat::DEFAULT 2014-10-14 14:21:02 -07:00
Dale Stammen c28e2c66c5 precompiled shaders for WP8 only 2014-10-14 14:20:32 -07:00
Dale Stammen ad9c729f6b updated winrt include files 2014-10-14 14:20:02 -07:00
Dale Stammen 2ef8b291bf updated wp8 include files 2014-10-14 14:19:47 -07:00
Dale Stammen eeeac0a398 updated wp8 include files 2014-10-14 14:19:35 -07:00
Anton Sokolchenko fc35cc2efe CMake fix for Mac Os X. 
You can open project with CLion and see that everything works.
 2014-10-15 00:19:29 +03:00
Dale Stammen ef13db4643 updated pch include files 2014-10-14 14:19:14 -07:00
Dale Stammen 946121ec71 added CC_DLL to export classes 2014-10-14 14:18:56 -07:00
Dale Stammen adfe072937 fixed include paths 2014-10-14 14:18:31 -07:00
Dale Stammen 37cd3dc7f9 added check for WP8_SHADER_COMPILER 2014-10-14 14:18:14 -07:00
Dale Stammen bbca4823f5 fixed check for WINRT_NO_WINSOCK 2014-10-14 14:17:49 -07:00
Dale Stammen 7a57ea4cb8 added Windows 8.1 ANGLE support 2014-10-14 14:17:28 -07:00
Dale Stammen e0157f7471 check for WP8_SHADER_COMPILER 2014-10-14 14:16:52 -07:00
Dale Stammen fbc25a055c updated winrt include 2014-10-14 14:16:24 -07:00
Dale Stammen 867556eef4 updated property sheets and pch files 2014-10-14 14:16:03 -07:00
Dale Stammen 1404f15daa added check for WinRT and WP8 2014-10-14 14:15:21 -07:00