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

36949 Commits

Author SHA1 Message Date
minggo 186e05f7c5 adjust z order (#18284) 2017-09-18 17:18:20 +08:00
minggo 99f5fbb63f Fix VAO in CameraBackgroundBrush (#18278) (#18279) 2017-09-18 15:47:50 +08:00
James Chen a73d5893b4 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271) 
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.

* Update AppActivity.java

* Update AppActivity.java
 2017-09-18 15:12:30 +08:00
pyrosphere 80c9292969 Fix VAO in CameraBackgroundBrush (#18278) 2017-09-18 10:50:00 +08:00
minggo c4042c220b [ci skip]fix issue that can not change position style, can not add new emitter (#18272) 2017-09-15 10:49:04 +08:00
minggo c66694cf20 adjust to make wrap mode take effect (#18259) 
* adjust to make wrap mode take effect

* make description more clear
 2017-09-15 09:01:56 +08:00
minggo 19962a3b59 [ci skip]don't clean layer when switch to another layer (#18267) 2017-09-14 17:42:56 +08:00
minggo 164cb98fe9 fix linking error on mac (#18266) 2017-09-14 17:27:41 +08:00
minggo dc8502edc1 make description more clear (#18263) 2017-09-14 09:26:04 +08:00
minggo d092e1c877 fix output bin path (#18258) 2017-09-13 16:38:50 +08:00
minggo ed8417ae48 Merge pull request #18255 from minggo/syn-v316 
Syn v316
 2017-09-13 16:31:06 +08:00
minggo 26272b2026 use update instead of run action because Sequence has issue when work with RepeatForever (#18257) 2017-09-13 15:36:11 +08:00
pandamicro c9fb0b5c03 [ci skip] update web ref (#18256) 2017-09-13 11:46:32 +08:00
minggo 42b596c7f4 sync v3.16 to v3 2017-09-13 11:19:13 +08:00
minggo 36f7f3c37e Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316 2017-09-13 11:18:39 +08:00
James Chen 2fbb6fe32a [ci skip][lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle. (#18252) 
* [lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle.

* More const auto &.
 2017-09-13 10:54:35 +08:00
pandamicro 1929265a7c [ci skip] Fix web engine issues for 3.16 QA (#18251) 
* Fix web test case issue in UIListView

* imgLoader callback use texture instead of image

* Update web ref
 2017-09-11 21:03:22 -05:00
James Chen 3468ff6c33 [js-tests] Fixes no image display in OpenGLTest (#18241) 2017-09-12 09:39:49 +08:00
pandamicro 402be527a7 Fix web test case issue in UIListView (#18245) 2017-09-12 09:39:33 +08:00
minggo afe4016618 fix crash of CaptureScreenTest (#18242) 2017-09-12 09:39:15 +08:00
James Chen 6318324f4d [android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon (#18247) 2017-09-12 09:38:54 +08:00
James Chen ec83cc99cc [ci skip] [lua-tests] fix wrong position of 'save' button in renderTextureTest. (#18244) 2017-09-08 16:42:12 +08:00
pandamicro 3603ace449 Merge pull request #18240 from pandamicro/v3.16 
Fix Label cutting issue in web test case
 2017-09-08 16:39:28 +08:00
James Chen bcee395f6e [js-tests] Fixes UISceneManager.js:830:TypeError: test is undefined (#18243) 2017-09-08 15:34:54 +08:00
pandamicro 97325298c5 Fix Label cutting issue in web test case 2017-09-08 14:52:27 +08:00
James Chen d13c01230f Fixes ShaderRetroEffect crashes. (#18237) 2017-09-08 14:10:40 +08:00
CocosRobot 46e70d3c71 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18236) 2017-09-08 10:49:17 +08:00
minggo 2fe40dba68 make uifocustest the same behavior as cpp (#18238) 2017-09-08 10:35:15 +08:00
James Chen ddb3c49eec Workaround for getting AL_STOPPTED state after alSourcePlay(sourceId). (#18228) 2017-09-08 09:29:39 +08:00
minggo ce1c207aee add LayerMultiplex::switch(int ,bool) (#18224) 2017-09-08 09:28:57 +08:00
minggo 85456fa1d5 fix local z order issue (#18232) 2017-09-08 09:28:35 +08:00
CocosRobot 5d2c3f5d43 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18234) 2017-09-08 09:28:16 +08:00
halx99 557a6c0bf4 Add sourcePosition compatible support. (#18230) 2017-09-07 17:16:46 +08:00
James Chen f0555f12a9 [android] Fixes ReflectionTest doesn't work while building with android studio. (#18229) 2017-09-07 16:27:06 +08:00
James Chen 339facb59a [ci skip]JSB LoaderTest fix. (#18231) 2017-09-07 15:22:05 +08:00
minggo aca7c86739 set default search path to the path the same as .exe file (#18226) 2017-09-07 11:22:00 +08:00
minggo 7999c5f7e5 [ci skip]fix precompiling issue on windows (#18223) 2017-09-06 15:16:44 +08:00
minggo e161b613a4 make jnihelper thread safe (#18189) 2017-09-06 15:07:01 +08:00
James Chen 5cf8db85d4 Fixes crash of lua particle test while building lua-tests in release mode. (#18221) 2017-09-06 15:06:21 +08:00
James Chen 30266b4ddd [ci skip]Fixes crash of lua particle test while building lua-tests in release mode. (#18222) 2017-09-06 15:05:47 +08:00
James Chen afe7ddcad3 Updates EventDispatcherTest for js-tests and lua-tests. (#18211) 
Fixes http://punchbox.info:3000/issues/26293
Uses removeFromParent(false) for not cleaning up EventListener associated with node.
 2017-09-06 15:05:03 +08:00
James Chen c6b87f2b09 More specific prompt for ETC1 test. (#18212) 2017-09-06 15:03:59 +08:00
minggo c89e35e22a Merge pull request #18216 from cocos2d/v3.16 
V3.16
 2017-09-06 14:59:36 +08:00
James Chen 7a65363208 Changes JS version to 3.16. (#18210) 2017-09-06 09:10:14 +08:00
CocosRobot 925432deb1 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18215) 2017-09-06 09:09:26 +08:00
minggo 15b43659c2 update to use Android Studio 2.3.3 (#18214) 2017-09-01 17:46:26 +08:00
minggo 71f28a78df update cocos console to fix iOS compiling isue (#18208) 2017-09-01 16:03:01 +08:00
James Chen 1fed9ae33b [ci skip]fix android AudioEngine Crash (#18124) (#18209) 
* *fix android AudioEngine Crash

switch to background when sound effect is about to end, it's maybe crashed when switch to foreground again

* use "emplace" instead of "insert"
 2017-09-01 11:30:10 +08:00
zoxin 7cd828119d [ci skip]fix android AudioEngine Crash (#18124) 
* *fix android AudioEngine Crash

switch to background when sound effect is about to end, it's maybe crashed when switch to foreground again

* use "emplace" instead of "insert"
 2017-09-01 10:16:04 +08:00
minggo e1c6590c66 Update config.json 2017-08-28 14:46:38 +08:00