ColinCollins
7336ea01f1
add the adaptation of the png special format transform to RGBA format ( #1668 )
2019-01-28 10:07:31 +08:00
jimmy
16a5082bd9
修正音乐文件不在OBB时无法加载的bug ( #1611 )
2019-01-28 10:05:07 +08:00
Jare Guo
49052cf85c
Merge pull request #1666 from cocos-creator/v2.0-release
...
sync branch
2019-01-18 16:41:49 +08:00
吴智明
1aa63adca6
allow cleartext HTTP traffic ( #1664 )
2019-01-17 15:36:53 +08:00
leda
c792623707
improve module register logic, include simulator config ( #1665 )
...
* add Configuration settings for simulator, too
* improve module register logic
2019-01-16 11:29:47 +08:00
Jare Guo
4273ee52d8
Merge commit '90b862182c031ed638c579fd5f4c9f35e66bffcb' into v2.1-release
2019-01-15 21:34:39 +08:00
CocosRobot
90b862182c
[AUTO][ci skip]: updating cocos2dx_files.json ( #1663 )
2019-01-14 20:38:43 +08:00
吴智明
3ba70ea84c
fix bug when video is download from server ( #1661 )
2019-01-14 16:27:04 +08:00
吴智明
2f6b44a2fc
Change network module ( #1655 )
...
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for ios platform
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
owen
34ce1580f3
fix when spine add to timer,remove from removelist ( #1659 )
2019-01-14 12:58:22 +08:00
owen
788244869f
Spine upgrade ( #1652 )
...
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* gulp: auto retry when git ref locked
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
2019-01-11 11:48:38 +08:00
owen
65af1b88d0
fix when use multiple dragonbones texture,may not renderer bug ( #1656 )
2019-01-10 20:17:52 +08:00
吴智明
aca87582d3
change macro setting to xcconfig on ios and mac platform ( #1653 )
...
* change macro setting to xcconfig on ios an mac platform
* remove unuse files
2019-01-08 11:48:21 +08:00
leda
391de418d5
correct cocos2dVersion info for v2.1-release
2019-01-04 14:42:19 +08:00
Jare Guo
c4a68148fe
gulp: auto retry when git ref locked
2019-01-02 21:50:10 +08:00
leda
8b9a06010c
add spine & DB macros into android instant template ( #1651 )
2018-12-29 16:13:28 +08:00
owen
c98150697a
fix spine premulti opacity not right when spine alpha not 255 ( #1650 )
2018-12-29 15:21:20 +08:00
leda
ef7bd8a803
simplify video view , fix video view size bug ( #1649 )
2018-12-29 15:19:29 +08:00
leda
6af2435e20
improve error log when require failed by JSB ( #1648 )
...
* add error log when ScriptEngine::evalString failed
* improve require file not existed notify
2018-12-28 16:13:33 +08:00
owen
86a9f80485
fix ios 9 typedarray or arraybuffer send nullptr will crash bug ( #1647 )
2018-12-28 10:48:53 +08:00
Arnold
6916a8a3dc
[httprequest] fix unsafe parser ( #1629 )
...
* [httprequest] fix unsafe parser
* simplify
* use status code
* fix response status text if missing
* allow space
* fix format
2018-12-27 17:39:55 +08:00
leda
626e4a2344
fix simulator relaunch memory free bugs ( #1646 )
...
* improve terminate logic on Simulator
* fix win32 simulator relaunch, error
2018-12-27 16:04:27 +08:00
leda
8b9d3da688
standardize pause & resume logic on GLSurfaceView ( #1645 )
2018-12-27 10:48:59 +08:00
ColinCollins
d40dc5be18
fixed gen error in windows ( #1644 )
2018-12-26 15:25:32 +08:00
leda
831de21f91
adapt jsb2.0 docs to creator 2.x ( #1643 )
2018-12-25 18:08:32 +08:00
Knox
3231150e82
improve get system language code for windows ( #1641 )
2018-12-24 18:44:59 +08:00
Knox
25c9a37ec7
fix getCurrentLanguageCode erro for windows ( #1640 )
2018-12-24 17:10:14 +08:00
Knox
ce0af6d8db
add get system full language ( #1638 )
2018-12-24 14:41:38 +08:00
owen
8284d9e2e6
fix spine pause render error ( #1637 )
2018-12-24 10:25:58 +08:00
leda
57df632830
fix v8 libs path error on mac ( #1636 )
2018-12-21 17:46:42 +08:00
Jare Guo
9017374e1f
gulp: refine git.js
2018-12-20 16:47:56 +08:00
dreamtravel
094ce6b41d
SDKWrapper新增public Context getContext() 接口 ( #1635 )
...
* SDKWrapper新增public Context getContext() 接口
* Update SDKWrapper.java
* Update SDKWrapper.java
* Update SDKWrapper.java
* Update SDKWrapper.java
* Update SDKWrapper.java
2018-12-19 11:03:05 +08:00
owen
5240493448
fix release compile error ( #1634 )
2018-12-18 16:46:58 +08:00
pandamicro
a38c2e80f4
Merge pull request #1632 from sunnylanwanjun/fix-db-shake
...
fix dragonbones shake bug
2018-12-18 15:13:06 +08:00
mac
5315d80bd3
fix dragonbones shake bug
2018-12-18 14:52:36 +08:00
dreamtravel
2794a9da80
调整android instans模版,适配cocos service ( #1631 )
2018-12-18 14:39:28 +08:00
owen
af028c94d3
fix simulator compile error ( #1616 )
2018-12-10 11:01:12 +08:00
CocosRobot
22a6368e77
[AUTO][ci skip]: updating cocos2dx_files.json ( #1626 )
2018-12-07 20:20:32 +08:00
leda
5232eb4121
cocos2dx_files.json update ( #1625 )
2018-12-07 18:41:08 +08:00
owen
c9ebdd81c3
Change bindings-generator sub modules ( #1623 )
...
* Change bingdings-generator sub modules
2018-12-07 18:27:21 +08:00
dreamtravel
79cb270254
remove AnySDK and Cocos Analytics, move both into Creator Service Panel ( #1619 )
...
* 移除cocos-2dx-lite的依赖external中的AnySDK和Cocos Analytics,转移这两者的集成到Service in Creator项目 修改Runtime默认工程,清理模版工程对AnySDK和Cocos Analytics的依赖
* 修改iOS link 模版
* 修改cocos2s-x-lite的deps目标
2018-12-07 17:32:44 +08:00
leda
dc65729a1d
update external to next-9, include v8 upgrade to 6.5 ( #1620 )
...
* update xcode project config
* update external config to next-9
2018-12-07 17:28:30 +08:00
owen
3bc839fe88
Rollback vs version and fix file name capital mistake ( #1613 )
2018-12-05 11:29:38 +08:00
mac
2ba4e07812
Merge branch 'v2.0-test' into v2.1-merge
2018-12-05 10:55:17 +08:00
leda
fe7d70dd32
update V8 to 6.5, update Xcode project config ( #1609 )
...
* update xcode project config
* update external config to next-9
2018-12-05 09:45:42 +08:00
owen
c9c6634e7e
v2.0 skeleton optimize ( #1603 )
...
* v2.0 skeleton optimize
* v2.0 skeleton offical source file
* Rename jsbDragonBones to dragonbones
Rename jsbSpine to spine
Rename editor to middleware
Rename EditorManager to MiddlewareManager
* Rename Macro.h to MiddlewareMacro to avoid duplication of name
* Middleware update by js
* recover other ini generate
* Update cocos2dx-file.json
* createArrayBuffer support null point
* Rename MiddlewareMacro
* skeleton windows 工程
* add checkspace before write buffer
* add math include
* modify dragonBones to dragonbones
* modify dragonBones to dragonbones
* modify dragonBones to dragonbones
* remove useless code
* Change copyright time
2018-12-03 19:58:00 +08:00
leda
626f193daf
always enable v8 debugger source files ( #1607 )
2018-11-26 18:39:41 +08:00
Jare Guo
da43a41815
update readme
2018-11-21 11:57:22 +08:00
leda
1954d0c396
fix typo at jsb_opengl_manual.cpp ( #1604 )
2018-11-20 20:17:21 +08:00
leda
4b568bcc8c
keep 2.0 branch version to 2.0.0, but with 2.1 branch changes ( #1600 )
2018-11-19 14:57:32 +08:00