Commit Graph

30345 Commits

Author SHA1 Message Date
Dale Stammen f778b02aa0 updated js template files for Windows 8.1 Universal App 2015-06-03 09:25:19 -07:00
Dale Stammen 38c9490f4d don't delete rendering thread. SpiderMonkey needs to stay on same thread 2015-06-03 09:19:05 -07:00
yinjimmy b1e40a98b0 fix simulator compile error 2015-06-03 22:58:25 +08:00
gyf19 164e4c8314 HttpClient Android supports gzip 2015-06-03 19:41:14 +08:00
Namezero c09e280b58 JumpTo::clone() results in incorrect end position
JumpTo::clone() passes incorrect value to (_delta) to create() rather than _endPosition
2015-06-03 13:14:11 +02:00
Namezero 89915a084c Blink::stop() access violation
Blink::stop() is calles twice when inside a Repeat action. This results in an access violation
2015-06-03 12:39:16 +02:00
samuele3hu 0cccd6e765 Fix compile error on the Linux and update the test cases 2015-06-03 18:12:21 +08:00
yangxiao 17b53efcb8 wrong quotation 2015-06-03 17:31:50 +08:00
yangxiao ebf1180b04 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2 2015-06-03 17:02:33 +08:00
yangxiao 8afbefec15 to depency59 2015-06-03 17:01:36 +08:00
WenhaiLin ffa7dc6b5a Label:Fixed letter spacing may be wrong. 2015-06-03 16:28:44 +08:00
子龙山人 883f250f6a Merge pull request #12137 from WenhaiLin/v3-text-line-height
Fixed the text line height calculation is wrong with system font on Android.
2015-06-03 16:24:38 +08:00
zhangcheng a51a32fa9d 1, add onEnter and onExit of components to CCNode's onEnter and onExit function. 2015-06-03 15:10:48 +08:00
XiaoYang eec48078d0 Merge pull request #339 from zhukaixy/Branch_navigation2_mru
configure recast project for win8.1 project
2015-06-03 14:47:29 +08:00
zhukaixy cf24623e26 configure recast project for win8.1 project(js) 2015-06-03 14:42:37 +08:00
Ricardo Quesada b8957b176a fixes win compilation issues 2015-06-02 23:31:57 -07:00
zhukaixy 76ad42bb0b configure recast project for win8.1 project 2015-06-03 14:31:12 +08:00
yangxiao 2c0e7a04ed Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2 2015-06-03 11:48:23 +08:00
XiaoYang 249997ef7a Merge pull request #338 from super626/revert-337-navigation2
Revert "configure project for navigation on win8.1"
2015-06-03 11:47:14 +08:00
XiaoYang 6be4ab502a Revert "configure project for navigation on win8.1" 2015-06-03 11:46:28 +08:00
yangxiao 06fd083d07 add recast to js project 2015-06-03 11:45:49 +08:00
pandamicro 413b22d9f9 Merge pull request #12139 from jianglong0156/webviewandvideo
webview and videoplayer test case bug fix
2015-06-03 10:10:08 +08:00
Ricardo Quesada 872e4f5a4f removes logging 2015-06-02 17:50:34 -07:00
Ricardo Quesada ff81078062 fixes bug when calculating the dynamic values 2015-06-02 17:48:50 -07:00
Ricardo Quesada 5f6f38616a Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms 2015-06-02 17:05:05 -07:00
Ricardo Quesada 87a3a1844a Adds support for Autobindings in Shader
...part of Material
2015-06-02 16:56:59 -07:00
samuele3hu a20681aa21 Add Lua-bindings for NavMesh 2015-06-02 18:37:57 +08:00
XiaoYang ea57c9ac66 Merge pull request #337 from zhukaixy/navigation2
configure project for navigation on win8.1
2015-06-02 18:17:08 +08:00
子龙山人 9bde2f5bb6 Merge pull request #12140 from CocosRobot/update_cocosfiles_1433238001
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-02 17:43:12 +08:00
jianglong0156 271dd3dbaa Merge branch '2d-xv3' into webviewandvideo 2015-06-02 17:40:27 +08:00
CocosRobot f306edee8b [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 09:40:03 +00:00
pandamicro 613e0f73b7 Merge pull request #12095 from jianglong0156/videoplayer
add videoplayer jsb
2015-06-02 17:35:56 +08:00
jianglong0156 6eddf97416 fix the platform judge error 2015-06-02 17:29:36 +08:00
jianglong0156 0c821379f8 modify video mp4 formate 2015-06-02 17:07:11 +08:00
WenhaiLin 88697bf136 Remove unused function. 2015-06-02 16:38:06 +08:00
WenhaiLin 67d0088103 Fixed the text line height calculation is wrong with system font on Android. 2015-06-02 16:23:40 +08:00
jianglong0156 4abaa51e12 webview and videoplayer only play in android, ios and web 2015-06-02 15:06:44 +08:00
yangxiao 3d4606921b merge cocos 2015-06-02 14:27:31 +08:00
pandamicro 5cebc704ec Merge pull request #12135 from CocosRobot/update_cocosfiles_1433224063
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-02 13:51:38 +08:00
jianglong0156 ac71777e97 add webview and videoplayer protect contidition. 2015-06-02 13:50:55 +08:00
CocosRobot a15766adab [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 05:47:44 +00:00
子龙山人 e66195ddfc Merge pull request #12131 from MSOpenTech/v3-winrt-version
V3: updated external/config.json to version 57
2015-06-02 13:45:07 +08:00
yangxiao 1d61bdb7a0 update dependency 2015-06-02 13:36:34 +08:00
jianglong0156 c46fea1f7a Merge branch 'v3' into videoplayer 2015-06-02 11:26:48 +08:00
Dale Stammen c4e1805ecb updated to version 57 2015-06-01 19:43:26 -07:00
pandamicro 7e6eed5832 Reverse change in submodules 2015-06-02 10:42:50 +08:00
子龙山人 6030b79c7d Merge pull request #12129 from andyque/update-changelog-v3
[ci skip]update changelog
2015-06-02 10:26:47 +08:00
andyque 4af5ba11a6 update changelog 2015-06-02 10:26:09 +08:00
jianglong0156 97d0265e32 gzip test 2015-06-02 10:23:30 +08:00
pandamicro 4c6f67fd7e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	tools/bindings-generator
	web
2015-06-02 10:12:22 +08:00