andyque
|
91ddb802e1
|
optimize ui::CheckBox memory consumption
|
2015-06-05 10:32:22 +08:00 |
CocosRobot
|
9e3fa92803
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 01:51:34 +00:00 |
Dale Stammen
|
3f3ace05a7
|
added ogg support for Windows 10 UWP
|
2015-06-04 14:42:11 -07:00 |
pandamicro
|
e0eff26674
|
Fix component function execution issue in JSB
|
2015-06-05 00:03:21 +08:00 |
pandamicro
|
25e047eb41
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns
|
2015-06-04 23:29:45 +08:00 |
pandamicro
|
461f2f88f4
|
Merge pull request #12197 from CocosRobot/update_lua_bindings_1433422057
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-04 22:08:03 +08:00 |
pandamicro
|
6216e74a38
|
Merge pull request #12165 from gyf19/v3
HttpClient Android supports gzip
|
2015-06-04 22:00:13 +08:00 |
CocosRobot
|
8865bd488e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-04 12:52:41 +00:00 |
pandamicro
|
af756c50dc
|
Merge pull request #12184 from pandamicro/v3
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 20:42:35 +08:00 |
pandamicro
|
e75dee6e7c
|
Remove C++ invocation functions of Component
|
2015-06-04 20:10:10 +08: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
|
9576adeafb
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 17:53:00 +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 |
VisualSJ
|
a91fdd6b8e
|
Synchronization studio parser - (fixed: resPath and custom easing animation)
|
2015-06-04 16:59:42 +08:00 |
VisualSJ
|
587bd475e9
|
Synchronization studio parser - (fixed: resPath and custom easing animation)
|
2015-06-04 16:23:06 +08:00 |
Namezero
|
19f95c5542
|
TintBy::clone() incorrect cast
TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.
|
2015-06-04 10:13:34 +02:00 |
pandamicro
|
2c168130ed
|
Fix jsbinding calls for CCComponent
|
2015-06-04 15:59:05 +08:00 |
pandamicro
|
86d372222c
|
Merge branch 'v2_addOnEnterAndOnExitToCCNode' of https://github.com/chengstory/cocos2d-x into compJSB
|
2015-06-04 15:54:58 +08:00 |
Huabing.Xu
|
d35a8a3a9e
|
add default FBO
|
2015-06-04 15:53:13 +08:00 |
pandamicro
|
83f7f30c1c
|
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 15:03:20 +08:00 |
WenhaiLin
|
bd718bb85f
|
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
|
2015-06-04 14:57:37 +08:00 |
zhangcheng
|
6a53cfdc76
|
1, modify space format.
|
2015-06-04 14:08:47 +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 |
pandamicro
|
9c23126d9e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 13:14:34 +08:00 |
yangxiao
|
ded5c36271
|
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2
|
2015-06-04 12:46:12 +08:00 |
yangxiao
|
8b5333a5c9
|
Merge branch 'newcode' into navigation2
|
2015-06-04 12:44:39 +08:00 |
yangxiao
|
73d815b0ab
|
rename syncToNode and syncToPhysics
|
2015-06-04 12:04:41 +08:00 |
samuele3hu
|
fbd5a09cfd
|
issue #10323: Fix the compile error when COCOS2D_DEBUG>=2.
|
2015-06-04 11:58:22 +08:00 |
anniruddh.koppal
|
84fad34daf
|
Added ogg support to audio engine. Fixed issues #150 and #151
|
2015-06-03 20:57:14 -07:00 |
Huabing.Xu
|
ad1f7c472c
|
add render buffer render target for color attachment
|
2015-06-04 11:18:35 +08:00 |
子龙山人
|
831ca47b13
|
Merge pull request #12158 from WenhaiLin/v3-letter-space
Label:Fixed letter spacing may be wrong.
|
2015-06-04 10:51:25 +08:00 |
zhangcheng
|
55995ece1a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode
|
2015-06-04 10:38:39 +08:00 |
zhukaixy
|
f891a0b124
|
configure navi for winodow phone
|
2015-06-04 10:00:15 +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 |
CocosRobot
|
76b151c281
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-03 20:25:32 +00: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
|
18ce48dc2a
|
/NODEFAULTLIB:MSVCRT to fix linker warning
|
2015-06-03 09:26:15 -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 |
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 |
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 |
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 |
Ricardo Quesada
|
872e4f5a4f
|
removes logging
|
2015-06-02 17:50:34 -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 |
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 |
yangxiao
|
3d4606921b
|
merge cocos
|
2015-06-02 14:27:31 +08:00 |
jianglong0156
|
ac71777e97
|
add webview and videoplayer protect contidition.
|
2015-06-02 13:50:55 +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 |
子龙山人
|
2c611693c6
|
Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness
Improve UserDefault's robustness on Android.
|
2015-06-02 10:11:19 +08:00 |
子龙山人
|
40ea6e3e41
|
Merge pull request #12103 from samuele3hu/v3_http_leak
Fix the memory leak of HttpClient on the iOS/Mac platform.
|
2015-06-02 10:11:03 +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 |
子龙山人
|
0ab6472ee6
|
Merge pull request #12107 from MSOpenTech/v3-uwp
V3: Windows 10.0 Universal App (UWP) support
|
2015-06-02 10:00:40 +08:00 |
江龙
|
a8b640f751
|
add videoplayer project
|
2015-06-02 09:04:15 +08:00 |
yangxiao
|
5bf09a676e
|
setRadius and setGeight implementation
|
2015-06-01 17:38:35 +08:00 |
WenhaiLin
|
9d8225aae8
|
Improve UserDefault's robustness on Android.
|
2015-06-01 15:09:11 +08:00 |
Huabing.Xu
|
27d0f6328f
|
origin code of viewport
|
2015-06-01 14:26:08 +08:00 |
linshun
|
09b52331d1
|
issue #12078: added renderer group and removed core and support group.
|
2015-06-01 13:43:56 +08:00 |
子龙山人
|
d7534c26a3
|
Merge pull request #12106 from WenhaiLin/v3-audio-ios-phonecall
AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
|
2015-06-01 11:19:01 +08:00 |
子龙山人
|
4e914a01da
|
Merge pull request #12098 from WenhaiLin/v3-simpleaudio-lagged
Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x
|
2015-06-01 11:17:26 +08:00 |
Huabing.Xu
|
739923a4a3
|
Merge branch 'v3' into v3Viewport
|
2015-06-01 09:41:45 +08:00 |
Dale Stammen
|
e0c65c203a
|
Merge branch 'v3' into v3-uwp
|
2015-05-29 08:09:05 -07:00 |
WenhaiLin
|
59435f8749
|
AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
|
2015-05-29 21:41:54 +08:00 |
samuele3hu
|
ae6cb678c6
|
Fix the memory leak of HttpClient on the iOS/Mac platform.
|
2015-05-29 17:13:49 +08:00 |
yangxiao
|
c782d63bef
|
add 3d navigation
|
2015-05-29 16:45:33 +08:00 |
yangxiao
|
618f63cb35
|
replace windows folder sperator
|
2015-05-29 16:43:36 +08:00 |
yangxiao
|
410d09525f
|
setTransparent for mesh command
|
2015-05-29 16:38:42 +08:00 |
yangxiao
|
db2b2cf0b8
|
getTrianglesList for obj file
|
2015-05-29 16:37:37 +08:00 |
Huabing.Xu
|
b5e76c7521
|
Merge branch 'v3_origin' into v3FrameBufferObject
|
2015-05-29 15:59:38 +08:00 |
Huabing.Xu
|
f76585f046
|
Merge branch 'v3' into v3FrameBufferObject
|
2015-05-29 15:59:15 +08:00 |
Huabing.Xu
|
9bf15877e5
|
add applyViewport in camera.
|
2015-05-29 15:52:06 +08:00 |
子龙山人
|
039c0036be
|
Merge pull request #12072 from iris-wy/v3
Add enhance service API
|
2015-05-29 15:32:06 +08:00 |
Michael Sotnikov
|
b430353cd8
|
Fixed: #12097 VideoPlayer on Android ignores search paths
|
2015-05-29 10:17:40 +03:00 |
WenhaiLin
|
9c31aafba0
|
Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x
|
2015-05-29 14:52:25 +08:00 |
CocosRobot
|
3a1b52cafd
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 06:31:00 +00:00 |
子龙山人
|
a165790ba9
|
Merge pull request #12083 from yangws/v3
Add opengl version project/unproject function in camera.
|
2015-05-29 14:21:56 +08:00 |
Huabing.Xu
|
2f32fcabba
|
Merge branch 'v3FrameBufferObject' into v3Viewport
|
2015-05-29 14:10:49 +08:00 |
Huabing.Xu
|
b2579a754a
|
refactor, use Camera::apply() to apply Rendertarget and Viewport
|
2015-05-29 14:08:20 +08:00 |
Huabing.Xu
|
1fb0ba112b
|
init code for viewport
|
2015-05-29 13:47:29 +08:00 |
CocosRobot
|
892816de3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-29 05:46:22 +00:00 |
子龙山人
|
035420893e
|
Merge pull request #12076 from andyque/update-changelog-v3
Fix a memory issue in AudioEngine
|
2015-05-29 11:44:45 +08:00 |
jianglong0156
|
722b6b1baf
|
add video player binding files
|
2015-05-29 11:39:47 +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 |
Vincent Yang
|
b714dde0ea
|
Add opengl version project/unproject function in camera.
|
2015-05-29 10:44:48 +08:00 |
Huabing.Xu
|
22ddf53539
|
Merge branch 'v3FrameBufferObject' into v3
|
2015-05-29 10:38:42 +08:00 |
Dale Stammen
|
8584f5f399
|
removed old WP8 files
|
2015-05-28 15:03:36 -07:00 |
Dale Stammen
|
2a71407501
|
fixed double to float conversion compiler warning
|
2015-05-28 15:00:49 -07:00 |
Dale Stammen
|
05d33ac0c8
|
removed old WP8 files
|
2015-05-28 14:08:25 -07:00 |
Dale Stammen
|
dadbbc18d6
|
added Windows 10 UWP project files
|
2015-05-28 13:51:25 -07:00 |
Dale Stammen
|
60f672599b
|
added winrt networking files
|
2015-05-28 13:48:13 -07:00 |
Dale Stammen
|
962393233f
|
removed old winrt property sheets
|
2015-05-28 13:12:37 -07:00 |
jianglong0156
|
9a62d06091
|
add video player test and auto bindings
|
2015-05-28 18:10:07 +08:00 |
子龙山人
|
a76018041e
|
Merge pull request #12077 from WenhaiLin/v3-label-mlinefix
Text:Fixed the scale factor may be incorrect with multiline text.
|
2015-05-28 17:20:33 +08:00 |
Huabing.Xu
|
2d6d1b7a8c
|
add android background and foreground switch support for framebufferobject
|
2015-05-28 17:08:36 +08:00 |
linshun
|
543b6c2b07
|
issue #12078: added storage group.
|
2015-05-28 15:48:08 +08:00 |
linshun
|
ef39251d14
|
issue #12078: added platform group
|
2015-05-28 15:47:40 +08:00 |
linshun
|
56c848e341
|
issue #12078: added physics group.
|
2015-05-28 15:47:03 +08:00 |
linshun
|
2a02510a9c
|
issue #12078: Added network group.
|
2015-05-28 15:46:36 +08:00 |
linshun
|
77639bc88e
|
issue #12078: Added audio group.
|
2015-05-28 15:46:02 +08:00 |
子龙山人
|
f6f8796dfa
|
Merge pull request #11762 from WenhaiLin/v3-audioengine-i11697
AudioEngine:Fixed program may freeze if `AudioEngine::stop` or `AudioEngine::stopAll()` is invoked frequently on Android.
|
2015-05-28 14:52:20 +08:00 |
jianglong0156
|
ab124978aa
|
web view can not run in mac, remove it from project file
|
2015-05-28 14:46:29 +08:00 |
jianglong0156
|
379f536330
|
improve test case, remove the invalid testcase
|
2015-05-28 14:02:07 +08:00 |
yangxiao
|
2e27bfd6c7
|
add comment
|
2015-05-28 12:40:16 +08:00 |
WenhaiLin
|
c60112a634
|
Text:Fixed the scale factor may be incorrect with multiline text.
|
2015-05-28 11:56:43 +08:00 |
jianglong0156
|
1dbaa5bb11
|
fix error log output
|
2015-05-28 11:56:07 +08:00 |
andyque
|
578fda54ba
|
fix a memory issue in AudioEngine.
This PR also update AUTHORS and CHANGELOG files.
|
2015-05-28 11:49:27 +08:00 |
samuele3hu
|
9a4a545025
|
Issue #10570: Make getItemForTouch of Menu virtual.
|
2015-05-28 11:41:49 +08:00 |
iris-wy
|
bbfc33dfd2
|
format
format
|
2015-05-28 11:03:49 +08:00 |
子龙山人
|
001614a9c5
|
Merge pull request #11908 from flashjay/patch-1
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
|
2015-05-28 10:58:46 +08:00 |
iris-wy
|
9e477303f1
|
delete useless TAG
delete useless TAG
|
2015-05-28 10:55:10 +08:00 |
iris-wy
|
0007799794
|
modify Enhance API
modify Enhance API
|
2015-05-28 10:47:12 +08:00 |
jianglong0156
|
c0b42fdfec
|
modify addEventListener to setEventListener
|
2015-05-28 10:12:58 +08:00 |
Dale Stammen
|
9ee4b4af1e
|
Merge branch 'v3' into v3-winrt-audio
|
2015-05-27 11:54:21 -07:00 |
anniruddh.koppal
|
4501a53cfa
|
Added MP3 support to simple audio engine
|
2015-05-27 10:57:26 -07:00 |
子龙山人
|
6f16965b06
|
Merge pull request #12060 from CocosRobot/update_lua_bindings_1432717405
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 22:43:28 +08:00 |
子龙山人
|
88c26d9c5d
|
Merge pull request #12059 from andyque/add-button-bmfont-test
add ui::Button BMFont title test
|
2015-05-27 22:42:46 +08:00 |
pandamicro
|
37f2d84675
|
Merge pull request #12056 from musikov/v3-jsb-cccolor-fix
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
|
2015-05-27 21:31:29 +08:00 |
yangxiao
|
a5976a43f7
|
code style
|
2015-05-27 18:19:44 +08:00 |
Huabing.Xu
|
9ffbe39f18
|
DepthStencil RenderTarget could be null, which can be used to detach the old DepthStencil RenderTarget
|
2015-05-27 18:16:05 +08:00 |
yangxiao
|
c68efaa79a
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-05-27 18:09:08 +08:00 |
yangxiao
|
28b9b86b0b
|
get set gravity
|
2015-05-27 18:07:31 +08:00 |
jianglong0156
|
7402295205
|
improve event key
|
2015-05-27 18:02:01 +08:00 |
jianglong0156
|
2dd7b9575b
|
iOS project add web view project
|
2015-05-27 17:53:50 +08:00 |
CocosRobot
|
3bf58ab401
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 09:08:33 +00:00 |
Huabing.Xu
|
9d4e50f3a5
|
add optional params for RenderTarget creation
|
2015-05-27 16:59:54 +08:00 |
子龙山人
|
b8fd5ba290
|
Merge pull request #12052 from CocosRobot/update_lua_bindings_1432713396
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 16:59:50 +08:00 |
andyque
|
74f0b3b436
|
add bmfont test
|
2015-05-27 16:58:52 +08:00 |
子龙山人
|
e044b1ab11
|
Merge pull request #11785 from geron-cn/fixbug
fix crash when run TestTimelineFrameEvent in cpp-test
|
2015-05-27 16:28:13 +08:00 |
子龙山人
|
62832586d0
|
Merge pull request #12049 from samuele3hu/v3_material
issue #12046: Add Lua bindings for material systems and related test cases
|
2015-05-27 16:26:26 +08:00 |
Mykyta Usikov
|
355381e0d8
|
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
|
2015-05-27 11:25:04 +03:00 |
子龙山人
|
ca8ca35fd6
|
Merge pull request #12054 from andyque/Feature_Add_Title_Alignment_for_Button
[ci skip]Feature add title alignment for button
|
2015-05-27 16:09:06 +08:00 |
andyque
|
44babe18fb
|
add missing comments and fix back compatibility.
|
2015-05-27 16:07:37 +08:00 |
CocosRobot
|
3851e8356e
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-27 08:00:53 +00:00 |
子龙山人
|
616ac0058c
|
Merge pull request #12016 from namezero111111/v3
ui::TextField::getTextColor() missing
|
2015-05-27 15:53:09 +08:00 |
samuele3hu
|
9934d73548
|
issue #12046: Add Lua bindings for material systems and related test cases.
|
2015-05-27 15:37:59 +08:00 |
jianglong0156
|
83f34c23d8
|
fixed the code error
|
2015-05-27 15:22:03 +08:00 |
jianglong0156
|
579f122cb1
|
add webview jsb eventType
|
2015-05-27 15:11:12 +08:00 |
jianglong0156
|
521ce15cb6
|
add webview autobindings. modify webtest. adapt the web interface
|
2015-05-27 11:46:26 +08:00 |
Huabing.Xu
|
471547e0b0
|
refactor FrameBufferObject to FrameBufferObject and RenderTarget
|
2015-05-27 11:40:12 +08:00 |
子龙山人
|
b2132eb127
|
Merge pull request #11921 from felixjingga/uibutton-support-bmfont
Uibutton support bmfont
|
2015-05-27 11:19:46 +08:00 |
子龙山人
|
b8fdb152fd
|
Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue
fix assert failure of NinePatchImageParser and rapidjson
|
2015-05-27 11:17:31 +08:00 |