Jare Guo
|
ccd3c113b0
|
Merge branch 'v2.0-release' into v2.1-release
# Conflicts:
# extensions/anysdk/platform/android/src/org/cocos2dx/javascript/SDKWrapper.java
|
2018-10-15 17:42:53 +08:00 |
|
wuzhiming
|
61db1068f8
|
add context getter for appActivity
|
2018-10-10 09:18:46 +08:00 |
|
Jare Guo
|
625aafbf34
|
Merge branch 'v2.0-release' into next
|
2018-07-31 17:27:40 +08:00 |
|
leda
|
ccb40bdeda
|
move CCAsyncTaskPool from cocos/base into extensions folder (#1422)
* move CCAsyncTaskPool path
* move CCAsyncTaskPool path for ios & mac project
* change header path
* adapt CCAsyncTaskPool path for win32
* divide win32 build object files into Debug and Release folder
|
2018-07-26 10:11:55 +08:00 |
|
吴智明
|
bf72d76f14
|
add some support for facebook (#1402)
|
2018-07-24 13:38:35 +08:00 |
|
leda
|
b3b37cf457
|
Add AssetsManager to iOS & Mac & Android & win32 (#1405)
* Add incomplete AssetsManager to iOS & Mac
* remove Android.mk refer on Xcode project config
* re-add assetmanager for android
* re-add assetmanager for win32 project config
* remove unused macro define for win32
* remove unused marco define COCOS2D_JAVASCRIPT
* added header include for assetsManager
* Add CCAsyncTaskPool
* Fix AssetsManager event trigger issue
* update win32 project config, added CCAsyncTaskPool
* add CCAsyncTaskPool to extensions Android.mk
|
2018-07-23 17:50:04 +08:00 |
|
minggo
|
38948b3acc
|
improve anysdk error log
|
2018-06-28 18:15:46 +08:00 |
|
minggo
|
5b8919ccdf
|
merge develop branch
|
2018-06-27 17:27:04 +08:00 |
|
James Chen
|
4da873ecb8
|
Merge branch 'v1.8' into develop
# Conflicts:
# cocos/scripting/js-bindings/script/jsb_cocos2d.js
|
2018-02-23 10:26:48 +08:00 |
|
James Chen
|
e033dc5509
|
Fixes AnySDK framework crash after restarting game. (#1120)
|
2018-02-23 10:21:17 +08:00 |
|
minggo
|
802e48080e
|
New renderer (#1097)
* build work on mac
* build ok on iOS
* fix compiling error on android
* fix android link error
|
2018-02-08 10:40:29 +08:00 |
|
Jare Guo
|
d9bd3d763c
|
update license (#1089)
* updating license
* update license
|
2018-02-01 15:20:01 +08:00 |
|
pandamicro
|
e9913fbf5a
|
Delete old version files during hot update (#1006)
|
2017-11-30 11:08:25 +08:00 |
|
James Chen
|
d904232f95
|
Uses shorter module name (cocos2dx_internal_static -> cis) to avoid compilation errors on Windows system which has a limitation of 260 bytes for build path. (#979)
Yep, probably, we could define `buildDir` variable in build.gradle, but let's investigate later.
|
2017-11-12 09:16:54 +08:00 |
|
James Chen
|
f3f00d5b78
|
Registers correct function name for payForProduct.
|
2017-10-25 13:58:50 +08:00 |
|
James Chen
|
51d95b5732
|
Fixes anysdk test code crash.
|
2017-10-24 22:06:35 +08:00 |
|
Wang Nan
|
61d141629e
|
Merge pull request #904 from 2youyou2/v1.6
add missed anysdk file
|
2017-10-17 00:59:48 -05:00 |
|
yinkaile
|
6bc3fa1464
|
add missed anysdk file
|
2017-10-16 16:31:56 +08:00 |
|
James Chen
|
a301199621
|
EventAssetsManagerEx needs to be allocated on heap since it's the subclass of cocos2d::Ref.
|
2017-10-13 13:39:18 +08:00 |
|
CocosRobot
|
2d01d405dd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-10-10 08:55:16 +00:00 |
|
James Chen
|
412574c670
|
Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
|
2017-10-10 14:48:04 +08:00 |
|
2youyouo2
|
2405d0c917
|
remove unused extensions
|
2017-10-10 10:30:55 +08:00 |
|
James Chen
|
039b3d2642
|
Updates anysdk bindings.
|
2017-10-09 14:58:04 +08:00 |
|
James Chen
|
8f036fbbb0
|
Anysdk works again.
|
2017-09-22 17:39:12 +08:00 |
|
James Chen
|
db53549dfc
|
Adds anysdk bindings configuration.
|
2017-09-22 17:39:00 +08:00 |
|
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 |
|
James Chen
|
fcd6568b91
|
attachChild -> attachObject for anysdk bindings.
|
2017-09-18 17:04:23 +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 |
|
hej
|
198b5dfd50
|
fixed chinese path bug
|
2017-09-06 14:01:47 +08:00 |
|
James Chen
|
c82048bdea
|
Updates Android.mk
|
2017-08-18 15:32:25 +08:00 |
|
James Chen
|
7c889aa691
|
updates SDKManager
|
2017-08-18 14:34:55 +08:00 |
|
pandamicro
|
b946efe457
|
Fix iOS closing app crash in AnySDK
|
2017-08-18 11:56:12 +08:00 |
|
James Chen
|
e7dfb3b0ea
|
updates anysdk binding.
|
2017-08-14 16:31:15 +08:00 |
|
James Chen
|
8e15bc10e8
|
Anysdk binding code updated.
|
2017-08-14 16:01:16 +08:00 |
|
James Chen
|
0fe0580b5f
|
deletes unused files.
|
2017-08-11 11:42:13 +08:00 |
|
pandamicro
|
d2856798eb
|
Fix arm64 crash during restart
|
2017-08-11 11:29:01 +08:00 |
|
pandamicro
|
296d425a8d
|
Ultimate fix for anysdk restart crash issue
|
2017-08-08 17:13:23 +08:00 |
|
pandamicro
|
ff4ca61919
|
Fix anysdk restart issue with old listeners
|
2017-08-07 16:51:09 +08:00 |
|
pandamicro
|
d5792dc1c7
|
Fix anysdk PluginParam finalize issue
|
2017-08-02 17:55:56 +08:00 |
|
pandamicro
|
11110c07e0
|
Fix anysdk missing bindings
|
2017-07-24 15:08:28 +08:00 |
|
pandamicro
|
ea877894f7
|
Fix anysdk auto bindings include
|
2017-06-30 18:02:05 +08:00 |
|
pandamicro
|
e23232ad4c
|
Upgrade anysdk bindings to sm52
|
2017-06-30 18:02:05 +08:00 |
|
pandamicro
|
a5334ed22a
|
Fix can not restart update after failed issue
|
2017-05-16 15:27:30 +08:00 |
|
pandamicro
|
fa5fe36f2e
|
Fix version compare handle setting
|
2017-05-16 15:07:10 +08:00 |
|
pandamicro
|
714ca23e47
|
Check previous updating state to resume
|
2017-05-16 15:06:03 +08:00 |
|
pandamicro
|
bbec08eebb
|
Merge pull request #612 from pandamicro/am
Enhance functionalities of AssetsManager
|
2017-05-04 23:32:52 +08:00 |
|
pandamicro
|
e37196f41d
|
Fix issues with AssetsManager new features
|
2017-05-04 23:32:08 +08:00 |
|
2youyouo2
|
992bb2724c
|
fixed .so not compile to apk
|
2017-05-04 11:01:45 +08:00 |
|