pandamicro
|
1a9056cf14
|
Merge pull request #12300 from jianglong0156/textFieldShowString
[ci skip]add textfield show textString
|
2015-06-11 19:33:21 +08:00 |
pandamicro
|
902f1696e8
|
Merge pull request #12290 from jianglong0156/issue#2928texture2d
[ci skip]add pr#2928 test case, load same remote img. can callback the function
|
2015-06-11 16:51:59 +08:00 |
子龙山人
|
43555272d5
|
Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-11 16:34:45 +08:00 |
WenhaiLin
|
aff2f8c2c4
|
Fixed compile error.
|
2015-06-11 14:42:03 +08:00 |
jianglong0156
|
f97955682a
|
add pr#2928 test case, load same remote img. can callback the function
|
2015-06-11 11:11:51 +08:00 |
jianglong0156
|
96ce3ec22c
|
add textfield show textString
|
2015-06-10 16:15:09 +08:00 |
Huabing.Xu
|
10352c40b2
|
Merge branch 'v3' into v3FrameBufferObject
# Conflicts:
# cocos/2d/CCCamera.h
|
2015-06-10 10:16:42 +08:00 |
Huabing.Xu
|
3e331128c6
|
file rename CCFrameBufferObject->CCFrameBuffer
|
2015-06-09 15:32:12 +08:00 |
Huabing.Xu
|
97b387560b
|
revert some accidental changes
|
2015-06-09 14:06:11 +08:00 |
Huabing.Xu
|
9acab65e4f
|
rename FrameBufferObject->FrameBuffer
Move FrameBufferObject related class to experimental namespace
|
2015-06-09 10:59:43 +08:00 |
WenhaiLin
|
784f142f91
|
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-08 11:06:02 +08:00 |
Dale Stammen
|
d4c9a81908
|
Merge branch 'v3' into v3-winrt-ogg
|
2015-06-05 16:03:54 -07:00 |
Ricardo Quesada
|
453a3d93bc
|
samplers are treated as uniforms
|
2015-06-05 14:55:33 -07:00 |
Dale Stammen
|
f1a067ee75
|
removed e option from xcopy of cpp template files
|
2015-06-05 09:21:52 -07:00 |
Dale Stammen
|
bc1ea87adf
|
updated app guid and disables auto version increment for App Cert tests
|
2015-06-05 06:21:03 -07:00 |
Dale Stammen
|
47b5085ade
|
Merge branch 'v3' into v3-winrt-ogg
|
2015-06-05 05:36:15 -07:00 |
pandamicro
|
399ecfcb9f
|
Merge pull request #12176 from super626/fixphysics3d
rename syncToNode and syncToPhysics
|
2015-06-05 16:02:45 +08:00 |
pandamicro
|
fa71a6e352
|
Merge pull request #12204 from jianglong0156/issue1756
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
|
2015-06-05 13:17:53 +08:00 |
jianglong0156
|
33beab2d81
|
add gzip test
|
2015-06-05 11:40:29 +08:00 |
Dale Stammen
|
3f3ace05a7
|
added ogg support for Windows 10 UWP
|
2015-06-04 14:42:11 -07:00 |
pandamicro
|
2da754dcf2
|
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
Add onEnter and onExit of components to CCNode's onEnter and onExit function
|
2015-06-04 18:39:52 +08:00 |
pandamicro
|
ba1191f98f
|
Merge pull request #12132 from pandamicro/v3_origin
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
|
2015-06-04 17:51:11 +08:00 |
zhangcheng
|
8d3d3a0348
|
1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.
|
2015-06-04 14:06:31 +08:00 |
yangxiao
|
73d815b0ab
|
rename syncToNode and syncToPhysics
|
2015-06-04 12:04:41 +08:00 |
Huabing.Xu
|
ad1f7c472c
|
add render buffer render target for color attachment
|
2015-06-04 11:18:35 +08:00 |
子龙山人
|
95934bf310
|
Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix
V3: Fixes for Windows 8.1 Universal App JavaScript
|
2015-06-04 09:22:21 +08:00 |
Ricardo Quesada
|
6a19661a80
|
Merge pull request #12150 from ricardoquesada/material_custom_uniforms
Material custom uniforms
|
2015-06-03 13:08:04 -07:00 |
Dale Stammen
|
808de7b475
|
removed e option from xcopy
|
2015-06-03 09:54:43 -07:00 |
Dale Stammen
|
21de1825ac
|
removed e option from xcopy
|
2015-06-03 09:47:55 -07:00 |
Dale Stammen
|
18ce48dc2a
|
/NODEFAULTLIB:MSVCRT to fix linker warning
|
2015-06-03 09:26:15 -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 |
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 |
jianglong0156
|
4abaa51e12
|
webview and videoplayer only play in android, ios and web
|
2015-06-02 15:06:44 +08:00 |
jianglong0156
|
c46fea1f7a
|
Merge branch 'v3' into videoplayer
|
2015-06-02 11:26:48 +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 |
pandamicro
|
fdec552ed7
|
Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader
|
2015-06-02 10:08:13 +08:00 |
Dale Stammen
|
494a7079d3
|
fixed test for Windows 10 CC_PLATFORM_WINRT
|
2015-05-29 09:35:53 -07:00 |
Dale Stammen
|
a16d51cad9
|
keyboard events now available in Windows Universal Apps
|
2015-05-29 08:15:04 -07:00 |
Dale Stammen
|
e0c65c203a
|
Merge branch 'v3' into v3-uwp
|
2015-05-29 08:09:05 -07:00 |
Huabing.Xu
|
b5e76c7521
|
Merge branch 'v3_origin' into v3FrameBufferObject
|
2015-05-29 15:59:38 +08:00 |
子龙山人
|
b39006432f
|
Merge pull request #12091 from joshuastray/properties
[ci skip]fix material test
|
2015-05-29 14:22:36 +08:00 |
Jialong Zhai
|
9cf5c1b636
|
fix material test
|
2015-05-29 13:54:29 +08:00 |
子龙山人
|
a968bc2d15
|
Merge pull request #12062 from jianglong0156/jsWebviewTest
Js webview test
|
2015-05-29 11:35:30 +08:00 |
jianglong0156
|
8b52563a8a
|
add videoplayer config ini and fix the url bug
|
2015-05-29 11:10:39 +08:00 |
Huabing.Xu
|
22ddf53539
|
Merge branch 'v3FrameBufferObject' into v3
|
2015-05-29 10:38:42 +08:00 |