Commit Graph

358 Commits

Author SHA1 Message Date
leda 968678775c remove proj.android files for creator2.0 (#1352)
* remove proj.android files

* sync cocos-console changes
2018-07-03 10:46:40 +08:00
Jare Guo be4c60343a fix simulator error (#1357)
* fix windows sdk version of simulator

* gulp: remove update-simulator-script
2018-07-03 09:55:52 +08:00
leda c9d7f54668 fix build error on win32/ios when using console (#1340) 2018-06-28 16:37:28 +08:00
PP 7e6ca8a445 change jsb.js load path (#1335) 2018-06-27 15:52:50 +08:00
leda 113ef05feb fix win32 simulator compile/link error, no fix when running (#1326)
* update simulator win

* add libcocos2d depend for simulator

* compile and link success

* update simulator win, add part window control
2018-06-22 17:26:53 +08:00
leda 723f52a472 win32 link/default template compile and link pass, but not works when run (#1321)
* modify file changes on project config

* correct libcocos2d compile

* add win32 props back

* Revert "fix windows link template (#1138)"

This reverts commit 332d95e5b8.

* correct compile error

* many link errors need to be solved

* added part lack methods

* add empty impl for canvas rendering context 2d

* update main.cpp

* correct audio/network compile and link error

* sync win32 application logic with mac

* remove wrong change on application-win32

* correct win32 default-template compile and link error

* win32 simulator part compile error fixed

* editbox define changes
2018-06-22 10:19:31 +08:00
leda 19552e0dd4 gen-simulator works on mac, but not full features (#1313)
* fix part of warnings

* avoid all compile errors

* remove part lua related

* remove useless comment

* add function to get glfwWindow

* improve comment

* correct group files at platform folder

* update gulp simulator script copy
2018-06-14 14:23:16 +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
minggo ec1fb11244 ignore some files (#1297) 2018-06-06 15:15:06 +08:00
minggo 888433c819 fix travis error (#1295) 2018-06-06 14:48:19 +08:00
minggo 616c566c33 print log message (#1294) 2018-06-06 14:24:56 +08:00
minggo 2c9a52d667 fix secure issue (#1292)
* fix secure issue

* check variable in its file
2018-06-06 09:58:44 +08:00
minggo 83def20953 use ndk r16b in travis (#1290) 2018-06-05 12:07:19 +08:00
minggo a0c139a61d check binding logic when sending a pull request (#1289) 2018-06-05 11:25:34 +08:00
minggo 8c708f880a fix path issue (#1288) 2018-06-05 10:49:23 +08:00
minggo 9d807ec642 fix tar usage (#1287) 2018-06-05 10:33:08 +08:00
minggo b1074926ab fix travis issue (#1286)
* fix extract file path

* download clang
2018-06-05 09:54:16 +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 ef2b666f38 update binding gererator (#1255) 2018-05-22 09:49:21 +08:00
minggo ccc8691029 fix crash when parsing Effect property (#1254) 2018-05-22 09:32:06 +08:00
James Chen 04fa653ab0 Updates bindings-generator to official repo. (#1251) 2018-05-21 14:08:20 +08:00
minggo 9ca6dac357 fix musk issue (#1231) 2018-05-08 11:21:41 +08:00
minggo d98484654f Optimize (#1202)
* fix some bugs

* fix binding codes of Texture2D::updateSubImage()
2018-04-20 14:31:52 +08:00
minggo 0505ee928a Optimize (#1199)
* optimize performace

* optimize performance
2018-04-18 17:47:46 +08:00
minggo 59d24e1fdc fix memory leaks (#1192) 2018-04-12 16:07:21 +08:00
minggo 3113af6176 optimize performance (#1191) 2018-04-12 11:44:11 +08:00
minggo ba8944c72a Optimize (#1190)
* h5 adapt

* don't bind Technique, Effect, Pass and Model
2018-04-11 11:32:33 +08:00
minggo 2ba3e815d2 h5 adapt (#1176) 2018-03-30 17:57:38 +08:00
minggo f4e3f9e8f6 adapt h5 (#1170) 2018-03-28 09:47:05 +08:00
James Chen 4ee7981630 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
# Conflicts:
#	cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm
#	cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp
2018-03-23 15:42:12 +08:00
minggo 0be49352d0 H5 adapt merge (#1164)
* h5 adpator

* adapt to h5 engine
2018-03-23 15:26:09 +08:00
minggo 610658e5a6 h5 adpator (#1156) 2018-03-21 09:30:05 +08:00
James Chen bf1b4f7124 [runtime] Audio works. (#1151) 2018-03-17 11:22:56 +08:00
James Chen 4eccfbcba8 Mac font display ok. 2018-03-08 17:38:45 +08:00
James Chen 7beded3156 Canvas binding fix. 2018-03-07 18:45:20 +08:00
James Chen e00e0e0f86 Updates bindings-generator. 2018-03-07 10:05:36 +08:00
James Chen 0dc072baab More WebGL binding fixes. 2018-03-07 10:04:20 +08:00
James Chen 71f0678287 Updates gfx.ini 2018-03-07 09:59:40 +08:00
James Chen 6721db7bc6 Updates gfx/renderer auto binding code and ini configuration. 2018-03-07 09:59:26 +08:00
James Chen 3af301306a Rename Effect.setDefineValue to Effect.define. 2018-03-01 13:46:57 +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
James Chen 69798998db Adds cc.sys.getBatteryLevel & cc.sys.getNetworkType APIs (#1071)
* Adds cc.Device.getBatteryLevel interface.

* Adds CCReachability.h/.cpp

* Adds CCReachability.h/.cpp

* Reachability supports macOS either.

* Adds cc.Device.getNetworkStatus interface.

* Removed debug log.

* cc.Device.NetworkStatus -> cc.Device.NetworkType

* API to sys namespace

* Update CCDevice-win32.cpp
2018-01-29 17:37:15 +08:00
James Chen e8d11d07f7 Updates bindings-generator, adds missing se ns (#1047) 2017-12-29 11:19:43 +08:00
James Chen 901f4fa50c Auto hide home indicator for iPhoneX. (#1013) 2017-11-28 13:36:14 +08:00
James Chen cdad6b5868 Some Android Simulators don't support SSE instruction, so disable it for x86 arch. (#1011) 2017-11-23 15:13:34 +08:00
James Chen 4a61e1423f Re-binds OpenGL interfaces. (#976)
* Adds opengl bindings code.

* Register OPENGL module.

* Updates Android.mk

* Updates win32 project configuration.

* Supports boolean -> integer conversion.

* glXXXXv count fix.

* GLNode needs to inherit from Node.

* Updates bindings.

* size fix in JSB_glGetUniformfv.

* JSB_glGetSupportedExtensions fix.
2017-11-14 18:05:14 +08:00
James Chen e5e616b794 Updates console. 2017-11-07 17:05:49 +08:00
James Chen 7739e2c47d Updates template AndroidManifest.xml. 2017-11-07 16:05:44 +08:00