CocosRobot
d407731be8
[AUTO][ci skip]: updating cocos2dx_files.json
2017-11-07 02:06:35 +00:00
James Chen
018b29e6ce
Merge pull request #964 from cocos-creator/v1.7-release
...
Merge v1.7-release
2017-11-07 10:01:49 +08:00
Jare Guo
befa4bf4f3
Merge pull request #962 from jareguo/v1.7-release
...
gulpfile: refine gen-simulator
2017-11-06 17:31:30 +08:00
James Chen
d898d23a40
Merge pull request #963 from dumganhar/fix/gen-libs-android
...
Updates console
2017-11-06 17:17:56 +08:00
James Chen
d7c619ff77
Updates console
2017-11-06 17:15:50 +08:00
Jare Guo
185b88442f
Merge commit '3c525f2a5fc3ba560b2ce908b4d8be2f94c0691e' into v1.7-release
...
# Conflicts:
# tools/simulator/frameworks/runtime-src/proj.android-studio/app/build.gradle
# tools/simulator/frameworks/runtime-src/proj.android-studio/build.gradle
# tools/simulator/frameworks/runtime-src/proj.android-studio/gradle.properties
2017-11-06 16:57:14 +08:00
Jare Guo
3c525f2a5f
Merge pull request #961 from dumganhar/fix/gen-libs-android
...
Updates simulator configuration for android.
2017-11-06 16:51:24 +08:00
Jare Guo
228ff3e0ac
update gradle projects
2017-11-06 16:47:13 +08:00
Jare Guo
e5cbbbc87c
gulpfile: refine gen-simulator
2017-11-06 16:47:13 +08:00
James Chen
2a229fd195
Updates simulator configruation for android.
2017-11-06 15:15:51 +08:00
James Chen
5def171e3e
Updates cocos2d-console.
2017-11-06 15:14:53 +08:00
Jare Guo
0e67887442
Merge pull request #960 from jareguo/v1.7-release
...
update gulpfile
2017-11-05 15:52:57 +08:00
Jare Guo
acc0b536ae
gulp task should not stop
2017-11-05 15:48:59 +08:00
Jare Guo
c257255af9
Merge pull request #958 from cocos-creator/v1.7
...
update v1.7-release
2017-11-03 17:08:22 +08:00
Jare Guo
ae6cc7bcb3
Merge pull request #957 from CocosRobot/update_cocosfiles_1509699695
...
[AUTO][ci skip]: updating cocos2dx_files.json
2017-11-03 17:07:57 +08:00
CocosRobot
8a221ff7ea
[AUTO][ci skip]: updating cocos2dx_files.json
2017-11-03 09:01:35 +00:00
Jare Guo
cf2a85d587
Merge pull request #956 from dumganhar/v1.7
...
Updates Cocos Analytics relevant code.
2017-11-03 16:57:06 +08:00
Jare Guo
3a3d874bc0
Merge pull request #943 from jareguo/v1.7
...
update download module
2017-11-03 16:53:25 +08:00
James Chen
f2e03aa0b2
Adds missing files.
2017-11-03 15:26:26 +08:00
James Chen
6a8106c5f3
Updates Cocos Analytics relevant code.
...
Adds missing onPause, onResume, onDestroy invocation.
Disabled local debug by default.
Uses AnySDK channel ID in APK or IPA file if channel ID isn't found.
2017-11-03 15:19:03 +08:00
James Chen
3dcef0fa28
Merge pull request #955 from dumganhar/v1.7
...
Removes unused manual padding in CCNode.h
2017-11-03 10:31:11 +08:00
James Chen
204dfd8bf5
Removes unused manual padding in CCNode.h
2017-11-03 10:26:29 +08:00
Jare Guo
0a78bed2bf
Merge pull request #954 from dumganhar/v1.7
...
Empty implementation for the platforms that don't support Cocos Analytics.
2017-11-02 18:08:16 +08:00
James Chen
6272f4f42e
Empty implementation for the platforms that don't support Cocos Analytics.
2017-11-02 17:51:16 +08:00
James Chen
5e9ae09716
Merge pull request #953 from dumganhar/v1.7
...
Adds missing LOGD -> SE_LOGD
2017-11-02 12:51:50 +08:00
James Chen
2c6a18ec0e
Adds missing LOGD -> SE_LOGD
2017-11-02 12:50:24 +08:00
James Chen
e5ee086e94
Merge pull request #944 from dumganhar/fix/android-studio-3.0-support
...
Android studio 3.0 support
2017-11-02 12:03:06 +08:00
James Chen
67d5d7ef33
Updates console
2017-11-02 12:02:09 +08:00
James Chen
61e593939a
Merge pull request #945 from 2youyou2/optimize-culling
...
optimize director matrix operation
2017-11-02 12:01:01 +08:00
James Chen
50d6a4947d
Reverts jniLibs.srcDir
2017-11-02 11:50:09 +08:00
James Chen
2f862494cc
Merge pull request #946 from dumganhar/fix/move-retain-release
...
Moves retain/release code from se::ScriptEngine to ScriptingCore.
2017-11-02 11:46:53 +08:00
James Chen
036a0a21da
Moves retain/release code from se::ScriptEngine to ScriptingCore.
2017-11-02 11:44:48 +08:00
James Chen
37a05367f8
Merge pull request #952 from dumganhar/fix/reflect-android
...
Bug fix for jsb.callStaticMethod for android. Don't return the value JavaScriptJavaBrider::convertReturnValue returns for binding method.
2017-11-02 11:42:45 +08:00
James Chen
a0a77de488
Bug fix for jsb.callStaticMethod for android. Don't return JavaScriptJavaBrider::convertReturnValue for binding method.
2017-11-02 11:40:47 +08:00
James Chen
d048545793
Merge pull request #951 from dumganhar/fix/LOGD
...
LOGD -> SE_LOGD, LOGE -> SE_LOGE to avoid conflict with user code.
2017-11-02 11:38:49 +08:00
James Chen
6a9500df10
LOGD -> SE_LOGD, LOGE -> SE_LOGE to avoid conflict with user code.
2017-11-02 11:35:53 +08:00
James Chen
e3dfe089ca
Adds missing \n
2017-11-02 11:20:41 +08:00
James Chen
6823e113ce
Merge pull request #950 from dumganhar/fix/sm-unify-jsc
...
Unify jsc parsing flow for SpiderMonkey.
2017-11-02 11:18:58 +08:00
James Chen
2e9c14e87a
cleanup fix for v8
2017-11-02 11:13:02 +08:00
James Chen
7d0979da3c
Unify jsc parsing flow for SpiderMonkey.
2017-11-02 11:12:39 +08:00
James Chen
12d8e140a7
Merge pull request #949 from dumganhar/fix/bind-func-ret
...
Prints ERROR log if native binding function return false.
2017-11-02 10:33:55 +08:00
James Chen
a3c8ba6632
Prints ERROR log if native binding function return false.
2017-11-02 10:32:31 +08:00
yinkaile
169a60b157
refine code
2017-11-01 11:36:55 +08:00
yinkaile
879c6488a5
refine code
2017-11-01 10:55:14 +08:00
yinkaile
fd73955d10
fixed MatrixStack::pop
2017-11-01 09:35:03 +08:00
yinkaile
d7fa1f9e13
rename director culling functions
2017-10-31 18:23:13 +08:00
yinkaile
40432bda34
add MatrixStack class
2017-10-31 18:14:11 +08:00
yinkaile
26ff253d8c
support dynamic enable/disable culling
2017-10-31 15:37:12 +08:00
yinkaile
b784973426
optimize director matrix operation
2017-10-31 15:36:20 +08:00
James Chen
aa1819e19c
Updates cocos2d-console.
2017-10-30 11:28:47 +08:00