coulsonwang
4eae48fe4e
fix basic triangle test ( #1962 )
2019-12-03 13:56:25 +08:00
coulsonwang
4247f41b17
Use cmake ( #1955 )
...
* rebase and fix compile error
* fix link issue
* fix compile issue
* fix
* update review
2019-11-27 18:11:21 +08:00
minggo
5dee5e5b35
add cmake support back ( #1949 )
2019-11-26 14:03:47 +08:00
CocosRobot
8674a00e54
[AUTO][ci skip]: updating cocos2dx_files.json ( #1943 )
...
* [ci skip][AUTO]: updating jsbinding automatically
* [AUTO][ci skip]: updating cocos2dx_files.json
2019-11-22 17:51:59 +08:00
pandamicro
d9ba1437fe
Fix compilation issues
2019-11-01 18:29:27 +08:00
pandamicro
bd37c54503
Change assertion.h to Assertion.h
2019-11-01 16:14:45 +08:00
pandamicro
560eb3cfb9
Before change assertion to Assertion
2019-11-01 16:13:48 +08:00
pandamicro
a2701d1f3c
Update to latest
2019-11-01 16:12:42 +08:00
pandamicro
6079321cad
Fix reference
2019-10-30 10:37:00 +08:00
pandamicro
4d75340e30
Import 3d gfx and generate auto bindings
2019-10-29 14:10:11 +08:00
pandamicro
bac263246f
Readd assertion
2019-10-17 15:05:51 +08:00
pandamicro
26ea558266
Remove assertion
2019-10-17 15:05:30 +08:00
pandamicro
7aa8691ca3
Cleanup and add 3d renderer sources
2019-10-17 14:50:54 +08:00
PP
e869bc1b63
fix editBox background color in iOS13 ( #1886 )
2019-10-16 17:43:08 +08:00
owen
17cbe88f39
Fix custom ia mask invalid ( #1882 )
2019-10-15 16:12:30 +08:00
owen
e2b563c694
fix zIndex incorrect ( #1881 )
2019-10-15 10:58:41 +08:00
owen
7715fd9c4b
Fix middleware update crash ( #1879 )
2019-10-14 18:27:29 +08:00
minggo
522a62a395
fix crash if invoked from non c++ context ( #1878 )
...
* fix crash if invoked from non c++ context
For example, this function is invoked in handle block of UIAlert will cause crash.
* fix typo
2019-10-14 18:22:29 +08:00
cary
26dcb6340e
Fix an error when SkinnedMeshRenderer is updated with Uniform. ( #1876 )
...
* Fix an error when SkinnedMeshRenderer is updated with Uniform.
* fix ci and modify custom properties
* change to all typed array
2019-10-12 19:53:32 +08:00
PP
0ab1197c27
refine pause playing audio when enter background ( #1875 )
...
* Revert "Pause music when app enter background (#1849 )"
This reverts commit 7a24ee3377 .
* refine pause playing audio when enter background
2019-10-12 17:02:50 +08:00
cary
70a2134fb4
Fix the display error of the 3D node in the native platform. ( #1868 )
...
* Fix the display error of the 3D node in the native platform.
* Modify the matrix calculation of 3D nodes.
2019-10-12 11:29:48 +08:00
minggo
1013439607
gl context creation error on iPad3 ( #1874 )
...
* gl context creation error on iPad3
* fix crash
2019-10-12 11:28:59 +08:00
owen
302de72b01
fix Spine or DragonBones alpha value incorrect ( #1871 )
2019-10-10 19:43:35 +08:00
yinkaile
a947aeb698
V2.2.0 release android opengl version ( #1870 )
...
* fixed check opengl version onandroid
* refine code
2019-10-10 19:41:54 +08:00
PP
ab086f619e
correct max audio instance on Android ( #1869 )
2019-10-10 19:41:25 +08:00
PP
a7d01f9279
init default color for editBox ( #1866 )
2019-10-09 13:44:02 +08:00
minggo
55450f2fd8
fix crash when restart application ( #1865 )
2019-10-09 11:43:35 +08:00
minggo
b315474f53
fix error that can not stop video if it is played by clicking playback controls ( #1864 )
2019-10-08 11:33:56 +08:00
owen
5a2814f791
Fix Spine or DragonBones color offset bug ( #1863 )
2019-09-30 20:16:20 +08:00
CocosRobot
181ee5b972
[ci skip][AUTO]: updating jsbinding automatically ( #1862 )
2019-09-30 10:07:59 +08:00
cary
887eec1f4d
Modify the 3D sprite to use AssemblerSprite. ( #1861 )
2019-09-30 09:56:45 +08:00
CocosRobot
5e44806392
[ci skip][AUTO]: updating jsbinding automatically ( #1860 )
2019-09-29 23:51:50 +08:00
cary
8b4c993d1b
Fix the matrix calculation of the camera. ( #1859 )
2019-09-29 19:11:56 +08:00
owen
66490fce79
V2.2.0 fix native sprite position incorrect when parent opacity is zero ( #1858 )
...
* Fix sprite position incorrect
* Fix sprite position incorrect
2019-09-27 18:28:13 +08:00
yinkaile
dfa4e85cea
Revert "use jsc on iOS" ( #1856 )
...
This reverts commit 7fbe83c3ee .
2019-09-26 11:40:23 +08:00
Cocos Robot
5f31b1b8ec
Sync branch v2.1.4-release to v2.2.0-release
2019-09-23 16:42:07 +08:00
owen
de023324c7
fix simulator compile error ( #1855 )
2019-09-23 16:30:40 +08:00
Arnold
68d18e3b51
[bugfix] win32 openal state assert failure ( #1852 )
...
* openal: protect play2d from incorrect state
stop playing in incorrect state
* Update cocos/audio/win32/AudioPlayer.cpp
2019-09-23 10:42:57 +08:00
owen
0cd71aefb9
V2.2.0 native Spine and DragonBones cache mode ( #1844 )
...
* Spine cache
* fix dragonbones yDown bug
* Spine cache mode and fix dragonBones yDown bug
* spine cache mode
* dragonbones cache mode
* dragonbones cache mode
* dragonbones cache mode
* spine dragonbones binding
* dragonbones cache mode
* spine dragonbones binding
* optimize dragonbones event
* update dragonbones binding
* dragonbones remove cache
* dragonbones cache mode
* update dragonbones binding
* dragonbones cache mode
* Fix some cache bug
* fix some cache mode bug
* optimize cache mode
* Fix update list order bug
* Fix indent issue
* revert bindings-generator
* Fix intent issue
2019-09-23 10:19:13 +08:00
yinkaile
30b8ab3268
fixed check opengl extension ( #1850 )
2019-09-19 13:37:50 +08:00
minggo
d76a2cfdb8
adjust editbox size to adapter safe arear insets ( #1848 )
2019-09-18 10:07:52 +08:00
Cocos Robot
f77a993d89
Sync branch v2.2.0-release to v2.2.0
2019-09-17 19:52:45 +08:00
Cocos Robot
682a8ed3d7
Sync branch v2.1.3-release to v2.2.0-release
2019-09-17 19:52:38 +08:00
minggo
6c0ca0b16f
ios support GLES 3 ( #1847 )
2019-09-17 15:55:26 +08:00
Knox
c53a28c957
Fixed that video could not play when stopped ( #1846 )
...
* Fixed that video could not play when stopped
* refine code
2019-09-16 18:34:41 +08:00
Cocos Robot
28df061165
Sync branch v2.1.3-release to v2.2.0-release
2019-09-16 16:26:41 +08:00
cary
34159f3c30
Fix bugs of the model orientation on the native platform. ( #1836 )
...
* Fix bugs of the model orientation on the native platform.
* Add camera api export.
* add android change
* modify liensence
2019-09-16 15:02:37 +08:00
minggo
084bcf4443
fix some issues of VideoPlayer on iOS ( #1843 )
...
1. fix the issue that the screen will be black for a while when switch url
2. release AVPlayerController in setting url because the destructor is not invoked sometime, i do not know why
Now just show the AVPlayerController when the video is ready to play.
2019-09-12 18:08:26 +08:00
Jare Guo
c4beb67263
Merge v2.1.3-release into v2.2.0-release
...
# Conflicts:
# cocos/ui/webview/WebViewImpl-ios.mm
2019-09-10 12:55:59 +08:00
minggo
2820e6384b
use WKWebView instead as UIWebView is deleted in iOS 13 ( #1837 )
2019-09-06 11:28:21 +08:00