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

35448 Commits

Author SHA1 Message Date
minggo 533636e63a Merge pull request #15726 from minggo/v3.11.1 
merge v3.11.1 to v3
 2016-05-27 16:45:04 +08:00
yalab 3ea46c617f It mute warning on android clang. 2016-05-27 15:39:33 +09:00
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3 
Support cc.view.setOrientation on web
 2016-05-27 14:26:50 +08:00
minggo 127f718dfc Merge pull request #15728 from mogemimi/remove-duplicate-includes 
Remove duplicate header includes
 2016-05-27 14:25:39 +08:00
minggo 103bdb3d37 fix conflict 2016-05-27 14:22:03 +08:00
minggo 80039c4aee Merge pull request #15731 from minggo/jsb-debug-issue 
fix the bug that will lost message if only received one message
 2016-05-27 09:46:36 +08:00
Ricardo Quesada ff058eebc4 Merge pull request #15719 from ricardoquesada/issue_15594 
fix: add code/resources to reproduce issue_15594
 2016-05-26 20:40:38 -03:00
Ricardo Quesada 0be6645004 fix: 15594 compiles on android 
github issue #15594
 2016-05-26 19:25:39 -03:00
Ricardo Quesada 8bd4ddf081 fix: compile on linux, android and windows 2016-05-26 16:02:24 -03:00
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
Ricardo Quesada 1a7c22bd97 Merge pull request #15594 from yutaka-takeda-drecom/fix/sprite3d_singlesprite_bug 
CCSprite::createNode bug fix.
 2016-05-26 08:59:46 -03:00
capone 5b02460989 AudioEngine-linux fix: add map contains IDs of preloaded files 2016-05-26 17:57:56 +06:00
pandamicro 84d4b185f8 Update web engine ref 2016-05-26 19:34:03 +08:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
zilongshanren f9415734f2 Merge pull request #15732 from zilongshanren/fix-actionNode-studio 
fix actionNode studio 1.6 parser error
 2016-05-26 18:17:25 +08:00
zilongshanren 13003d9a78 Merge pull request #15727 from dumganhar/editbox-fix 
Make sure closeKeyboard run on UI thread
 2016-05-26 18:08:03 +08:00
zilongshanren 2476722137 fix default value of studio version 2016-05-26 17:33:44 +08:00
zilongshanren b317588e6e fix include path 2016-05-26 17:25:03 +08:00
zilongshanren 517cb9e437 Merge pull request #15729 from dumganhar/editbox-fix-2 
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
 2016-05-26 17:24:09 +08:00
zilongshanren 3e941be0ce fix actionNode studio 1.6 parser error 2016-05-26 17:20:51 +08:00
minggo 031e329d64 fix the bug that will lost message if only received one message 2016-05-26 16:32:10 +08:00
James Chen d42b99b10b fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread. 2016-05-26 15:49:57 +08:00
James Chen cf883b5c0f UI thread check. 2016-05-26 12:02:23 +08:00
James Chen a472ab2931 Make sure closeKeyboard run on UI thread 2016-05-26 11:57:57 +08:00
minggo 967f0078c2 update console 2016-05-26 11:30:48 +08:00
minggo 33e34f6e1c Merge pull request #15725 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2016-05-26 11:27:37 +08:00
minggo 1f2dea7974 Merge pull request #15724 from dumganhar/catch-exception 
Try catch IllegalStateException in Cocos2dxMusic.java.
 2016-05-26 11:20:14 +08:00
James Chen 5321a2fc7a Removes unused package import for Cocos2dxSound.java. 2016-05-26 11:15:44 +08:00
minggo 1116176362 Merge pull request #15720 from billyquith/v3 
Grammar corrections
 2016-05-26 11:00:53 +08:00
minggo 5e8eee2c76 Merge pull request #15721 from mogemimi/fix-minor-typo 
Fix minor typo: Texure -> Texture
 2016-05-26 10:58:55 +08:00
pandamicro aab8ea5094 Fix android compilation issue with thumb mode 2016-05-26 10:50:19 +08:00
minggo 7073a1c90c Merge pull request #15718 from pandamicro/v3 
Fix some small issues
 2016-05-26 10:46:54 +08:00
zhangbin 08706012e8 Update the reference of submodule cocos2d-console. 
1. Change the Tracker ID of GA in console.
2. Disable the BI Data Statistic.
3. Add special prefix '2dx-' for the Data uploaded by console in -x engine.
 2016-05-26 10:42:56 +08:00
minggo 14aa5f5ded update binding generator 2016-05-26 10:42:26 +08:00
minggo 43680e7d78 update web engine 2016-05-26 10:40:15 +08:00
minggo e17c4c752f update deps 2016-05-26 10:36:27 +08:00
minggo b69127127a update release note 2016-05-26 10:34:52 +08:00
minggo 8564dbd921 update changelog 2016-05-26 10:34:35 +08:00
James Chen 1285954cd9 Try catch IllegalStateException in Cocos2dxMusic.java. 2016-05-26 10:25:45 +08:00
minggo 072592d6e3 update version 2016-05-26 10:18:45 +08:00
urokuta 785d02a818 #9367 blend mode does not work with animated sprite 2016-05-26 09:39:48 +09:00
Ricardo Quesada b2c7358370 Merge pull request #15722 from ricardoquesada/issue_15154 
Fix crash on windows when using PolygonInfo
 2016-05-25 21:25:31 -03:00
Ricardo Quesada 906967c53a fix: make it compile on iOS and Mac 2016-05-25 20:00:48 -03:00
Ricardo Quesada 3725df5e07 Merge pull request #9 from stammen/issue_15154-fix 
fixed array overrun in triangulate()
 2016-05-25 14:54:36 -03:00
mogemimi f6bee1abc2 Fix minor typo: Texure -> Texture 2016-05-26 02:36:15 +09:00
Dale Stammen 26781ee592 fixed array overrun in triangulate() 2016-05-25 10:14:09 -07:00
pandamicro ea6a6a8586 Reverse include path in network module and update web engine 2016-05-25 23:58:11 +08:00
BQ 93ed59bfb3 English grammar corrections. 2016-05-25 15:25:38 +01:00
BQ ded2a89eda Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
* 'v3' of https://github.com/cocos2d/cocos2d-x:
  correct assign to equal in cert trust expression
  dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
  Use nullptr instead of 0 or NULL
  lock mutext to get element from g_queue
 2016-05-25 15:19:56 +01:00
BQ 6097c3abd1 English grammar corrections. 
Make brackets consistent.
 2016-05-25 15:18:57 +01:00