Commit Graph

4804 Commits

Author SHA1 Message Date
owen c8e858a184 Tile map 2019-06-09 23:16:26 +08:00
Cocos Robot fab7bdf6cf Sync branch v2.3.0 to develop 2019-06-09 14:33:18 +08:00
Cocos Robot c81d753e3c Sync branch v2.1.2 to v2.2.0 2019-06-09 14:32:35 +08:00
owen 7c55ce213e modify android.mk 2019-06-06 18:06:26 +08:00
owen e3e7ff5ab8 Renderhandle to Assembler 2019-06-06 17:36:50 +08:00
Arnold 5502000bc6 prevent downloader callbacks when app exits (#1763) 2019-06-04 02:21:04 -07:00
Arnold e0a6e1e7ab prevent downloader callbacks when app exits (#1751) 2019-06-04 01:28:58 -07:00
minggo 057537d47f Copy-paste mistake fix in handling GL_COMMAND_UNIFORM_4FV (#1760) (#1762) 2019-06-03 23:49:41 -07:00
minggo 124a6e297e fix memory leak in loading font on iOS/mac (#1761) 2019-06-03 23:36:06 -07:00
minggo 5e6446e300 fix memory leak in loading font on iOS/mac (#1752) 2019-06-03 00:32:43 -07:00
James Chen 7ffc5aa337 Copy-paste mistake fix in handling GL_COMMAND_UNIFORM_4FV (#1760) 2019-06-03 00:32:22 -07:00
owen 1b76013f11 V2.1.2 fix spine crash (#1758)
* fix spine will crash when load/unload spine res frequently

* refine code
2019-05-31 16:50:12 +08:00
owen 67ede273c3 omit some code (#1755) 2019-05-30 15:32:51 +08:00
owen 27976a78c9 V2.2.0 spine 3.7 (#1754)
* Remove old library

* upgrade spine

* Remove old files

* upgrade spine

* Upgrade spine

* Upgrade spine

* Roll back to 3.7

* Replace tab to 4 space

* Support spine vertex effect
Add mesh debug graphics

* modify license

* Modify cocos2dx-files.json

* Add bounding box

* Add bounding box

* Refine code
2019-05-29 17:38:46 +08:00
Cocos Robot 511ae6684b Sync branch v2.3.0 to develop 2019-05-28 19:49:42 +08:00
Cocos Robot 99bda05345 Sync branch v2.1.2 to v2.2.0 2019-05-28 19:49:23 +08:00
Arnold 029a94612d add okio-1.15.0.jar (#1750) 2019-05-28 01:42:43 -07:00
Jare Guo c61370ac5f gulp: force bypass npm proxy on windows 2019-05-27 21:11:02 +08:00
Jare Guo b17b6b38a3 update readme 2019-05-27 19:53:44 +08:00
Arnold 7e6d0598e1 fix bad suggestion (#1747) 2019-05-27 01:59:20 -07:00
Knox b8a774f018 fix outline display error (#1748) 2019-05-27 15:31:01 +08:00
owen 8f4a486013 Native renderer
Native renderer

Native renderer

native renderer

native renderer
2019-05-26 16:34:10 +08:00
Cocos Robot 5fc76c4fad Sync branch v2.3.0 to develop 2019-05-26 14:49:26 +08:00
Cocos Robot 4251369943 Sync branch v2.1.2 to v2.2.0 2019-05-26 14:48:54 +08:00
owen 370956a0c0 Fix spine crash when resource missing (#1745)
* Fix spine crash when resource missing

* Fix spine renderer error

* Fix spine renderer error
2019-05-23 19:14:23 +08:00
Cocos Robot b09a339e63 Sync branch v2.3.0 to develop 2019-05-23 16:38:24 +08:00
Cocos Robot 2b776a2d4d Sync branch v2.1.2 to v2.2.0 2019-05-23 16:37:54 +08:00
Arnold 3d35c5b444 Protect native allocated typed array from being GC (#1744)
* protect Uint8Array

* fix cond

* auto root in Data_to_seval
2019-05-23 14:08:10 +08:00
Wenhai Lin 7e2031296a Replace Android HttpClient with OkHttp (#1731)
* Remove the code of http client

* Replace Android HttpClient with OkHttp
2019-05-21 18:49:39 -07:00
wuzhiming 7a19c65d52 add script engine initialize check when evalString from native 2019-05-20 11:03:03 +08:00
owen 9d3d582df8 Update binding generator 2019-05-16 20:27:49 +08:00
owen dc12a933e7 modify project 2019-05-16 20:20:57 +08:00
owen d7a88d240e Sync native renderer to v2.3 2019-05-16 19:33:23 +08:00
cary c8a00942a0 Fix the black border of the label on the Win32 platform. (#1741) (#1742)
* Fix the black border of the label on the Win32 platform.

* fix indent

* fix indent

* Optimize data copy.
2019-05-16 17:25:53 +08:00
Cocos Robot 7afbeed3ac Sync branch v2.3.0 to develop 2019-05-15 22:10:37 +08:00
Cocos Robot 7a75c70f8c Sync branch v2.1.2 to v2.2.0 2019-05-15 22:10:00 +08:00
cary 4d1fa27346 Fix the black border of the label on the Win32 platform. (#1741)
* Fix the black border of the label on the Win32 platform.

* fix indent

* fix indent

* Optimize data copy.
2019-05-15 15:23:35 +08:00
Jare Guo 84bf22719c ios build fail bug fix (#1736)
+ https://github.com/cocos-creator/cocos2d-x-lite/issues/1735
2019-05-15 15:19:41 +08:00
Yehsam23 06310ca1a8 WebView add background transparent (#1727)
* WebView add background transparent

* Android WebView remove reflection
2019-05-15 15:17:55 +08:00
Knox 871476343c improve convert draw y point calculate for 2d-tasks/issues/1378 (#1739)
* improve convert draw y point calculate for 2d-tasks/issues/1378

* update comment

* improve convert draw y point calculate for android

* improve convert draw y point calculate for win32
2019-05-13 16:53:42 +08:00
masteage 969fb15300 ios build fail bug fix
+ https://github.com/cocos-creator/cocos2d-x-lite/issues/1735
2019-04-29 17:25:40 +09:00
Jare Guo 92808b3881 Merge branch 'v2.0.10' into v2.1.1-release 2019-04-26 16:48:31 +08:00
江湖人称骚哥 0d8f8f8f7b Fix bug on ios, getNetworkType return None while network status is ReachableViaWWAN (#1734) 2019-04-26 16:42:37 +08:00
Cocos Robot 360c6c1f82 Sync branch v2.0.10 to v2.1.1-release 2019-04-25 20:06:46 +08:00
Arnold d88d4ffead Use smart pointers to hold references of global Application::_scheduler (#1732)
* use std::weak_ptr

* revert build/libcocos2d.vcxproj

* fix mac & ios & android

* declare variable in if block

* revert build/libcocos2d.vcxproj
2019-04-25 18:43:01 +08:00
owen 0edef1a7b5 Fix dragonbnoes slot displayIndex invalid in native platform bug (#1730) 2019-04-25 13:51:20 +08:00
cary 57554f4ed9 Fix the fillRect method implementation of the win32 platform. (#1728)
* Fix the fillRect method implementation of the win32 platform.

* fix indent
2019-04-22 18:19:18 +08:00
Arnold a9e182967f Prevent XMLHttpRequest from being gc incorrectly, when timeout occurs. (#1724)
* gc on response

* fix state

* add comment

* prevent multiple send

* revert bindings-generator

* rename _isSend to _isSending
2019-04-22 13:08:00 +08:00
Jare Guo 3abfc68277 Merge branch 'v2.0.10' into v2.0-release 2019-04-20 15:51:35 +08:00
Jare Guo 1a72892bb5 gulp: unified push tag in fireball 2019-04-20 15:50:55 +08:00