drelaptop
f6cfd5cef1
fix setDataSource parameters error for video player
2018-08-02 10:57:15 +08:00
Jare Guo
7e8cc515ab
bump version
2018-08-02 10:55:01 +08:00
minggo
b3122ea9e5
add a function to terminate application ( #1434 )
2018-08-02 10:46:35 +08:00
吴智明
a2468e5d16
update cocos2d-console ( #1432 )
2018-08-01 13:36:36 +08:00
leda
09a85f1698
correct wrong mTargetState in video player start() method ( #1431 )
2018-08-01 10:03:39 +08:00
Jare Guo
f00565aabf
gulp: also sign simulator on windows ( #1430 )
2018-07-31 17:47:02 +08:00
Jare Guo
625aafbf34
Merge branch 'v2.0-release' into next
2018-07-31 17:27:40 +08:00
PP
e26d484ba2
fix ttf vertical alignment bug ( #1428 )
2018-07-30 11:03:41 +08:00
CocosRobot
79e7497175
[AUTO][ci skip]: updating cocos2dx_files.json
2018-07-26 10:02:03 +00:00
leda
9b775e711d
fix catch font name error when ttf font name with space ( #1423 )
...
* support catch fontName with space when canvas set font
* do same above on android
* improve regex
* add empty loadFont impl for win32 platform
* correct win32 parse font info regex on win32
* add win32 support ttf when font name = font face name
* another space line for win32 platforms
* improve regex when parse font name
* fix regex error
* correct typo
2018-07-26 17:57:25 +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
minggo
fdebbc77b7
dispatch show/hide event to js ( #1424 )
2018-07-26 09:32:37 +08:00
Jare Guo
9d093d28fe
Merge pull request #1421 from cocos-creator/v2.0-release
...
sync branch
2018-07-25 16:02:38 +08:00
leda
3bdbe8dc87
remove proj.android(-studio) files on tools/simulator ( #1420 )
...
* update external config for android libs switch to clang
* remove proj.android(-studio) files on tools/simulator
2018-07-25 11:35:50 +08:00
leda
a816ffd743
modify android config, use clang (c++_static) to build ( #1385 )
...
* correct head file include error
* modify build tool to clang
* remove one useless file include
* remove armeabi files in 2d-x_files
2018-07-25 09:24:29 +08:00
leda
b242a1abd7
call recreate canvas buffer if needed when width/height changes ( #1417 )
...
* add more choice to call recreateBufferIfNeeded for canvas
* win32 - add more choice to call recreateBufferIfNeeded for canvas
2018-07-24 20:33:42 +08:00
CocosRobot
a1993de1de
[AUTO][ci skip]: updating cocos2dx_files.json ( #1416 )
2018-07-24 20:32:46 +08:00
Arnold
02813149b0
fix socket.io version detect error ( #1384 )
2018-07-24 17:42:25 +08:00
CocosRobot
41004c0dd8
[AUTO][ci skip]: updating cocos2dx_files.json ( #1415 )
2018-07-24 17:27:58 +08:00
leda
c048d5642b
change travis branch to v2.0-release ( #1414 )
2018-07-24 17:06:24 +08:00
吴智明
42c1904831
add facebook sdk support ( #1378 )
...
* add facebook sdk support
* add facebook support for default template
* add facebook support for link template
* add another space line
2018-07-24 16:49:54 +08:00
吴智明
bf72d76f14
add some support for facebook ( #1402 )
2018-07-24 13:38:35 +08:00
Jare Guo
85c80cd529
Merge pull request #1410 from cocos-creator/v2.0-release
...
sync branch
2018-07-24 11:46:04 +08:00
Arnold
dfedd27fbb
disable url encode ( #1408 )
2018-07-24 09:40:11 +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
Jare Guo
52905dbc80
Merge pull request #1407 from cocos-creator/v1.9-release
...
sync branch
2018-07-23 14:41:06 +08:00
W-MTZing
5b407f9fc6
add loadImage error callback ( #1406 )
...
* add loadImage error callback
* fix format
2018-07-20 10:59:40 +08:00
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
knox
c6e1d13118
fix EditBox updateDomTextCases bug for fireball/issues/7919
2018-07-19 10:28:16 +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
bfd187d5e3
should not use config.json anymore ( #1394 )
2018-07-17 17:09:52 +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
Jare Guo
ce97e1f6a7
only sign-simulator on deployment machine ( #1386 )
2018-07-12 21:07:01 +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
Jare Guo
9ca8585eca
Merge pull request #1368 from cocos-creator/v1.9-release
...
sync branch
2018-07-04 23:03:30 +08:00
CocosRobot
b801531dd9
[AUTO][ci skip]: updating cocos2dx_files.json ( #1367 )
2018-07-04 22:47:34 +08:00