Jare Guo
db7bfafe39
Merge pull request #1401 from cocos-creator/next
...
sync branch
2018-07-19 13:51:40 +08:00
leda
84326c92b9
addRegisterCallback should done before script engine start ( #1400 )
2018-07-19 10:48:26 +08:00
leda
64643b4922
fix build crash on android when enable AnySDK ( #1397 )
...
* disable anysdk comments in link template
* extra init callback when JNI_OnLoad
* add some comment to explain both init function
* sync changes from link template to default for android
2018-07-19 09:55:51 +08:00
Jare Guo
a32b12cfae
Merge pull request #1393 from cocos-creator/next
...
sync branch
2018-07-16 16:02:40 +08:00
Arnold
ee19b6bcb5
Fix 7817
2018-07-13 18:09:31 +08:00
leda
b78d64a95a
add return 0 in main funtion ( #1391 )
2018-07-13 17:59:24 +08:00
wdzhangchukong
e41cb4dcc8
Fix crash when param type error ( #1390 )
2018-07-13 17:07:17 +08:00
minggo
e299f74392
fix editbox issue ( #1389 )
...
app will crash if missing some properties
2018-07-13 16:22:12 +08:00
minggo
91719d5d94
convert data to RGBA888 when it is not ( #1388 )
2018-07-13 15:28:56 +08:00
Jare Guo
eab1036c96
only sign-simulator on deployment machine (pick from #1386 )
2018-07-12 21:12:50 +08:00
leda
fd29a5c395
fix android text render crash issue ( #1379 )
...
* prevent invalid canvas width and height set
* make restoreContext more stable
* improve canvas init for android
2018-07-10 18:14:06 +08:00
Jare Guo
34825c8b7f
gulp: add update task
2018-07-06 17:57:38 +08:00
leda
74c85cf930
Fix win32 RichTextImage crash, and make test case works ( #1376 )
2018-07-06 17:25:06 +08:00
W-MTZing
daab4eab46
fix locadlstorage api getlength ( #1377 )
2018-07-06 17:03:56 +08:00
CocosRobot
dbfb8d4573
[AUTO][ci skip]: updating cocos2dx_files.json ( #1375 )
2018-07-06 13:40:30 +08:00
wdzhangchukong
83d9a6fbff
Provide loadImage api for runtime ( #1374 )
...
* Provide loadImage api for runtime
* Declare the jsb_global_load
2018-07-06 11:52:29 +08:00
W-MTZing
12d91c2f2d
[feature] localStorage add api getKey and length ( #1371 )
2018-07-06 09:22:38 +08:00
Arnold
c61d61682a
Fix 7818 ( #1370 )
...
* fix : #7818
* fix: 7818
* add callback typecheck, should be function
2018-07-06 09:20: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
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
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