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

25014 Commits

Author SHA1 Message Date
andyque f3f15c58fe remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
minggo 8c06d6b981 Merge pull request #8737 from samuele3hu/v3_rc_fix 
Update the related cocosstudio lua test cases and lua-bindings
 2014-10-16 16:28:31 +08:00
minggo ed92e247f8 Merge pull request #8727 from CocosRobot/update_cocosfiles_1413432972 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 16:27:54 +08:00
pipu 85bbcdd537 Deleting original code that parsing "Visible" 2014-10-16 16:26:46 +08:00
minggo 08c1f58398 Merge pull request #8740 from natural-law/v3 
Solve the error effect of lua runtime template on iOS.
 2014-10-16 16:22:23 +08:00
zhangbin a7cb5f74e6 Solve the error effect on iOS. 2014-10-16 16:19:50 +08:00
samuele3hu 8b5f6ae52a Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:04:09 +08:00
minggo a4d31262ac Merge pull request #8735 from dabingnn/v3_OptimizeQuadCommand 
V3 optimize quad command
 2014-10-16 16:01:37 +08:00
pipu e77f7f02b0 Modify Reader: 
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
 2014-10-16 15:55:38 +08:00
samuele3hu 3ba1289710 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_rc_fix 2014-10-16 15:54:41 +08:00
huangshiwu 0a04da0a10 Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode 2014-10-16 15:53:12 +08:00
samuele3hu b4c91f0712 Update the related cocosstudio lua test cases 2014-10-16 15:51:01 +08:00
minggo 04839b0e8f [ci skip]update version 2014-10-16 15:41:43 +08:00
minggo 41d280893f [ci skip] Update CHANGELOG 2014-10-16 15:40:34 +08:00
minggo 57068207ab [ci skip]update config.json 2014-10-16 15:35:42 +08:00
Huabing.Xu 97aa69a7c2 works on no VAO devices 2014-10-16 15:33:31 +08:00
Huabing.Xu 90030140d5 fix some format problem 2014-10-16 14:56:17 +08:00
Huabing.Xu 93ea1b9078 separate trianglesCommand and QuadCommand 2014-10-16 14:15:29 +08:00
minggo d72651828b Merge pull request #8729 from CocosRobot/update_cocosfiles_1413439331 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 14:03:02 +08:00
CocosRobot a6f0c1322c [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 06:02:13 +00:00
minggo 1692ee715f Merge pull request #8728 from Dhilan007/v3-templatefix 
Make resources output by Cocos Studio automatically packed into ipa
 2014-10-16 14:00:48 +08:00
Dhilan007 fcee230cab Make resources output by Cocos Studio automatically packed into ipa 2014-10-16 13:56:03 +08:00
CocosRobot 8ac99fec77 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 04:16:13 +00:00
minggo fef079aee6 Merge pull request #8682 from super626/fixbillboard 
Fixbillboard
 2014-10-16 12:04:50 +08:00
minggo 58480f8486 Merge pull request #8712 from pipu/v3_modify_warning_of_reader 
Modifying warning of *Reader
 2014-10-16 12:03:59 +08:00
minggo 6f93ace68c Merge pull request #8724 from CocosRobot/update_lua_bindings_1413431912 
[AUTO]: updating luabinding automatically
 2014-10-16 12:03:07 +08:00
minggo b3cbdfdede Merge pull request #8723 from CocosRobot/update_cocosfiles_1413431801 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 12:02:49 +08:00
CocosRobot 2bfad920ce [AUTO]: updating luabinding automatically 2014-10-16 04:01:10 +00:00
minggo eeabb52ceb [ci skip] Update CHANGELOG 2014-10-16 12:00:42 +08:00
CocosRobot ac3753092b [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 03:56:42 +00:00
minggo 8461165fad Merge pull request #8722 from samuele3hu/v3_assetsmanager 
Add AssetsmanagerEx and adjust related project configure and files
 2014-10-16 11:55:24 +08:00
minggo 79bd19af7b Merge pull request #8719 from CocosRobot/update_cocosfiles_1413423316 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 11:53:10 +08:00
samuele3hu 7fe2b6c0ad Update the CCFileUtils.h 2014-10-16 11:07:15 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
minggo 0a6bb3cdbc [ci skip]update config.json 2014-10-16 09:52:49 +08:00
CocosRobot cbdbee1876 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 01:35:18 +00:00
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
Dale Stammen 5d479a30aa updated wp8 cpp template 2014-10-15 09:49:24 -07:00
Anton Sokolchenko a49b337bbc Update CMakeLists.txt 2014-10-15 17:37:58 +03:00
Anton Sokolchenko 60f4f71a83 small comment fix 2014-10-15 16:51:49 +03:00
Anton Sokolchenko 90b3786997 small fix 2014-10-15 16:48:47 +03:00
Anton Sokolchenko 8f150f8610 revert default settings 2014-10-15 16:45:25 +03:00
Anton Sokolchenko 108b8720e8 Merge branch 'v3' of https://github.com/iSevenDays/cocos2d-x into v3 2014-10-15 16:36:49 +03:00
Anton Sokolchenko 4f1430d25d Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2014-10-15 16:36:18 +03:00
Anton Sokolchenko 41b51168d0 CMake fix for template projects 2014-10-15 16:33:58 +03:00
minggo fd38fd20ea [ci skip]Update Authors 2014-10-15 21:28:00 +08:00
Anton Sokolchenko 0b63ae6975 Update CMakeLists.txt 
added iOS/Mac
 2014-10-15 16:25:51 +03:00
minggo 68d58b05e9 Merge pull request #8700 from iSevenDays/v3 
CMake fix for Mac Os X
 2014-10-15 21:24:18 +08:00
Huabing.Xu c12f88d63c lua compiles ok－need to make it works later 2014-10-15 17:33:58 +08:00