James Chen
|
a0a312814d
|
Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into fix/jsb2.0-sync-v1.6
|
2017-09-22 17:32:36 +08:00 |
|
pandamicro
|
c7e63f3769
|
Adjust png refs in xcode project
|
2017-09-20 17:49:33 +08:00 |
|
pandamicro
|
a83f52142f
|
Fix screen resolution issue on iOS
|
2017-09-20 17:25:26 +08:00 |
|
James Chen
|
7f4088eb4a
|
Win32 template fix, LOGD could output log in vs in se module. (#826)
* Win32 template fix, LOGD could output log in vs in se module.
* Updates config.json
|
2017-09-19 05:09:07 -05:00 |
|
James Chen
|
f19fb0b1f8
|
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
|
2017-09-15 10:41:32 +08:00 |
|
2youyouo2
|
d6b884f40e
|
fixed anysdk folder structure
|
2017-09-14 14:45:49 +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
|
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 |
|
Wang Nan
|
83cd6f465b
|
Merge pull request #795 from 2youyou2/v1.6
fixed android-studio debug error
|
2017-09-01 15:11:09 +08:00 |
|
2youyouo2
|
672d00478f
|
fixed android-studio debug error
|
2017-09-01 11:18:27 +08:00 |
|
James Chen
|
45f8d3ee63
|
updates templates.
|
2017-08-29 18:00:51 +08:00 |
|
James Chen
|
99c1b24256
|
Merge branch 'develop' into jsb2.0
|
2017-08-28 14:38:47 +08:00 |
|
James Chen
|
621ff28b4a
|
Merge branch 'v1.6' into develop
# Conflicts:
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
# cocos/scripting/js-bindings/manual/BaseJSAction.cpp
# cocos/scripting/js-bindings/manual/BaseJSAction.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
# cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
# cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
# cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp
# cocos/scripting/js-bindings/proj.android/Android.mk
# cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
# cocos/scripting/js-bindings/script/jsb_debugger.js
# extensions/anysdk/js-bindings/SDKManager.cpp
# extensions/anysdk/js-bindings/manualanysdkbindings.cpp
# templates/cocos2dx_files.json
# templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# tools/tojs/cocos2dx.ini
# tools/tojs/cocos2dx_experimental_webView.ini
|
2017-08-28 14:23:30 +08:00 |
|
Wang Nan
|
e63561f9c1
|
Merge pull request #772 from 2youyou2/v1.6
update build tool version and gradle version
|
2017-08-23 14:14:33 +08:00 |
|
2youyouo2
|
19be5234c7
|
refine build.gradle
|
2017-08-23 10:45:28 +08:00 |
|
2youyouo2
|
49bfa517f2
|
update build tool version and gradle version
|
2017-08-23 10:45:07 +08:00 |
|
James Chen
|
2f38e872c1
|
Action binding bug fix.
|
2017-08-22 16:50:41 +08:00 |
|
James Chen
|
e58401f0fa
|
updates template
|
2017-08-18 14:44:44 +08:00 |
|
pandamicro
|
6ed7b716d8
|
Merge pull request #762 from pandamicro/v1.6
Fix iOS closing app crash
|
2017-08-18 14:22:37 +08:00 |
|
pandamicro
|
e863e9b7d9
|
Fix iOS closing app crash
|
2017-08-18 11:55:12 +08:00 |
|
2youyouo2
|
93862c24fa
|
fixed not copy .so files when first build android-studio project
|
2017-08-16 17:44:18 +08:00 |
|
James Chen
|
f9911434e2
|
Updates template's AppDelegate.cpp
|
2017-08-16 11:18:05 +08:00 |
|
2youyouo2
|
a2d0955bed
|
should use v140 for 15.0 VisualStudioVersion
|
2017-07-26 16:08:01 +08:00 |
|
pandamicro
|
d67ef36f36
|
Merge pull request #714 from pandamicro/develop
Improve iOS project in templates
|
2017-07-19 18:07:59 +08:00 |
|
pandamicro
|
2c7e127539
|
Rearrange anysdk files in iOS project
|
2017-07-19 17:59:54 +08:00 |
|
pandamicro
|
7ac7251fee
|
Change iOS deployment target to iOS8
|
2017-07-19 17:49:27 +08:00 |
|
James Chen
|
070c1aabb7
|
Fixes binary template compilation fairlure.
https://github.com/cocos-creator/fireball/issues/6028
|
2017-07-14 17:36:26 +08:00 |
|
2youyouo2
|
d0f80a3a46
|
update template for anysdk
|
2017-07-06 10:36:48 +08:00 |
|
Wang Nan
|
e9617ca0a6
|
Merge pull request #685 from dumganhar/fix/socketrocket
Uses SocketRocket to implement WebSocket for iOS
|
2017-07-05 17:55:46 +08:00 |
|
James Chen
|
4ee7a5f3e9
|
Updates template for ios/mac
|
2017-07-05 16:43:22 +08:00 |
|
pandamicro
|
99206af737
|
Remove useless module and preprocess macros
|
2017-07-04 16:35:17 +08:00 |
|
pandamicro
|
154e3cf863
|
Support windows Spidermonkey v52
|
2017-06-30 18:02:08 +08:00 |
|
pandamicro
|
c774cb9791
|
Upgrade to Spidermonkey v52. pass 9: Fix compilation warnings
|
2017-06-30 18:02:01 +08:00 |
|
pandamicro
|
024451216f
|
Upgrade to Spidermonkey v52. pass 5: Compilation passed on v52
|
2017-06-30 18:01:56 +08:00 |
|
Wang Nan
|
9392c162e5
|
Merge pull request #635 from pandamicro/develop
Support multi touch on iOS (the correct way)
|
2017-05-18 14:37:41 +08:00 |
|
pandamicro
|
5394abb9bf
|
Support multi touch on iOS (the correct way)
|
2017-05-18 14:28:03 +08:00 |
|
2youyouo2
|
61c76e0d8b
|
support vs 2017
|
2017-05-17 18:02:57 +08:00 |
|
2youyouo2
|
f873d7f7b4
|
update game.rc
|
2017-05-17 17:58:01 +08:00 |
|
2youyou2
|
8bd5d110b1
|
add box2d lib dependency to binary win32 template
|
2017-05-11 11:03:41 +08:00 |
|
Wang Nan
|
496eedb1b0
|
Merge pull request #613 from 2youyou2/android
fixed android studio compile error
|
2017-05-04 11:38:03 +08:00 |
|
2youyouo2
|
992bb2724c
|
fixed .so not compile to apk
|
2017-05-04 11:01:45 +08:00 |
|
Wang Nan
|
2ea1bd86a3
|
Merge pull request #609 from 2youyou2/android
set ndk_out for android-studio project
|
2017-05-02 14:02:02 +08:00 |
|
2youyouo2
|
524c511ca5
|
set ndk_out for android-studio project
|
2017-05-02 13:54:49 +08:00 |
|
Wang Nan
|
5635ab2957
|
Merge pull request #607 from zilongshanren/syncCodeFromCocosV3_path1
Sync code from cocos v3
|
2017-05-02 13:53:10 +08:00 |
|
2youyouo2
|
d7b3bc096b
|
fixed windows commands char length too long
|
2017-04-27 17:31:32 +08:00 |
|
zilongshanren
|
5c25d799d3
|
update binary template
|
2017-04-26 17:24:44 +08:00 |
|
2youyouo2
|
678e5ba92e
|
fixed binary android-studio project
|
2017-04-21 09:41:47 +08:00 |
|
2youyouo2
|
4ebcc72f19
|
update android-studio project
|
2017-04-21 09:37:40 +08:00 |
|