Wang Nan
|
bbeba469a5
|
Merge pull request #813 from 2youyou2/anysdk
fixed anysdk folder structure
|
2017-09-14 14:57:10 +08:00 |
|
2youyouo2
|
d6b884f40e
|
fixed anysdk folder structure
|
2017-09-14 14:45:49 +08:00 |
|
Nan Wang
|
691a0e2bca
|
update engine version
|
2017-09-12 16:27:11 +08:00 |
|
Wang Nan
|
f280f8b44c
|
Merge pull request #811 from CocosRobot/update_cocosfiles_1505201973
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-12 15:44:23 +08:00 |
|
CocosRobot
|
5772f0277d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-12 07:39:34 +00:00 |
|
Wang Nan
|
509616098b
|
Merge pull request #808 from dumganhar/fix/activity-recreated
[android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon
|
2017-09-12 15:35:32 +08:00 |
|
2youyouo2
|
47058d7a84
|
update external version
|
2017-09-12 15:25:14 +08:00 |
|
2youyouo2
|
81bb1ed5e0
|
Merge branch 'v1.6' of github.com:cocos-creator/cocos2d-x-lite into anysdk
|
2017-09-12 14:35:15 +08:00 |
|
2youyouo2
|
9c12fcb2d9
|
add jailbreak anysdk files
|
2017-09-12 14:31:50 +08:00 |
|
James Chen
|
9030253ab4
|
[iOS] Default audio session mode should be set to AVAudioSessionCategoryAmbient.
And sync audio changes:
https://github.com/cocos2d/cocos2d-x/pull/18228
https://github.com/cocos2d/cocos2d-x/pull/18209
|
2017-09-11 12:00:51 +08:00 |
|
James Chen
|
642250694e
|
[android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon
|
2017-09-11 11:09:29 +08:00 |
|
CocosRobot
|
603698b1c0
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-09-08 02:12:57 +00:00 |
|
James Chen
|
0fbfc9a470
|
Updates xcode project configuration.
|
2017-09-08 10:06:23 +08:00 |
|
James Chen
|
6ee832bbc0
|
Removes unused SimpleAudioEngine relative files.
|
2017-09-08 10:03:09 +08:00 |
|
James Chen
|
e98823839c
|
Sync audio module from cocos2d-x.
|
2017-09-08 09:56:29 +08:00 |
|
James Chen
|
03a6d7ca8e
|
Reverts.
|
2017-09-08 09:21:53 +08:00 |
|
knoxHuang
|
933a11a188
|
fix eidtorbox 'editBoxEditingReturn' events are triggered continuously bug for fireball/issues/6358
|
2017-09-07 22:17:04 +08:00 |
|
James Chen
|
53e07c1da7
|
Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
|
2017-09-07 18:32:24 +08:00 |
|
James Chen
|
5eba72627a
|
[jsb2.0] SpiderMonkey debugger works. Adds ScriptEngine::enableDebugger, mainLoopUpdate interfaces.
|
2017-09-07 18:19:38 +08:00 |
|
pandamicro
|
087f1f8c8d
|
Remove inappropriate logs in debugger
|
2017-09-07 17:48:48 +08:00 |
|
pandamicro
|
90f5692293
|
Merge pull request #800 from huangapple/develop
fixed chinese path bug
|
2017-09-07 14:14:57 +08:00 |
|
James Chen
|
4df2b69d2f
|
For compatibility purpose, __errorHandler has 4 parameters, they are filePath, lineno, message, stack.
|
2017-09-06 16:08:16 +08:00 |
|
hej
|
198b5dfd50
|
fixed chinese path bug
|
2017-09-06 14:01:47 +08:00 |
|
James Chen
|
ad13e5336b
|
Adds global variable scriptEngineType.
|
2017-09-06 11:11:37 +08:00 |
|
James Chen
|
4990aa3130
|
[V8, ChakraCore] Exception callback info contains location, message, stack. Location contains filePath, line number and column number.
|
2017-09-06 10:58:43 +08:00 |
|
James Chen
|
05a3f74842
|
[SM] Exception info contains location, message, stack. Location contains filePath, line number and column number.
|
2017-09-06 10:58:43 +08:00 |
|
James Chen
|
269f65fd85
|
[JSC] Exception info contains location, message, stack. Location contains filePath, line number and column number.
|
2017-09-06 10:58:43 +08:00 |
|
James Chen
|
fd2977041e
|
Reverts revert https://github.com/EsotericSoftware/spine-runtimes/commit/a4a97969e8916be7d6ba531707b662ebbad8da9b
Because I don't find a easier way to set all trackentry dispose callback in JSB.
|
2017-09-06 10:58:43 +08:00 |
|
James Chen
|
d8c449b2dc
|
[spine] Cherry-pick https://github.com/EsotericSoftware/spine-runtimes/commit/a4a97969e8916be7d6ba531707b662ebbad8da9b
|
2017-09-06 10:58:43 +08:00 |
|
James Chen
|
362caa9e91
|
[spine] Reverts AnimationState.c/.h
|
2017-09-06 10:58:43 +08:00 |
|
pandamicro
|
0b057318a4
|
Avoid useless function check in executeFunctionWithOwner and useless js parameter construction in websocket
|
2017-09-04 13:46:37 +08:00 |
|
pandamicro
|
97b52f38cb
|
Fix JS_EncodeStringToUTF8 memory leak
|
2017-09-01 18:07:14 +08:00 |
|
James Chen
|
8081cdc071
|
Adds setExceptionCallback for ChakraCore.
|
2017-09-01 16:19:15 +08:00 |
|
James Chen
|
510b27fab8
|
Adds setExceptionCallback for V8.
|
2017-09-01 16:10:55 +08:00 |
|
James Chen
|
2b112bd7a4
|
Adds ScriptEngine::setExceptionCallback for Spidermonkey, and fixes a memory leak after using JS_EncodeStringToUTF8.
|
2017-09-01 15:24:43 +08:00 |
|
James Chen
|
cd77d4b567
|
Updates log format for jsc.
|
2017-09-01 15:23:43 +08:00 |
|
Wang Nan
|
83cd6f465b
|
Merge pull request #795 from 2youyou2/v1.6
fixed android-studio debug error
|
2017-09-01 15:11:09 +08:00 |
|
James Chen
|
3af1a24682
|
Adds setExceptionCallback for JSC.
|
2017-09-01 15:10:48 +08:00 |
|
2youyouo2
|
672d00478f
|
fixed android-studio debug error
|
2017-09-01 11:18:27 +08:00 |
|
James Chen
|
6c40f2783f
|
More renames: gc -> garbageCollect, isInGC -> isGarbageCollecting, _setInGC -> _setGarbageCollecting
|
2017-08-31 15:52:58 +08:00 |
|
CocosRobot
|
991824697e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-08-31 07:27:36 +00:00 |
|
James Chen
|
f2923331af
|
Less friend class declaration in ScriptEngine, adds ScriptEngine::isInCleanup method for checking whether script engine is cleaning up.
|
2017-08-31 15:00:23 +08:00 |
|
James Chen
|
f21fea4344
|
executeScriptBuffer -> evalString, executeScriptFile -> runScript.
|
2017-08-31 15:00:23 +08:00 |
|
James Chen
|
53250dad49
|
se::Ref -> se::RefCounter, addRef -> incRef, release -> decRef
This is for distinguishing from cocos2d::Ref.
|
2017-08-31 14:24:34 +08:00 |
|
James Chen
|
056ac35aac
|
Removes unused ScriptEngineProtocol invocation in CCRef.cpp.
|
2017-08-31 14:24:34 +08:00 |
|
James Chen
|
df01303041
|
attachChild -> attachObject, detachChild -> detachObject, isSame -> strictEquals
|
2017-08-31 10:33:17 +08:00 |
|
James Chen
|
496d025e20
|
Removes unused code in jsb_creator_manual.cpp.
|
2017-08-30 14:17:11 +08:00 |
|
James Chen
|
69152fa13d
|
Merge pull request #785 from CocosRobot/update_cocosfiles_1504064144
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-08-30 01:05:30 -05:00 |
|
James Chen
|
592567da57
|
Potential GC problem fix in CCDirector.cpp.
|
2017-08-30 14:02:57 +08:00 |
|
James Chen
|
703e857352
|
Synchronize network changes from cocos2d-x.
|
2017-08-30 13:56:41 +08:00 |
|