minggo
95315c1a73
V2.1.3 update v8 android ( #1817 )
...
* use ndk's stl
* update external version: update v8
2019-08-30 17:37:58 +08:00
minggo
57fd102dd5
fix compling error on android x86
2019-07-26 11:34:57 +08:00
minggo
fbc69aebeb
can build and run on android, but will crash
2019-07-12 10:36:21 +08:00
leda
c792623707
improve module register logic, include simulator config ( #1665 )
...
* add Configuration settings for simulator, too
* improve module register logic
2019-01-16 11:29:47 +08:00
吴智明
2f6b44a2fc
Change network module ( #1655 )
...
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for ios platform
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
owen
c9c6634e7e
v2.0 skeleton optimize ( #1603 )
...
* v2.0 skeleton optimize
* v2.0 skeleton offical source file
* Rename jsbDragonBones to dragonbones
Rename jsbSpine to spine
Rename editor to middleware
Rename EditorManager to MiddlewareManager
* Rename Macro.h to MiddlewareMacro to avoid duplication of name
* Middleware update by js
* recover other ini generate
* Update cocos2dx-file.json
* createArrayBuffer support null point
* Rename MiddlewareMacro
* skeleton windows 工程
* add checkspace before write buffer
* add math include
* modify dragonBones to dragonbones
* modify dragonBones to dragonbones
* modify dragonBones to dragonbones
* remove useless code
* Change copyright time
2018-12-03 19:58:00 +08:00
leda
626f193daf
always enable v8 debugger source files ( #1607 )
2018-11-26 18:39:41 +08:00
wdzhangchukong
1b99f965eb
Add USE_V8_DEBUGGER to control chrome debugger ( #1594 )
...
* Add USE_V8_DEBUGGER to control chrome debugger
* Add USE_V8_DEBUGGER in ccConfig.h
* Fix error
* Define macro in config.hpp
2018-11-14 18:17:05 +08:00
Arnold
2dab6b175e
[android] add compile switch for libtiff ( #1565 )
...
* add switch for libtiff
* add macro
* revert cocos2dx-files.json
* add more macro
* update default value
* update external/config.json
2018-10-29 10:15:38 +08:00
leda
c6fbabc6f4
separate v8 debugger from android release build ( #1551 )
...
* seprate v8 debugger from release build
* update xcode project config
* update win32 project config
* update external config
2018-10-19 12:45:11 +08:00
leda
71d8cf11ad
refine native module separate ( #1547 )
...
* refine module separate -> gfx renderer
* refine module separate
* modify Application.mk, add macro
* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”
* improve macro define in binding code
2018-10-18 09:10:05 +08:00
leda
73f62c9da6
enable Proguard for release build on Android ( #1545 )
...
* enable Proguard for release build to reduce apk size
* add Proguard to default template
* consider anysdk at proguard
* remove un-used permissions
* disbale gfx & renderer binding register
2018-10-16 18:35:18 +08:00
leda
89af43e38f
switch video player bind code from "manual" to "auto" ( #1537 )
...
* refine video bind, tested on iOS
* adapt Android.mk
2018-10-10 17:22:19 +08:00
leda
c8e145dadb
Re-added WebView on iOS & Android for Creator 2.1 ( #1535 )
...
* init add webview files form creator 1.10
* refine header & namespace to compile works
* add webview auto bindings, need check manually
* update webview auto bind
* add setFrame interface to support set View Rect
* uniform file name with other ui modules
* adapt to iOS
2018-10-10 16:03:23 +08:00
leda
c17130862c
Re-added VideoPlayer on iOS & Android for Creator 2.1 ( #1531 )
...
* add video player source for ios and android.
* revert un-clearly changes
* add iOS files into project config files
* remove useless declare property on 2d-x-lite
2018-10-08 15:28:19 +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
4e12753fff
add reflection back ( #1314 )
2018-06-15 10:41:51 +08:00
leda
89901807a5
default template works on android studio ( #1307 )
...
* adapt android studio build config files, compile success
* remove hard coded sign info
* remove -DHAVE_INSPECTOR, it have been defined in config.hpp
* remove anysdk related code
* revert wrong remove of anysdk and CocosAnalytics
2018-06-08 15:05:33 +08:00
Vincent Yang
8f6e9adbe1
[feature] CCDownloader add header and abort support. ( #1291 )
...
* [feature] android implement recieve http header param, handle it in android http request (#2 )
* [feature] Recieve http header param, handle it in android http request
* [feature] implement abort and header api
* /2.0 -> /2
* remove task when abort
* [feature] Implement ios and mac downloader abort api (#3 )
* [feature] Implement ios and mac downloader abort api
* use DLLOG to show log
* judge NSURLSessionTask state with NSURLErrorCancelled
* [adjust] Modify downloader from auto bind to manually (#4 )
* [adjust] Modify Downloader createDownloadFileTask api from auto bind to manually
* Modify ini file
* [bug] fix Cocos2dxDownloader.java syntax error
* [bug] CCDownloader-android creatCoTask don't deleteLocalRef header str
2018-06-07 22:19:03 +08:00
James Chen
da45e32ada
Removes unused files and code. ( #1277 )
2018-05-31 17:58:35 +08:00
James Chen
712173a8de
Supports DeviceMotionEvent and removes more unused code. ( #1275 )
...
* Binds Device class
* Removes ccFPSImage.c/h
* Updates Android.mk
* Supports DeviceMotionEvent and removes more unused code.
* Uses fprintf to implement SE_LOGD & SE_LOGE .
2018-05-31 14:08:20 +08:00
minggo
7235644283
Editbox support ( #1270 )
...
can work on Android
2018-05-28 17:09:57 +08:00
minggo
4a13d0e15e
Downsample ( #1245 )
...
* support render texture
* use texture unit 0
* add functions to set device pixel ratio
* add ccDeleteBuffers again
* fix according comments
2018-05-17 14:05:05 +08:00
minggo
12676d6f2b
put debug related files into debugger folder
2018-04-28 14:37:09 +08:00
minggo
87a4301d8f
unify js_loadImage ( #1210 )
...
* fix Texture2D::addSubImage()
* unify the logic of js_loadImage
* simplify codes
2018-04-24 16:27:03 +08:00
James Chen
3dfe05f4cc
glBindXXX glActiveTexture cache.
2018-04-14 13:43:44 +08:00
James Chen
7667b00f87
More WebGL binding fixes. ( #1160 )
...
* Less opengl binding files.
* recreateBuffer in CanvasRendereringContext2D constructor.
* gl.bindFrameBuffer(gl.FRAME_BUFFER, null) needs to set to default frame buffer .
* Fixes JSB_glGetActiveUniform use GL_ACTIVE_ATTRIBUTE_MAX_LENGTH to get the max length, we need to use GL_ACTIVE_UNIFORM_MAX_LENGTH instead.
* glBufferSubData supports typedarray with 0 length. Adds more API for CanvasRenderingContext2D.
2018-03-22 16:03:34 +08:00
James Chen
febfbe67df
Custom TTF font is supported for Android too. ( #1155 )
2018-03-20 15:49:25 +08:00
James Chen
bf1b4f7124
[runtime] Audio works. ( #1151 )
2018-03-17 11:22:56 +08:00
James Chen
9b2aaf1cd0
getImageInfo is async method now. Clear autoreleasepool at the end of frame. ( #1150 )
2018-03-17 09:48:32 +08:00
James Chen
f0a79242d7
Android compile ok. ( #1145 )
...
* Android compile ok.
* Fixes for Android build .
2018-03-14 10:28:03 +08:00
minggo
0d483a9b07
add back network ( #1141 )
...
* add back network
* add network back on windows
2018-03-09 16:20:48 +08:00
minggo
aebdc1c77f
fix compiling isssue of link template on iOS, Mac and Android ( #1139 )
2018-03-07 17:06:15 +08:00
minggo
cd0e15cd7f
refactor android with new renderer ( #1133 )
2018-02-28 14:55:33 +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
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
2youyouo2
bc8c5c1bee
add xxtea support
2017-09-27 16:03:07 +08:00
Jare Guo
1ea2fc1715
revert TextureCache, use ThreadPool instead
2017-09-26 10:18:01 +08:00
James Chen
101b763c0f
Fixes compilation errors after merging develop branch.
2017-08-11 09:29:39 +08:00
James Chen
7653cb453f
Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/Android.mk
# cocos/editor-support/creator/CCCameraNode.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.h
# cocos/network/SocketIO.cpp
# cocos/network/WebSocket-libwebsockets.cpp
# cocos/renderer/CCTextureCache.cpp
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp
# 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_dragonbones_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_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/auto/jsb_cocos2dx_extension_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.hpp
# cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.h
# cocos/scripting/js-bindings/manual/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.cpp
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/creator/js_bindings_creator_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp
# cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp
# cocos/scripting/js-bindings/manual/js_bindings_config.h
# cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.h
# cocos/scripting/js-bindings/manual/js_module_register.cpp
# cocos/scripting/js-bindings/manual/js_module_register.h
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h
# cocos/scripting/js-bindings/manual/jsb_helper.h
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.h
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.h
# cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.h
# cocos/scripting/js-bindings/manual/network/jsb_socketio.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/android/CCJavascriptJavaBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.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_boot.js
# tools/bindings-generator
# tools/tojs/cocos2dx.ini
# tools/tojs/genbindings.py
2017-08-10 18:04:24 +08:00
James Chen
e719caa583
updates android.mk
2017-08-10 16:55:40 +08:00
pandamicro
7194ea7611
Fix android gen libs issue
2017-07-06 16:01:35 +08:00
pandamicro
450ad5b4d5
Add cocos ui static dependency
2017-07-05 11:34:53 +08:00
pandamicro
99206af737
Remove useless module and preprocess macros
2017-07-04 16:35:17 +08:00
James Chen
05a893a08b
printf -> LOGD
2017-06-23 13:44:18 +08:00
2youyouo2
d6ab74a55e
support physics on android
2017-03-10 10:01:36 +08:00
zhangbin
4a1ecf17ac
Solve the error when building android platform.
2017-01-09 13:33:47 +08:00
zhangbin
ed591faa19
Merge branch 'develop' into dragonbones
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# external/config.json
2016-09-08 09:52:09 +08:00
pandamicro
86ae89f85f
Fix win32 compilation issues
2016-09-01 10:38:54 +08:00
zhangbin
1f9d49dbfe
Update the project files for dragon bones.
2016-08-30 14:22:50 +08:00