Commit Graph

4804 Commits

Author SHA1 Message Date
Jare Guo 276ea2c989 gulp: add update task (#1366) 2018-07-04 20:54:26 +08:00
leda 076c7edc3a fix win32 release mode compile failed (#1364)
* correct libcocos2d win32 release mode compile error

* sync release include files with debug

* correct typo error
2018-07-04 20:16:43 +08:00
leda a142b03938 fix default template android lib path error (#1362) 2018-07-04 16:00:53 +08:00
Knox 2a93a220d5 import java.util.regex.Matcher and Pattern package to Cocos2dxEditBox.java (#1361) 2018-07-04 15:59:57 +08:00
leda 586ac75cfa remove proj.android in template config (#1358) 2018-07-03 14:05:40 +08:00
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 538f4b5df0 correct seLog declare error (#1356) 2018-07-02 20:54:24 +08:00
Knox d3d6e8865c fix fireball/issues/7726 (#1339)
* fix fireball/issues/7726

* refine code
2018-07-02 15:23:51 +08:00
minggo 25bf7c5162 Remove jar (#1351)
* readd jar files

* remove unneeded file
2018-06-29 15:51:21 +08:00
minggo 3d51994bc8 readd jar files (#1350) 2018-06-29 15:47:06 +08:00
minggo 5b7cbcd9e7 Analytics issue (#1347)
* fix template compiling error on android

* fix compiling error on android
2018-06-29 15:26:40 +08:00
minggo 6c9b3f9b4a fix template compiling error on android (#1345) 2018-06-29 14:56:30 +08:00
minggo 38948b3acc improve anysdk error log 2018-06-28 18:15:46 +08:00
minggo ea8a45b14f Merge branch 'next' of github.com:cocos-creator/cocos2d-x-lite into merge-develop 2018-06-28 17:49:31 +08:00
W-MTZing 715ac5ae73 [bug] vibrate api Compatible with the higher version SDK (#1341) 2018-06-28 17:48:41 +08:00
minggo 3d561fa281 Merge branch 'next' of github.com:cocos-creator/cocos2d-x-lite into merge-develop 2018-06-28 16:38:39 +08:00
leda c9d7f54668 fix build error on win32/ios when using console (#1340) 2018-06-28 16:37:28 +08:00
minggo 9705967973 move analytics codes to game activity 2018-06-28 16:05:04 +08:00
leda 1d1c375516 correct copy jsb-adapter folder when build (#1338)
* update win32 build custom copy script

* update gradle build script

* update ios/macos project config
2018-06-28 13:50:24 +08:00
Jare Guo b15cecb91b remove gen-libs (#1334) 2018-06-28 13:49:45 +08:00
minggo 775d9c7803 Merge branch 'next' of github.com:cocos-creator/cocos2d-x-lite into merge-develop 2018-06-28 11:22:02 +08:00
minggo 8e86f09df8 remove unneeded js script 2018-06-28 10:47:49 +08:00
leda 8a5db64163 correct label render contex2d (#1333)
* update label render

* refine code, easier to understand

* correct measure text error for Chinese characters

* comment debug info print

* format code style

* correct draw text length parameter
2018-06-27 18:07:57 +08:00
minggo 5b8919ccdf merge develop branch 2018-06-27 17:27:04 +08:00
PP 7e6ca8a445 change jsb.js load path (#1335) 2018-06-27 15:52:50 +08:00
minggo 14c2523bfb change branch to run travis (#1332) 2018-06-27 11:25:25 +08:00
minggo 73e0109366 editbox support on windows (#1331) 2018-06-27 11:21:32 +08:00
Jare Guo fe9ddce320 sync some files with develop (#1329) 2018-06-27 11:11:01 +08:00
leda 3d32cc3968 [Not Finished] win32 Text Rendering Context2D works (#1330)
* part added canvas interface

* try to re-use the font logic at device

* shows most simple label, works

* refine getTexture data

* add drawpoint convert

* correct point offset error

* refine method imput parameters

* little refine
2018-06-27 09:37:02 +08:00
minggo 09060d3709 fix size issue and typo (#1328) 2018-06-25 18:23:43 +08:00
CocosRobot e99332cb32 [AUTO][ci skip]: updating cocos2dx_files.json (#1327) 2018-06-25 07:46:56 +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
minggo ffdbdd44fb improve editbox on mac (#1324)
* support password
* support length limitation
* prevent enter key in single line mode
2018-06-21 16:14:53 +08:00
CocosRobot af573ff5c2 [AUTO][ci skip]: updating cocos2dx_files.json (#1323) 2018-06-21 09:36:00 +08:00
minggo 467b0346ce editbox support mac (#1322) 2018-06-21 09:25:56 +08:00
wuzhiming bc31a3993a use gzip to decompress js content 2018-06-19 15:44:12 +08:00
W-MTZing 888e1fb4d6 [adjust]change cocos2dxHelper.java function api vibrate SDK Version judgment (#1316) 2018-06-19 10:42:30 +08:00
James Chen 7264cdbdde Fix CC_TARGET_PLATFORM typo. (#1318) 2018-06-18 14:26:46 +08:00
吴智明 bdf1825dbf remove unused config.json file (#1312)
* remove unused config.json file

* remove config.json from win32
2018-06-15 14:45:26 +08:00
minggo 1b55dbdfd4 fix bug that keyboard type is not changed when using passward on iOS (#1315) 2018-06-15 14:07:33 +08:00
minggo 4e12753fff add reflection back (#1314) 2018-06-15 10:41:51 +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
leda 602636c855 link template works on mac, ios, android studio (#1310)
* re-add cocos-analytics for iOS

* include jsb_cocos2dx_network_manual into xcode project

* add jsb_module_register into cocos2d_libs xcode proj

* ios, mac link template adapt

* link template adapt for android studio

* add external a line space for gitignore

* update the returen value of cocos2dVersion()

* change "Cocos Runtime" into "Cocos Game" for template project
2018-06-11 17:21:42 +08:00
CocosRobot e6c3a892f3 [AUTO][ci skip]: updating cocos2dx_files.json (#1309) 2018-06-11 07:46:16 +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
leda f82a4782ff default template works on iOS (#1304)
* adapt ios controller, run success on ios device

* improve app controller by research runtime example
2018-06-07 17:07:17 +08:00
James Chen c7801b75f8 Minor fixes while running on macOS with V8 script engine. (#1305) 2018-06-07 16:08:06 +08:00