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

21325 Commits

Author SHA1 Message Date
minggo c4423d6848 Merge pull request #7285 from andyque/fixScrollChildren 
fix scroll
 2014-07-02 11:55:48 +08:00
andyque 6e64714331 fix scroll 2014-07-02 11:48:28 +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
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
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
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 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
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
samuele3hu d6778225e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-01 16:33:55 +08:00
minggo 05ca61d62b Merge pull request #7269 from minggo/fix-crash 
Fix crash
 2014-07-01 16:30:50 +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
minggo e15d563219 Merge pull request #7247 from andyque/fixFocus 
fix focus functions
 2014-07-01 16:02:23 +08:00
minggo d130bf84e5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash 2014-07-01 15:59:43 +08:00
minggo 0ea293b1f4 Merge pull request #7268 from CocosRobot/update_cocosfiles_1404201154 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-01 15:53:07 +08:00
minggo 39650e12c4 Merge pull request #7266 from dabingnn/v3_fix 
V3 fix
 2014-07-01 15:52:50 +08:00
CocosRobot 5ab6d5557b [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-01 07:52:35 +00:00
minggo daa5e257df Merge pull request #7259 from Dhilan007/v3-gc0627 
issue #4895:split controller adapter[android]
 2014-07-01 15:51:21 +08:00
Dhilan007 66673d88fa split controller adapter[android] 2014-07-01 15:08:51 +08:00
Dhilan007 abeeb9a0c7 fixing incorrect optimization 2014-07-01 14:57:10 +08:00
Huabing.Xu e1d97ecb59 Merge branch 'v3' into v3_fix 2014-07-01 14:54:28 +08:00
Huabing.Xu 75c7777999 fix Effect3dSprite memory leak 2014-07-01 14:48:46 +08:00
Dhilan007 584e90c097 Rotate the frame buffer for WP8 during the snapshot 2014-07-01 14:48:43 +08:00
samuele3hu 50ebede377 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-01 13:50:16 +08:00
samuele3hu 68aa0831eb Update the bindings-generaotr submodule 2014-07-01 13:49:14 +08:00
minggo 80204e3048 Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse 
Cleanup binary loader add scene binary parse
 2014-07-01 13:47:35 +08:00
minggo eb6ddea26e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash 2014-07-01 10:01:24 +08:00
minggo 00695eed49 Merge pull request #7261 from boyu0/fix_pvr_bgra8888_crash 
fix crash when load pvr bgra8888 image on android.
 2014-06-30 21:39:20 +08:00
minggo 3f4cbffa43 Merge pull request #7260 from visiblelight/beta_test 
fix that FastTileMapTest crashes on WP8
 2014-06-30 21:21:08 +08:00
Dhilan007 3eea298428 unbind the VAO anyway to for safety. 2014-06-30 21:08:43 +08:00
boyu0 6db8ec8aad fix crash when load pvr bgra8888 image in android. 2014-06-30 20:58:26 +08:00