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

22368 Commits

Author SHA1 Message Date
Huabing.Xu a5add07fb5 Merge branch 'v3' into v3_renderPrimitive 2014-07-31 14:31:24 +08:00
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget 
add target to build All target
 2014-07-31 14:25:37 +08:00
minggo 35d50e873d Merge pull request #7633 from CocosRobot/update_lua_bindings_1406785652 
[AUTO]: updating luabinding automatically
 2014-07-31 14:23:01 +08:00
Huabing.Xu dfee337db1 original version of Primitive 2014-07-31 13:52:39 +08:00
CocosRobot 095d4ed3c5 [AUTO]: updating luabinding automatically 2014-07-31 05:49:25 +00:00
minggo eb3b58edc4 [ci skip] 2014-07-31 13:44:22 +08:00
minggo a77b8e7320 Merge pull request #7608 from andyque/fixTextFieldUtf8Issue 
add utf8 support for TextField widget
 2014-07-31 13:41:57 +08:00
minggo f6985058b7 Merge pull request #7628 from dabingnn/v3_removeConstructAccessMacro 
remove CC_CONSTUCTOR_ACCESS fow win32 release
 2014-07-31 13:35:32 +08:00
minggo 5f34c14938 Merge pull request #7629 from heliclei/fix-ios-code-sign 
fix ios build code sign
 2014-07-31 13:34:54 +08:00
Huabing.Xu 2a1f934dd4 Merge branch 'v3' into v3_renderPrimitive 2014-07-31 09:23:15 +08:00
heliclei 26cf4321d2 fix ios build code sign 2014-07-30 23:59:19 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
minggo 7bd68c35d0 Merge pull request #7626 from heliclei/jenkins-pull-request-builder 
fix a typo:V3->v3
 2014-07-30 16:11:39 +08:00
heliclei add9e3a63e fix typo:V3->v3 2014-07-30 16:11:07 +08:00
minggo e640450104 Merge pull request #7625 from CocosRobot/update_cocosfiles_1406706675 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-30 15:52:18 +08:00
Huabing.Xu 99eed6a0be finish index data 2014-07-30 15:51:41 +08:00
CocosRobot 6dd02ade69 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-30 07:51:17 +00:00
minggo 8fe5ea390d Merge pull request #7624 from natural-law/gen-prebuilt-script 
Add tools to generate prebuilt engine for Cocos Engine.
 2014-07-30 15:49:27 +08:00
zhangbin 5ea318a7df Merge branch 'v3' into gen-prebuilt-script 2014-07-30 15:46:14 +08:00
zhangbin f8a7e70000 Add tools to generate prebuilt engine for Cocos Engine. 2014-07-30 15:44:15 +08:00
Huabing.Xu 23406c6463 Merge branch 'v3' into v3_renderPrimitive 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-07-30 15:09:25 +08:00
Huabing.Xu 428e9b1b1a Merge branch 'v3' into v3_buildAllTarget 2014-07-30 14:12:28 +08:00
andyque f2b0528cc9 refactor 2014-07-30 10:45:35 +08:00
andyque e7da7b3e42 change unsigned long to size_type 2014-07-30 10:34:37 +08:00
andyque 7abea5dc58 add utf8 support for UITextField 2014-07-30 10:34:37 +08:00
andyque 955da5d3cc move utf8_substr to ui::helper class. 2014-07-30 10:34:37 +08:00
minggo 57859beb68 [ci skip] 2014-07-30 09:51:18 +08:00
minggo b3c2e45da7 Merge pull request #7621 from CocosRobot/update_cocosfiles_1406683706 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-30 09:48:20 +08:00
minggo e99879467d Merge pull request #7620 from heliclei/jenkins-ios-build 
remove xcode shared scheme from code base
 2014-07-30 09:48:02 +08:00
CocosRobot 06d43ed2fd [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-30 01:28:27 +00:00
minggo d56052074b Merge pull request #7619 from andyque/addUIScale9Sprite 
Add ui scale9 sprite
 2014-07-30 09:27:17 +08:00
heliclei 9c76c59e6f resolve conflits 2014-07-29 18:48:57 +08:00
heliclei 77a8d96f37 remove xcode shared scheme from code base 2014-07-29 18:39:16 +08:00
Huabing.Xu d86cc0a811 decouple libcocos2d and cocosdenshion 2014-07-29 18:08:40 +08:00
andyque 5a22636441 fix windows compile error 2014-07-29 17:51:34 +08:00
Huabing.Xu 3bee93a156 add target to build All target 2014-07-29 16:43:20 +08:00
andyque c5ca0dbf10 fix android and linux compile error 2014-07-29 16:24:27 +08:00
andyque 1daaea1410 remove extension::Scale9Sprite dependency 2014-07-29 16:24:27 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
andyque 717f20571b add UIScale9Sprite implementation 2014-07-29 16:24:27 +08:00
andyque 32ed796657 add UIScale9Sprite 2014-07-29 16:24:27 +08:00
minggo ba567c05da Merge pull request #7615 from CocosRobot/update_cocosfiles_1406621347 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-29 16:14:22 +08:00
minggo 4c2fd90286 Merge pull request #7614 from andyque/fixBindingGenerate 
fix binding generator can nott regonize unsigned long arguments
 2014-07-29 16:13:26 +08:00
CocosRobot a743590ac5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-29 08:09:10 +00:00
minggo 38240b64c5 Merge pull request #7612 from dabingnn/v3_copysqllitedll 
add script to copy sqllite3.dll to output dir on windows
 2014-07-29 16:07:27 +08:00
andyque 98ef180ca8 add default value to luaval_to_ulong 2014-07-29 15:59:49 +08:00
andyque cfe7e57561 fix binding generator can nott regonize unsigned long arguments 2014-07-29 15:48:12 +08:00
Huabing.Xu bca92772dd remove unused windows localstorage project file 2014-07-29 15:23:07 +08:00
Huabing.Xu ea802580a2 add script to copy sqllite3.dll to output dir on windows 2014-07-29 15:02:34 +08:00
minggo 08627dbbe2 Merge pull request #7611 from CocosRobot/update_cocosfiles_1406615438 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-29 14:31:22 +08:00