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

21884 Commits

Author SHA1 Message Date
andyque 6e64714331 fix scroll 2014-07-02 11:48:28 +08:00
Huabing.Xu 187646ef3f Merge branch 'v3' into fast_tmx 2014-07-02 11:38:19 +08:00
yangxiao 91cb18389c Merge branch 'newcode' into v3 2014-07-02 10:55:38 +08:00
zhangcheng cf9b049926 1. fixes same name warning. 2014-07-02 10:53:35 +08:00
cheng.zhang 492d7bcc20 Merge pull request #46 from geron-cn/chengstoryopbin 
fix win can not compile
 2014-07-02 10:31:25 +08:00
yinkaile c9f676d970 Merge pull request #13 from geron-cn/youyouv3 
fix bug: did not addArmatureFileInfo to the relativedata
 2014-07-02 10:28:07 +08:00
minggo 77762cd8b9 Merge pull request #7282 from Dhilan007/v3-320beta 
fixed no response in test case of curl.
 2014-07-02 10:19:37 +08:00
Dhilan007 bcf2b0e2b6 fixed no response in test case of curl. 2014-07-02 10:18:07 +08:00
minggo 8fa0412c55 Merge pull request #7280 from CocosRobot/update_lua_bindings_1404267188 
[AUTO]: updating luabinding automatically
 2014-07-02 10:16:40 +08:00
CocosRobot 2821a23640 [AUTO]: updating luabinding automatically 2014-07-02 02:15:26 +00:00
GS 8a4fab2b1f add another possible GLFW header location 2014-07-02 10:11:51 +08:00
minggo a7a168169f Merge pull request #7263 from samuele3hu/v3_hot_fix 
Update the bindings-generaotr submodule
 2014-07-02 10:09:49 +08:00
minggo 5b282e338f Merge pull request #7279 from andyque/fixTextReader 
fix Text reader font name
 2014-07-02 10:04:00 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
andyque 3304bba017 add switch method to all the GUI tests 2014-07-02 10:00:34 +08:00
andyque 21b11cc3c6 add switch method to LoadingBar, ListView , pageView and scrollView 2014-07-02 10:00:34 +08:00
andyque f492643755 add switch method to UILayout and UIIamgeView 2014-07-02 10:00:34 +08:00
andyque 7fdc37a70e add switch method to checkBoxTest 2014-07-02 10:00:34 +08:00
andyque 3326941939 add switch loading method to buttonTest 2014-07-02 10:00:34 +08:00
andyque c3a5692e84 add test frame to UIScene_Editor 2014-07-02 10:00:33 +08:00
minggo d2587cc3a9 Merge pull request #7278 from minggo/v3 
fix effect of spine
 2014-07-02 09:59:01 +08:00
minggo d9a1f76755 fix effect of spine 2014-07-02 09:58:07 +08:00
Dhilan007 427e9d2388 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter 2014-07-02 09:47:22 +08:00
minggo aa80776eaa [ci skip] 2014-07-02 09:41:50 +08:00
samuele3hu 9ffbafaecd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-02 09:37:47 +08:00
Nite Luo 4cb59683e4 Add Sprite3DRotation test 2014-07-01 12:36:53 -07:00
Nite Luo a81bea886e Rotate around anchor point 2014-07-01 10:26:47 -07:00
minggo 60a791ac12 Merge pull request #7276 from minggo/v3 
fix compiling error
 2014-07-01 22:27:10 +08:00
minggo aff1e3e1d2 fix compiling error 2014-07-01 22:26:15 +08:00
minggo 9e978d576a update release note 2014-07-01 22:16:43 +08:00
minggo ca7e95b342 Merge pull request #7274 from Dhilan007/v3-320beta 
fixed crash cause by addChild on win 7.
 2014-07-01 22:15:26 +08:00
minggo a5452a29aa Merge pull request #7275 from andyque/fixBinaryLoaderSize 
fix content Size
 2014-07-01 22:03:14 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
Dhilan007 6294a3024f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter 2014-07-01 19:10:15 +08:00
geron-cn 17c320f1e2 fix 2014-07-01 19:06:51 +08:00
geron-cn c561f4e2f4 fix win can not compile 2014-07-01 18:55:09 +08:00
minggo bf60cc5f83 Merge pull request #7273 from CocosRobot/update_cocosfiles_1404209039 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-01 18:36:40 +08:00
Dhilan007 6ba111cbff fixed crash cause by addChild on win 7. 2014-07-01 18:23:20 +08:00
CocosRobot 32c88f6189 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-01 10:04:00 +00:00
minggo 206eea60f5 Merge pull request #7272 from Dhilan007/v3-gc0627 
Add missing file for game controller support
 2014-07-01 18:02:24 +08:00
Dhilan007 318962c40a update test case. 2014-07-01 16:46:11 +08:00
Dhilan007 0fbcbec9de Add missing file for game controller support. 
Fix using incorrect library project.
 2014-07-01 16:44:10 +08:00
zhangcheng 02c7c93e43 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse 2014-07-01 16:36:37 +08:00
samuele3hu d6778225e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-01 16:33:55 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
minggo 05ca61d62b Merge pull request #7269 from minggo/fix-crash 
Fix crash
 2014-07-01 16:30:50 +08:00
geron-cn dfdc4f6b66 fix bug: did not addarmature to the relativedata 2014-07-01 16:24:59 +08:00
minggo d6c516b62d [ci skip] 2014-07-01 16:20:55 +08:00
minggo 6654bf1129 Merge pull request #7265 from visiblelight/beta_test 
Fix the crash when capturing screen on WP8
 2014-07-01 16:19:45 +08:00
minggo cc3a9d0737 fix crash caused by std::regex() 2014-07-01 16:09:25 +08:00