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
WuHao
0a51c9bd27
Finished AutoPolygon and Sprite
2015-06-04 15:43:31 +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
pajeroquan
956101bb72
Fix JNI object memory leak!
...
Fix JNI object memory leak!
2015-06-04 11:54:53 +08: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
samuele3hu
3bae5620d6
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
2015-06-04 09:40:54 +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
samuele3hu
0cccd6e765
Fix compile error on the Linux and update the test cases
2015-06-03 18:12:21 +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
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
Chris Hannon
574cfb4ade
Merge branch 'v3-update-sio' of https://github.com/hannon235/cocos2d-x into merge-up
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
Conflicts:
cocos/network/SocketIO.cpp
2015-06-02 21:11:43 -04:00
Ricardo Quesada
872e4f5a4f
removes logging
2015-06-02 17:50:34 -07:00
Chris Hannon
fe6275adf5
[v3-update-sio] fixes nested switch brackets - best practice would be to replace these with functions in the future
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
Chris Hannon
6bcf325630
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
Chris Hannon
5af28838d2
[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:33 -04: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
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
WuHao
3c5326ba1f
removed spritePolygon, merge into sprite and draft of AutoPolygon
2015-06-02 10:10:09 +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
c3ea65e66b
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
2015-05-29 18:25:15 +08:00
WuHao
3d62805d04
Merge branch 'v3' into fix_spritepolygon
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/MarchingSquare.cpp
2015-05-29 18:10:41 +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
Jacky
e69a6116fa
make SpritePolygonInfo extend from Ref.
2015-05-29 16:44:06 +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
Jacky
8df4920f6e
fixed file name.
2015-05-29 15:03:36 +08: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
子龙山人
2cfeed2c49
Merge pull request #12031 from yangws/v3_bugfixTerrain
...
Fix bug: terrain can't move to other position except origin point in world coord.
2015-05-27 10:48:02 +08:00
geron-cn
c19adbdc3c
fix bug: fix actiontimeline can not step to last frame when loop play
2015-05-27 10:24:50 +08:00
CocosRobot
824456b073
[AUTO]: updating luabinding & jsbinding automatically
2015-05-26 21:56:01 +00:00
Dale Stammen
06a5f7ed7a
moved CCNinePath files to base folder in solution
2015-05-26 09:48:25 -07:00
Dale Stammen
d146f26144
define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds
2015-05-26 09:46:15 -07:00
Namezero
9808f6aa91
Update UITextField.h
2015-05-26 12:55:57 +02:00
Vincent Yang
d7ad7221e4
ciskip add doc for camera::getnear/farplane().
2015-05-26 18:14:37 +08:00
Vincent Yang
8105e9c714
Fix bug: terrain can't move to other position except origin point.
2015-05-26 17:51:26 +08:00
jianglong0156
7820610f13
Merge branch 'modifyTestResource' into jsWebviewTest
...
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
2015-05-26 17:49:17 +08:00
andyque
8d78fd31b7
add assert to make program more robust
2015-05-26 17:25:42 +08:00
andyque
c668001e73
fix assert failure of NinePatchImageParser and rapidjson
2015-05-26 17:20:10 +08:00
Vincent Yang
246913c092
Fix bug: skybox can't move to other position except origin point in world space.
2015-05-26 17:14:26 +08:00
Namezero
8bc7d08d3f
added alignment getters
2015-05-26 09:34:13 +02:00
Namezero
2be136dc8e
alignment getters added
2015-05-26 09:33:11 +02:00
Huabing.Xu
83bae15caf
Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-05-26 12:06:05 +08:00
minggo
104f11fe4c
Merge pull request #12010 from CocosRobot/update_lua_bindings_1432542799
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-26 09:33:37 +08:00
Namezero
4c380bfaf0
Update UITextField.cpp
2015-05-25 21:06:27 +02:00
Namezero
dfb479d480
Update UITextField.h
2015-05-25 21:05:49 +02:00
Huabing.Xu
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
minggo
bcc1bf8d32
Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand
...
use trianglescommand for sprite
2015-05-25 16:48:22 +08:00
CocosRobot
7fa68d9b3a
[AUTO]: updating luabinding & jsbinding automatically
2015-05-25 08:37:59 +00:00
minggo
999de9072a
Merge pull request #12003 from minggo/remove-unneeded-function
...
remove uneeded function
2015-05-25 16:33:38 +08:00
minggo
273ac5d00a
Merge pull request #12002 from WenhaiLin/v3-texturecache-unbindfix
...
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
2015-05-25 16:29:43 +08:00
Felix J
d5a7163b29
don't update content size if not necessary
...
refactor a little so we don't need to update the content size if bmfont is used, but still updating the _fontSize.
2015-05-25 14:45:26 +07:00
minggo
203203a92d
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
...
upgrade rapidjson to 1.0.2
2015-05-25 15:18:15 +08:00
Felix J
219d8193c4
remove else clause
...
Removing the else clause cause BMFont cannot set its font size
2015-05-25 12:48:56 +07:00
andyque
81070a5299
fix lua project compile error
2015-05-25 13:42:54 +08:00
WenhaiLin
234ad668ec
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
2015-05-25 11:47:37 +08:00
andyque
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
minggo
db0caf68c6
remove uneeded function
2015-05-25 09:50:48 +08:00
samuele3hu
074216bef9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
2015-05-24 22:46:05 +08:00
anniruddh.koppal
b2eb946c14
Added MP3 support
2015-05-23 19:13:12 -07:00
minggo
cad1b911c4
Merge pull request #11990 from xiaofeng11/v3
...
Remove missing resource notice label from all UI widget
2015-05-23 08:05:45 +08:00
XiaoFeng
e94bcbd28c
Remove missing resource label from all UI widget
2015-05-22 18:21:59 +08:00
minggo
311f453ea0
Merge pull request #11973 from dabingnn/v3_fixCameraVisitError
...
Fix visiting scene error with multiple camera
2015-05-22 17:16:30 +08:00
Huabing.Xu
6d9f850e2c
use trianglescommand for sprite
2015-05-22 15:54:56 +08:00
CocosRobot
f18b8bfd95
[AUTO]: updating luabinding & jsbinding automatically
2015-05-22 06:55:54 +00:00
minggo
1eb8d59666
Merge pull request #11966 from samuele3hu/v3_httpclient
...
fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.
2015-05-22 14:47:44 +08:00
minggo
698428e0a1
Merge pull request #11971 from joshuastray/physics
...
Physics3d js binding
2015-05-22 14:42:34 +08:00
minggo
11f8f0fc21
Merge pull request #11963 from CocosRobot/update_lua_bindings_1432259998
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-22 14:41:28 +08:00
minggo
27b7f2dd19
Merge pull request #11969 from WenhaiLin/v3-TMXTiledMap-crash
...
TileMap:Fixed crash if referring a non-existent layer in TMX.
2015-05-22 14:37:23 +08:00
Huabing.Xu
0644efc55e
isVisitableByVisitingCamera should not affect the calculation of transform
2015-05-22 13:59:45 +08:00
joshuastray
b1169c7d56
win32 and universal compile
2015-05-22 11:58:28 +08:00
WenhaiLin
fdde58386f
experimental::TileMap:Fixed crash if referring a non-existent layer in TMX.
2015-05-22 11:14:34 +08:00
minggo
bf25a0429d
Merge pull request #11964 from WenhaiLin/v3-console-crash
...
[ci skip]Add comment.
2015-05-22 11:05:54 +08:00
WenhaiLin
2f558b5793
Merge branch 'tmx-crash-fix' of https://github.com/dumganhar/cocos2d-x into v3-support-android-studio
2015-05-22 11:01:13 +08:00
samuele3hu
27e7101322
fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.
2015-05-22 10:47:52 +08:00
joshuastray
1366f615dd
mac && ios works
2015-05-22 10:43:37 +08:00
WenhaiLin
a94a6baf87
[ci skip]Add comment.
2015-05-22 10:35:34 +08:00
CocosRobot
59807629d9
[AUTO]: updating luabinding & jsbinding automatically
2015-05-22 02:04:38 +00:00
minggo
d5d329b74f
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
...
add Android 9-patch image format support
2015-05-22 09:52:12 +08:00
minggo
678b279754
Merge pull request #11953 from MSOpenTech/v3-winrt-settings
...
V3: Windows 8.1 Universal App CCUserDefault implementation
2015-05-22 09:44:41 +08:00
minggo
36089b9bc3
Merge pull request #11950 from WenhaiLin/v3-console-crash
...
Console:Fixed crash
2015-05-22 09:42:41 +08:00
tangziwen
fb1a7f1e8b
fix Terrain::getIntersectionPoint
2015-05-22 09:07:57 +08:00
Dale Stammen
6c02e46865
fix deprecated method
2015-05-21 13:30:51 -07:00
Dale Stammen
382d681250
added winrt version of CCUserDefault
2015-05-21 11:23:36 -07:00
Dale Stammen
2e5b604d2f
added CC_PLATFORM_WINRT to comments
2015-05-21 11:23:20 -07:00
Dale Stammen
992e292338
added winrt version of CCUserDefault
2015-05-21 11:21:46 -07:00
joshuastray
342734e3b5
Merge remote-tracking branch 'upstream/v3' into physics
2015-05-21 21:15:42 +08:00
WenhaiLin
158181d4eb
Console:Fixed crash
2015-05-21 18:14:21 +08:00
joshuastray
83237b8dbd
add physics3d js manual binding and tests
2015-05-21 18:05:49 +08:00
andyque
0352a7a3ea
add Android 9-patch image format support
...
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
2015-05-21 16:04:37 +08:00
andyque
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
CocosRobot
ad301891f0
[AUTO]: updating luabinding & jsbinding automatically
2015-05-21 02:46:49 +00:00
minggo
22f0e2fbbf
Merge pull request #11918 from WenhaiLin/v3-37
...
AudioEngine: Fixed play with a large audio file may fail on Win32
2015-05-21 10:36:08 +08:00
minggo
69b6c9a3e5
Merge pull request #11906 from samuele3hu/v3_check
...
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
2015-05-21 10:35:38 +08:00
CocosRobot
cb6abaa14c
[AUTO]: updating luabinding & jsbinding automatically
2015-05-21 01:52:51 +00:00
minggo
f1eae8f724
Merge pull request #11929 from namezero111111/patch-1
...
Fixed missing const-correctness
2015-05-21 09:38:24 +08:00
子龙山人
9ac23a5436
Merge pull request #11933 from kobake/fix-typo-angel
...
Fix typo: "angel" to "angle"
2015-05-21 09:37:53 +08:00
minggo
bfbc8d28f2
Merge pull request #11928 from MSOpenTech/v3-winrt-bullet3d
...
V3: Windows 8.1 Universal App version of Bullet 3D physics lib
2015-05-21 09:36:42 +08:00
kobake
d6f7a0a8a1
Fix typo. angel -> angle
2015-05-21 09:22:59 +09:00
Ricardo Quesada
f2d3ecad48
Removes state from MeshCommand.
...
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
2015-05-20 15:57:26 -07:00
Dale Stammen
d70a9bf369
resolve full path for audio file
2015-05-20 11:18:54 -07:00
Namezero
89152ef514
Fixed missing const-correctness
2015-05-20 17:19:42 +02:00
Dale Stammen
209e7c62f4
added libbullet to Windows 8.1 Universal App projects
2015-05-20 08:01:01 -07:00
Dale Stammen
46a69cf00b
ignore warning 4996
2015-05-20 07:59:17 -07:00
Dale Stammen
3523173594
removed CC_PLATFORM_WP8
2015-05-20 07:58:39 -07:00
Dale Stammen
aa7876aefc
remove deprecated methods
2015-05-20 07:55:10 -07:00
Dale Stammen
14e812c7d4
enable CC_USE_3D_PHYSICS for CC_PLATFORM_WINRT
2015-05-20 07:53:49 -07:00
Dale Stammen
1b9a36f041
removed CC_PLATFORM_WP8 code
2015-05-20 07:52:59 -07:00
Dale Stammen
cada493685
remove deprecated methods
2015-05-20 07:51:52 -07:00
WenhaiLin
a569d877ba
[ci skip]Remove unnecessary code.
2015-05-20 18:05:46 +08:00
felixjingga
9c264ab64b
include algorithm header file
2015-05-20 16:42:48 +07:00
felixjingga
ee13dd82b8
fix compile error, and fix check of the fontname
2015-05-20 16:34:45 +07:00
WenhaiLin
02946a55a1
Fixed crash.
2015-05-20 17:13:04 +08:00
felixjingga
dcf4492ff0
add implementation detail to support BMFont
2015-05-20 15:56:07 +07:00
felixjingga
2d0fc637fc
add BMFont FontType to support BMFont
2015-05-20 15:50:20 +07:00
WenhaiLin
81dc551fe9
AudioEngine: Fixed play with a large audio file may fail on Win32.
2015-05-20 15:13:31 +08:00
minggo
7024d3129c
Merge pull request #11893 from MSOpenTech/v3-winrt-audio
...
New audio engine support in winrt win8.1-universal
2015-05-20 13:40:41 +08:00
minggo
79f70c49ce
Merge pull request #11905 from WenhaiLin/v3-37
...
Remove unnecessary files.
2015-05-20 13:39:36 +08:00
James Chen
07f6774cee
Crash fix for referring a non-existent layer in tmx.
2015-05-20 11:29:52 +08:00
minggo
ba694beccb
Merge pull request #11895 from super626/v3
...
fix #10767
2015-05-20 11:20:47 +08:00
minggo
dbf1b415a5
Merge pull request #11898 from WenhaiLin/v3-console-crash
...
Console:Fixed crash
2015-05-20 11:19:38 +08:00
joshuastray
712ba4f64c
add physics3d auto binding
2015-05-20 10:36:26 +08:00
HuaYang Huang
acb29ed5a8
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
...
last version may filter modules like 'framework.luaj', 'framework.luaoc'
2015-05-20 10:36:05 +08:00
samuele3hu
dec9acfd87
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
2015-05-20 10:26:54 +08:00
WenhaiLin
df3548673f
Remove unnecessary files.
2015-05-20 10:19:32 +08:00
Ricardo Quesada
ae413a6f6d
Merge pull request #11904 from ricardoquesada/meshcommand_fixes
...
MeshCommand uses StateBlock
2015-05-19 18:51:03 -07:00
Ricardo Quesada
ac54dad9a0
MeshCommand uses StateBlock
...
When MeshCommand is used with GLProgramState, it will use the StateBlock
internally, instead of the manual and error prone way of keeping state
2015-05-19 18:13:18 -07:00
Ricardo Quesada
5d90a8725e
Merge pull request #11903 from ricardoquesada/cleaner_code_properties
...
Terrain uses StateBlock
2015-05-19 18:07:50 -07:00
Ricardo Quesada
5924a917a1
Terrain uses StateBlock
...
cleaner code, conforms to new way of setting the state
2015-05-19 17:18:44 -07:00
CocosRobot
61aad4581a
[AUTO]: updating luabinding & jsbinding automatically
2015-05-19 23:02:24 +00:00
anniruddh.koppal
8432323450
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
2015-05-19 16:01:10 -07:00
Ricardo Quesada
c28c1ffbfb
Merge pull request #11901 from ricardoquesada/cleaner_code_properties
...
Properties fixes
2015-05-19 15:48:08 -07:00
Jacky
bbaa60bbbb
change to autopolygon.
2015-05-20 06:07:50 +08:00
Ricardo Quesada
aa027fbe0f
Properties fixes
...
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
2015-05-19 13:51:52 -07:00
WenhaiLin
80367e978d
Console:Fixed crash
2015-05-19 18:33:06 +08:00
tangziwen
8d791390ff
fix crash when visiting camera is not exist
2015-05-19 14:47:28 +08:00
anniruddh.koppal
ea345717c7
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
2015-05-18 23:40:28 -07:00
Vincent Yang
8d3ade78ca
Add CC_DLL to Class FrameBufferObject.
2015-05-19 13:50:10 +08:00
Vincent Yang
628619a694
Add CCFrameBufferObject files to win32 and win8 vcproj.
2015-05-19 11:53:08 +08:00
minggo
bb3ad7d249
Merge pull request #11677 from tankorsmash/patch-1
...
Fix setSprite never updating progress on ProgressTimer
2015-05-19 11:42:20 +08:00
Jacky
514c8ae965
move sprite polygon logic to sprite polygon cache.
2015-05-19 11:25:53 +08:00
Wenhai Lin
17f2fcd201
Add more comment.
2015-05-19 11:01:23 +08:00
anniruddh.koppal
3a8d2ffc9e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
2015-05-18 19:23:48 -07:00
anniruddh.koppal
e0b3091dcf
Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
...
Conflicts:
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-05-18 19:21:48 -07:00
minggo
38773e2164
Merge pull request #11869 from samuele3hu/v3_updateccs
...
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
2015-05-19 09:26:09 +08:00
dkorchinskiy
03aa73d68f
Feature #11886 add title alignment for button
2015-05-18 13:33:48 +03:00
minggo
e3e78b039a
Merge pull request #11851 from andyque/fixIssue11769
...
Copy missing text color property of ui::Text.
2015-05-18 18:14:29 +08:00
Huabing.Xu
75f740add5
linux works
2015-05-18 18:08:15 +08:00
Huabing.Xu
5634609e05
android works
2015-05-18 18:06:59 +08:00
samuele3hu
349f9bde11
Fix the compile error in the release mode
2015-05-18 17:43:20 +08:00
minggo
e700ef6d30
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
...
Add Android Studio support
2015-05-18 16:17:24 +08:00
WenhaiLin
26f094b1a7
Remove unnecessary files
2015-05-18 16:02:05 +08:00
Jacky
bcfa29a7d7
fixed memory leakage.
2015-05-18 15:52:46 +08:00
Jacky
d21f85787e
fixed memory leakage, remove unused header, fixed reference args.
2015-05-18 15:10:41 +08:00
CocosRobot
3e08ec4c11
[AUTO]: updating luabinding & jsbinding automatically
2015-05-18 07:04:27 +00:00
WenhaiLin
6dd3108e42
Rename module
2015-05-18 15:01:20 +08:00
minggo
f30cb9ac19
Merge pull request #11877 from CocosRobot/update_lua_bindings_1431927557
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-18 14:48:42 +08:00
minggo
7b76d5fc41
Merge pull request #11871 from walzer/v3
...
fixed #11821 , after release StateBlock::_defaultState, set it to null.
2015-05-18 14:47:16 +08:00
Huabing.Xu
f96e704f7d
Merge branch 'v3' into v3FrameBufferObject
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/cocos2d.h
cocos/renderer/CCGLProgramCache.cpp
2015-05-18 13:48:50 +08:00
CocosRobot
9572de26d4
[AUTO]: updating luabinding & jsbinding automatically
2015-05-18 05:43:08 +00:00
minggo
c2f245733c
Merge pull request #11872 from xiaofeng11/v3
...
Fix ArmatureAnimation crash
2015-05-18 13:32:52 +08:00
minggo
8068a2c220
Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering
...
V3 camera mask for2 d and3 d rendering
2015-05-18 13:32:26 +08:00
XiaoFeng
be20666b65
Fix ArmatureAnimation crash
2015-05-18 12:08:26 +08:00
walzer
02f295dfbf
fixed #11821 , after release StateBlock::_defaultState, set it to null, because developers would reconstruct it.
2015-05-18 10:44:49 +08:00
Huabing.Xu
384041a950
improve the perfermance of clear background for camera
2015-05-18 10:31:17 +08:00
samuele3hu
da2314b00a
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
2015-05-18 09:41:35 +08:00
minggo
2dbe375380
Merge pull request #11868 from joshuastray/bullet-preprocessor-macro
...
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
2015-05-18 09:33:00 +08:00
joshuastray
ead74ac89e
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
2015-05-17 23:11:17 +08:00
anniruddh.koppal
2db5a89b87
Added new audio engine with wav support
2015-05-15 18:17:52 -07:00
unknown
91432f0ddf
fixed include paths for arm builds
2015-05-15 15:35:36 -07:00
Jacky
19c5d2dc84
fixed some memory leakage and pixel cutting.
2015-05-15 17:18:19 +08:00
WenhaiLin
dc8492948e
Add Android Studio support
2015-05-15 16:37:43 +08:00
samuele3hu
71595898ed
Update the Lua binding for Physics3D ,related test cases and the template project
2015-05-15 16:25:07 +08:00
andyque
be62b3a8e2
Copy missing text color property of ui::Text.
2015-05-15 16:04:34 +08:00
iris-wy
68ec7c8ca1
Add enhance service API
...
Add enhance service API
2015-05-15 14:29:22 +08:00
minggo
70cefb1589
Merge pull request #11845 from MSOpenTech/v3-winrt-js-fix
...
V3: WinRT added ignore warning 4996 to Universal App libcocos2d-jsb
2015-05-15 11:34:44 +08:00
minggo
5e776381aa
Merge pull request #11820 from Dimon4eg/v3
...
Fix crash in web view if illegal character in url (Android only)
2015-05-15 10:12:54 +08:00
Huabing.Xu
fbe49f538d
remove WP8 code which is added by accident when resolve merge conflicts
2015-05-15 10:06:44 +08:00
Dale Stammen
46c69c7793
added ignore warning 4996 to hide the 200 deprecated warnings in libcocos2d-jsb
2015-05-14 19:00:53 -07:00
Huabing.Xu
c994f28914
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
2015-05-15 09:55:51 +08:00
samuele3hu
fa63471c0a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
2015-05-15 09:31:53 +08:00
samuele3hu
8db62c82f8
Add Lua bindings for Physics3D and related test cases
2015-05-15 09:28:03 +08:00
Ricardo Quesada
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
minggo
9f3284d62f
Merge pull request #11833 from super626/v3
...
getTriangleList to bundle and add terrain to 3d render queue
2015-05-14 18:16:27 +08:00
minggo
0a3e6338f1
Merge pull request #11834 from pandamicro/v3_origin
...
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +08:00
Huabing.Xu
84540c1ff4
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-14 11:55:10 +08:00
Huabing.Xu
57a3fa256a
Fix memory leak for FrameBufferObject
2015-05-14 11:19:13 +08:00
pandamicro
4146a6edf4
Fix incorrect property of cc.Texture2D
2015-05-14 10:41:10 +08:00
pandamicro
2685df73f2
Fix spine crash issue
2015-05-14 10:40:37 +08:00
pandamicro
8577055d5a
Implement localStorage.clear on Android
2015-05-14 10:40:25 +08:00
Huabing.Xu
e6e0a1d15c
refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D
2015-05-14 10:36:49 +08:00
CocosRobot
006f9fcd36
[AUTO]: updating luabinding & jsbinding automatically
2015-05-14 02:30:32 +00:00
yangxiao
e659373648
add getTriangleList to bundle
2015-05-14 10:30:20 +08:00
yangxiao
0f0f85b33c
terrain to 3d render queue
2015-05-14 10:29:50 +08:00
minggo
cbab1074fa
Merge pull request #11819 from cpascal/fix_defined
...
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
2015-05-14 10:21:38 +08:00
minggo
7732cd6e77
Merge pull request #11814 from super626/issue9767
...
add issue9767 test
2015-05-14 10:20:09 +08:00
minggo
1eaacd27c5
Merge pull request #11818 from joshuastray/fix-js-compilation
...
fix script binding code generation
2015-05-14 10:19:27 +08:00
Ricardo Quesada
fde5f8d63c
Adds better sample
...
adds clone support as well
2015-05-13 17:39:39 -07:00
Ricardo Quesada
aeea7ade14
RenderState can be part of Material and Technique
2015-05-13 14:12:37 -07:00
Ricardo Quesada
e95de4de62
fixes mipmap issue with parsing Sampler
2015-05-13 10:24:32 -07:00
dkorchinskiy
9d7e5e5edc
Fix crash in web view if illegal character in url (Android only)
2015-05-13 14:56:07 +03:00
cpascal
134355d763
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
...
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0
But CCImage.cpp just check wheather defined or not..
2015-05-13 20:52:32 +09:00
cpascal
7e9019f9d6
Revert "Fixed ogg filepath has unicode in Win32"
...
This reverts commit 382fd48b6a
.
2015-05-13 20:49:46 +09:00
joshuastray
4699b0cfb5
fix script binding code generation
2015-05-13 17:51:30 +08:00
Huabing.Xu
8311cf8920
Fix clearcolor overwrite bug
...
change test case for FrameBufferObject
2015-05-13 17:40:10 +08:00
cpascal
14f8b02d9b
Merge remote-tracking branch 'upstream/v3' into v3
2015-05-13 18:28:38 +09:00
Huabing.Xu
6097b4ddd2
add clearAllFBOs function in FrameBufferObject
2015-05-13 17:17:54 +08:00
minggo
1007c0bfdb
Merge pull request #11813 from CocosRobot/update_lua_bindings_1431504407
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-13 17:05:27 +08:00
minggo
3d0c7705f7
Merge pull request #11763 from Dimon4eg/v3
...
Fix web view leak on iOS
2015-05-13 17:02:50 +08:00
yangxiao
ec69a34c51
add issue9767 test
2015-05-13 16:16:45 +08:00
CocosRobot
6bf984f3d3
[AUTO]: updating luabinding & jsbinding automatically
2015-05-13 08:11:34 +00:00
Huabing.Xu
42514ee62f
FrameBufferObject works
2015-05-13 14:24:53 +08:00
Ricardo Quesada
f23b15c6d3
Merge pull request #11810 from ricardoquesada/api_fixes
...
More material samples
2015-05-12 23:03:40 -07:00
minggo
384c20f390
Merge pull request #11805 from super626/physics3d2
...
pass parameter by reference
2015-05-13 13:39:49 +08:00
Ricardo Quesada
c693573d77
more samples
...
and API fixes
2015-05-12 22:24:52 -07:00
Ricardo Quesada
a83c10fdbf
Merge pull request #11807 from ricardoquesada/material_vertexattrib
...
Adds support of VertexAttribBinding per Pass
2015-05-12 21:05:02 -07:00
Ricardo Quesada
d23ff0ea2c
Adds support of VertexAttribBinding per Pass
2015-05-12 19:58:09 -07:00
yangxiao
f2eacc154b
use reference param
2015-05-13 10:13:46 +08:00
minggo
5c227f4c92
Merge pull request #11528 from hobogenized/my_fix_branch
...
Minor changes in variable names to fix Xcode warnings
2015-05-13 10:03:33 +08:00
minggo
56d21b6040
Merge pull request #11680 from kaplad/vk_fix_logical_bug
...
Fix a logical bug that may make wrong behavior
2015-05-13 09:41:20 +08:00
minggo
a587b28e38
Merge pull request #11792 from super626/v3
...
particle3d can not be seen when added to scene with terrain
2015-05-13 09:38:21 +08:00
minggo
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
minggo
b51f78aa42
Merge pull request #11797 from super626/physics3d2
...
fix wrong indent and add const
2015-05-13 09:36:51 +08:00
minggo
b0c7531897
Merge pull request #11795 from CocosRobot/update_lua_bindings_1431410101
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-13 09:35:25 +08:00
Dale Stammen
f1fe802442
updated winrt keyboard support to support physical keyboard
2015-05-12 09:20:10 -07:00
pandamicro
3190d0e5fb
Add localStorage.clear test case
2015-05-12 19:02:22 +08:00
pandamicro
c7f3c2fa8b
Fix Scale9Sprite's inheritance issue triggered by its constructor
2015-05-12 18:04:01 +08:00
pandamicro
ef0854545b
Fix cc.EventMouse constants issue
2015-05-12 18:02:36 +08:00
pandamicro
c9ee849a2c
Add localStorage.clear in JSB
2015-05-12 18:02:14 +08:00
WenhaiLin
461241839d
Fixed compile error on visual studio 2015.
2015-05-12 17:04:56 +08:00
WenhaiLin
e53a977439
Add support for visual studio 2015.
2015-05-12 16:46:09 +08:00
Huabing.Xu
f0acf7ee7b
original version of frame buffer object
2015-05-12 16:43:17 +08:00
WenhaiLin
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
yangxiao
806d64dced
fix wrong indent and add const
2015-05-12 16:13:14 +08:00
CocosRobot
dbb51e2367
[AUTO]: updating luabinding & jsbinding automatically
2015-05-12 05:59:42 +00:00
minggo
cdfce7fcae
Merge pull request #11791 from CocosRobot/update_lua_bindings_1431407875
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-12 13:51:32 +08:00
minggo
398d36b58a
Merge pull request #11788 from joshuastray/spritepolygon
...
SpritePolygon binding and tests for js
2015-05-12 13:46:22 +08:00
CocosRobot
a7fb56de69
[AUTO]: updating luabinding & jsbinding automatically
2015-05-12 05:23:45 +00:00
Ricardo Quesada
1937431596
Material uses new file format
...
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
2015-05-11 21:31:33 -07:00
yangxiao
4d71175318
resove conflict
2015-05-12 12:12:29 +08:00
joshuastray
7a4ca3fe6a
add new files to project
2015-05-12 10:40:51 +08:00
jianglong0156
80326aa40e
add webiew jsb code
2015-05-12 10:30:51 +08:00
Huabing.Xu
cc0b3ffd2e
Merge branch 'v3' into v3_addClearforCamera
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-12 09:49:15 +08:00
minggo
5d0fc22d28
Merge pull request #11782 from WenhaiLin/v3-label-outline
...
Label:Fixed the characters with outline not on the same base line.
2015-05-12 09:46:26 +08:00
geron-cn
3e0b0a0feb
fix crash when run TestTimelineFrameEvent in cpp-test
2015-05-11 23:04:26 +08:00
Vladislav Kaplun
f67b4761da
Fix a logical bug that may wrong behavior
2015-05-11 15:15:00 +03:00
WenhaiLin
7e0dc7482b
Label:Fixed the characters with outline not on the same base line.
2015-05-11 18:05:03 +08:00
joshuastray
234f4db8a0
add SpritePolygon binding && js tests
2015-05-11 17:04:23 +08:00
CocosRobot
e325a3b746
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 08:33:55 +00:00
minggo
1129949722
Merge pull request #11772 from CocosRobot/update_lua_bindings_1431309376
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 16:24:22 +08:00
minggo
bcd57c3d90
Merge pull request #11776 from samuele3hu/v3_physics3d
...
Add macro limitation for Physic3D related
2015-05-11 16:09:19 +08:00
samuele3hu
9e9494ded0
Add limited macro for related Physic3D
2015-05-11 15:34:37 +08:00
songchengjiang
f25c02f230
fix bugs of terrain
2015-05-11 12:02:32 +08:00
CocosRobot
b5e9986d17
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 02:00:41 +00:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
cpascal
382fd48b6a
Fixed ogg filepath has unicode in Win32
...
In Win32, you can't play ogg file if the path contains unicode.
mpg123 library accepts utf8 filepath, but ogg(Vorbisfile) library
accepts ACP(ANSI CodePage) in Win32 environment.
2015-05-08 21:48:21 +09:00
dkorchinskiy
a71ef98275
Fix web view leak on iOS
2015-05-08 15:19:14 +03:00
WenhaiLin
07f5ec755a
AudioEngine:Fixed program may freeze if `AudioEngine::stop(int audioID)` or `AudioEngine::stopAll()` is invoked frequently on Android.
2015-05-08 18:29:45 +08:00
yangxiao
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
Huabing.Xu
713831ca76
fix rendering of camera clear quad
2015-05-08 14:21:23 +08:00
minggo
bf93289718
Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012
...
Remove vs2012 support in v3
2015-05-08 14:11:13 +08:00
minggo
14cebf7150
Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-08 10:42:31 +08:00
minggo
d587ffd5c0
Merge pull request #11736 from samuele3hu/v3_7_js
...
issue 10411:Bug in Physics manual Lua binding
2015-05-08 10:04:55 +08:00
CocosRobot
4195c4b250
[AUTO]: updating luabinding & jsbinding automatically
2015-05-08 02:03:02 +00:00
minggo
5140afe24c
Merge pull request #11715 from cnsoft/cnsoft-patch-1
...
try to fix a nullptr bug.
2015-05-08 09:55:13 +08:00
minggo
09ddf15b9f
Merge pull request #11740 from joshuastray/fix-debu
...
fix jsb debugger bug
2015-05-08 09:29:40 +08:00
Huabing.Xu
f064587ae5
refactor camera clear to immediate rendering
2015-05-07 18:32:32 +08:00
Jialong Zhai
be923b5901
fix jsb debugger bug
2015-05-07 18:24:30 +08:00
samuele3hu
23e4e0d4e3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-07 16:21:03 +08:00
samuele3hu
0d53065476
issue 10411:Bug in Physics manual Lua binding
2015-05-07 16:15:24 +08:00
minggo
775236b531
Merge pull request #11729 from samuele3hu/v3_7_js
...
Update the configure of js-tests and js-template on the win32 platform
2015-05-07 15:48:35 +08:00
Huabing.Xu
67ec758d15
add clear feature when before draw scene with a camera
2015-05-07 15:09:06 +08:00
minggo
65ec7f9545
Merge pull request #11728 from WenhaiLin/v3-label-pos
...
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 13:42:28 +08:00
minggo
a718c11eb6
Merge pull request #11724 from andyque/fix-binding-generator
...
fix upstream compile error
2015-05-07 11:47:20 +08:00
samuele3hu
243da71082
Update the project configure of js-tests and js-template on the win32 platform
2015-05-07 11:38:43 +08:00
WenhaiLin
03a1167902
Merge branch 'v3-label-pos' of https://github.com/WenhaiLin/cocos2d-x into v3.7
2015-05-07 11:31:59 +08:00
Wenhai Lin
d09bd21da4
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 11:20:22 +08:00
minggo
f76dd57bf7
Merge pull request #11727 from samuele3hu/v3_7_js
...
Add $(EngineRoot)external for cocos2d_headers.props
2015-05-07 11:17:10 +08:00
samuele3hu
87db3aba78
Add $(EngineRoot)external for cocos2d_headers.props
2015-05-07 11:11:33 +08:00
andyque
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
minggo
83a887f6a0
Merge pull request #11714 from ryule/v3
...
javaactivity-android.cpp needs JNIEXPORT for -fvisibility=hidden
2015-05-07 09:37:58 +08:00
minggo
fb112995d8
Merge pull request #11491 from milos1290/tween
...
Adding FloatAction to animate any property over time.
2015-05-07 09:34:44 +08:00
minggo
ba1e77d656
Merge pull request #11720 from WenhaiLin/v3-label-outline
...
Label:Fixed outline doesn't match with the characters exactly.
2015-05-07 09:30:37 +08:00
minggo
b60a31f12d
Merge pull request #11721 from samuele3hu/v3_7_js
...
Fix the compile error for libSpine on the win32 platform
2015-05-07 09:30:15 +08:00
Ricardo Quesada
c2bbc06340
compiles on win32
2015-05-06 08:46:48 -07:00
samuele3hu
b2c361f1a1
Fix the compile error for libSpine on the win32 platform
2015-05-06 23:30:08 +08:00
WenhaiLin
b1803d40db
Label:Fixed outline doesn't match with the characters exactly.
2015-05-06 17:17:30 +08:00
cnsoft
62741e3ff8
fix a nullptr bug.
...
get model from : http://pan.baidu.com/s/1sjofSWd pass: 9xis it will crash in cocos studio or client.
2015-05-06 14:38:38 +08:00
Jongryul Kook
dfe30e159f
Need JNIEXPORT for -fvisibility=hidden
2015-05-06 14:24:48 +09:00
Ricardo Quesada
fe59b093b5
adds love to header files
2015-05-05 21:48:05 -07:00
samuele3hu
cc4fe9b746
Modify the configuration about js-tests.
2015-05-06 10:52:23 +08:00
minggo
6351863b3c
Merge pull request #11696 from WenhaiLin/v3-label-shadow-glerror
...
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-06 09:53:39 +08:00
minggo
37302d6d8f
Merge pull request #11704 from MSOpenTech/v3-winrt-fix
...
V3: WinRT updated output name to libcocos2d_v3.7
2015-05-06 09:41:11 +08:00
CocosRobot
8470ab606b
[AUTO]: updating luabinding & jsbinding automatically
2015-05-06 01:07:26 +00:00
Ricardo Quesada
26bca75e0e
Merge pull request #11708 from ricardoquesada/no_exceptions
...
No throws in cocos2d-x code
2015-05-05 17:57:28 -07:00
Ricardo Quesada
10b71464a7
No throws in cocos2d-x code
2015-05-05 17:17:41 -07:00
Ricardo Quesada
90c9dffc1a
cleanup Material Code
...
- removes unused code
- removes experimental code
2015-05-05 15:59:41 -07:00
Dale Stammen
22951e8a6a
updated output name to libcocos2d_v3.7
2015-05-05 14:54:33 -07:00
Ricardo Quesada
ce95bfe059
Squashed commit of the following:
...
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 09:51:02 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 17:05:49 2015 -0700
Material system works Ok.
Deftaul states are being applyied to RenderState::StateBlock::_default
state as well!
commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 15:52:09 2015 -0700
more fixes for material
blending works as expected
commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 12:14:00 2015 -0700
compiles on Android
compiles on Android
commit 5feef67410a6e8408414230887c177a5cc3d8c35
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 11:01:46 2015 -0700
Cmakefiles
works with Cmake again
commit 1366da20efd4f63f683ac9264e18aa71d84bcc71
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 2 18:17:50 2015 -0700
Particle3D working Ok with its own uniforms
commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 17:32:00 2015 -0700
MeshCommand now works 100% on Material!
commit 92d641e29675ffc58daba48fcdcc5ec6459be02f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 15:49:14 2015 -0700
multiple meshes work Ok
commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 13:43:56 2015 -0700
Adds `clone` to GLProgramState
commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:54:34 2015 -0700
adds comment about the glprogramstate bug
commit 2d008ec90557025507e0b17284e60b39fc9b42d3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:28:39 2015 -0700
some uniforms moved to Material
commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 16:52:07 2015 -0700
depth test moved to Material!
commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 13:12:28 2015 -0700
Material/Technique/Pass subclass of RenderState
Inheritance of RenderState. Code from GamePlay3D
commit a8b888dc30cf7ab4fae186acec2a366dfb967116
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 12:05:26 2015 -0700
same as v3
commit c026de5318a2a03beed1de6d7a0efda431569a5c
Merge: 4561e3f 254a4b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 11:37:40 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 18:02:21 2015 -0700
fixes on blending
commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:51:05 2015 -0700
better defaults for StateBlock
commit 3a661c35908aa075754d7b9dfac45be1af3b38e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:46:36 2015 -0700
RenderState::bind() binds lots of states
commit 074d5fb4a485e4ac32996c345e314594806e3cf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:40:07 2015 -0700
Adds REnderState parsing in .material
commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:06:31 2015 -0700
RenderState added into RenderState
Code based on GamePlay3D. Adds GamePlay3d License.
commit 04a6295ca5839e2e1202881b8a10733685c113d6
Merge: 52c916f 5671818
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 11:27:55 2015 -0700
Merge branch 'v3' into material_system
commit 52c916fb4df04558433b1370102a5e9269f73607
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 18:15:12 2015 -0700
order files alphabetically
order files alphabetically
commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 17:46:07 2015 -0700
Adds cmake and android support
commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 16:33:50 2015 -0700
for some reason the callback was crashing
... bug in the callback code?
in any case, we didn't need it and it was making the code slower.
commit 7844d32d04cb411ddae139d9598adcb04b899606
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 14:00:24 2015 -0700
more little fixes
commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 12:11:28 2015 -0700
MeshCommand using Material internally
works
commit 67a435d66b4e554b4d24e462ca2ad42408157e69
Merge: 6dee7ca b9a994f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 10:34:03 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 6dee7cac6a51b4c123aabb111b0f8951082b1507
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 17:41:27 2015 -0700
improved readebility of MeshCommand code
commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 15:41:07 2015 -0700
mesh supports Material
`Mesh` supports `Material`
Now `MeshCommand` needs to implement it correctly.
commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73
Merge: 05b16f5 bd5f4e0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 11:23:28 2015 -0700
Merge branch 'v3' into material_system
commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 17:40:48 2015 -0700
Adding Material into Mesh
WIP.
commit bc62f1a146ff9ad9864d8ff317f6a9540760066a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:39:54 2015 -0700
cosmetic
commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:26:41 2015 -0700
moves even more code form Sprite3D to Mesh
commit 04643bed3c277f0a775e962a5c87f550b1a59e74
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:15:21 2015 -0700
Moves "draw" from `Sprite3D` to `Mesh`
commit 4bf884cdcb1a8df7522adeab364368493aba11e0
Merge: 2f305fc 2199bf1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 15:00:50 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 14:46:28 2015 -0700
cosmetic
commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 16:44:21 2015 -0700
revert my changes...
...actually the GLProgramState code was Ok... ouch
commit 36323c62eae2f8dbdcd7e13075758752cce44132
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 15:40:54 2015 -0700
parsing GLProgramState validates the attributes
commit a406d6236a78244f73e81ded0b4148199a8677e5
Merge: 3be7fde cf177bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 12:10:31 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 17:45:34 2015 -0700
little progress on Sprite3D + Material
GLProgramState needs to decouple Uniforms from Attributes in
`applyGLProgram`.
binding the attributes is something that needs to be done
at a different order.
Perhaps the attributes are part of a VAO or something else.
the method `applyAttributes()` has a variable to avoid that...
but everything looks very hackish.
commit f82496c61c9cb5a0787f883a4fb2d475889fa711
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 15:46:02 2015 -0700
doesn't crash :)
but doesn't show anything either
commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 13:35:45 2015 -0700
adding sprit3d test
commit e716da63fe053b48db06f2aed9e0280256dd5f1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 12:10:32 2015 -0700
MeshCommand: initial draw with Material
commit d758041d81c3e6275997205e6395c46006bcc4ca
Merge: 8cdc99f ca1a95f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 10:41:05 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 21:57:28 2015 -0700
adding Material to MeshCommand
commit 0121872709c5e584b9b9f102e0f8dfc9c836841b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 19:39:09 2015 -0700
pre commit before merging MeshCommand
commit 06c0ac2a67e303bde98dff75ac436ec22de59263
Merge: 736feb1 0287b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 18:19:00 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 736feb1b6495b7411525afb130015bdb31b5c471
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:22:03 2015 -0700
Pass conforms to create()/init() pattern
commit 6103ffbb8479681b6665e81f0572bc3287919d07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:04:19 2015 -0700
defines are strings
better error checking when creating objects
autorelase added in Pass, Material, Technique
commit 1efcbab63c7ca4259d50825144184baee1b577ac
Merge: 5b233bc fd3e38b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 11:23:47 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 5b233bc879bd65123092d366257843465ec1d306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:31:37 2015 -0700
blur effect works with alpha
commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89
Merge: e4c1dd2 425b2b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:35 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:07 2015 -0700
Material, Technique, Pass: they have parent
commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 21:48:06 2015 -0700
multipass works
commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:31:04 2015 -0700
yeah!
more materials... a lot to do yet
commit d54d24ed185071ce1350bbf71914a64c9f6f228e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:06:46 2015 -0700
yeah! works!
commit 1e70cb553148e6c136df42a789bf85184e73762d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 16:43:54 2015 -0700
simple test of material system works!!!
commit c8581dfe9e970a3004254987416d75cccc644ccd
Merge: 83aeec4 5d5fa3d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 13:51:45 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 18:04:23 2015 -0700
JSON file curated
fixes minor bugs
commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 17:22:36 2015 -0700
parsers shaders!
including uniforms
commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 23:24:18 2015 -0700
Material parses texture
commit 1f678faf9d6c25f6405591f052da511281be8768
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 18:22:33 2015 -0700
material parsing almost working
commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d
Merge: d0ff296 d54ddbd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 09:23:23 2015 -0700
Merge branch 'v3' into material_system
commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 18:42:42 2015 -0700
json parsing broken
ha... I need to parse the content of the file, to the name of the file.
to be fixed tomorrow
commit e5aab39e5774d997f848155fc7209e9fbbd03bbc
Merge: 81e93fa bc34554
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 10:19:11 2015 -0700
Merge branch 'v3' into material_system
commit 81e93faac9d80888e975ee19d7412c54daf439a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:41:12 2015 -0700
Adds more dummy files for material
commit 5552a1e099bcf960d962c5369973ea663f802895
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:01:16 2015 -0700
adds empty test
commit 7027c85fb24109f1ed4c50877dbec35618b5b39c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 15:36:24 2015 -0700
more material fixes
multiple passes added in renderer
commit db6745ead9879c6ce66b1921f32bf927421c54d9
Merge: 58d2412 8a160d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 11:52:30 2015 -0700
Merge branch 'v3' into material_system
commit 58d241266bdbd88162bb7ae9a7e868af173e6375
Merge: 0eccb23 b409f20
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:42:35 2015 -0700
Merge branch 'v3' into material_system
commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0
Merge: 83494de 967f35a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:18:34 2015 -0700
Merge branch 'cpp_compiles_on_mac' into material_system
commit 83494dedd0f4e7092f0267187cf07bd7de7723c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:09:59 2015 -0700
compiles on Mac
commit cca5b060164182b67df21fa330dce938e17fb324
Merge: dfc3740 09c50c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 13:54:59 2015 -0700
Merge branch 'v3' into material_system
commit dfc374099ca02e547478d24fa8fd61817a85862c
Merge: fa2152b 64c45fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 8 14:16:27 2015 -0700
Merge branch 'v3' into material_system
commit fa2152b3402e3519d35f98309c4acc03b6790370
Merge: 90b7b6f b648d1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:15:28 2015 +0800
Merge branch 'v3' into material_system
commit 90b7b6f6540edff156e22fdf38021a5c83194deb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:13:24 2015 +0800
little changes to pass
commit 7f8b83017f03572a3698f431b6af497d62fcfa25
Merge: 7460614 0779d05
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:36:43 2015 +0800
Merge branch 'v3' into material_system
commit 7460614dd8b7eff5d8c759be54dd205333b26033
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:23:17 2015 +0800
small changes
commit fa0354e74983795adafad3bedc9c50f6e8e328c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Mar 26 18:20:46 2015 -0700
initial Material system
2015-05-05 13:07:32 -07:00
WenhaiLin
8f6277c540
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-05 18:30:33 +08:00
minggo
902c033838
Merge pull request #11683 from WenhaiLin/v3-label-i10576
...
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-05 18:19:33 +08:00
minggo
99911b6f3f
Merge pull request #11694 from CocosRobot/update_lua_bindings_1430804693
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-05 17:17:55 +08:00
samuele3hu
f1b5729183
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-05 16:14:57 +08:00
samuele3hu
037c17fe5d
Remove vs2012 support in v3
2015-05-05 16:11:26 +08:00
CocosRobot
534868368e
[AUTO]: updating luabinding & jsbinding automatically
2015-05-05 05:48:55 +00:00
CocosRobot
6ef35d48ae
[AUTO]: updating luabinding automatically
2015-05-05 03:31:53 +00:00
minggo
701d5fa827
Merge pull request #11673 from vovkasm/dev/v3-cleanup
...
Fix warnings in v3.
2015-05-05 11:26:10 +08:00
minggo
5a7cf31663
Merge pull request #11682 from CocosRobot/update_lua_bindings_1430789665
...
[AUTO]: updating luabinding automatically
2015-05-05 11:17:06 +08:00
zhangbin
23ed3dbe4c
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-05-05 10:53:04 +08:00
zhangbin
b4f2d94109
Update js bindings & js tests.
2015-05-05 10:50:19 +08:00
minggo
e75936b778
Merge pull request #11669 from samuele3hu/v3.7
...
Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public
2015-05-05 09:37:56 +08:00
CocosRobot
4414536612
[AUTO]: updating luabinding automatically
2015-05-05 01:36:54 +00:00
minggo
564918c604
Merge pull request #11659 from WenhaiLin/v3.7
...
Label:Fixed crash.
2015-05-05 09:30:54 +08:00
WenhaiLin
26c9be7881
Add FileUtils::getSuitableFOpen[window-universal]
2015-05-04 16:06:04 +08:00
WenhaiLin
1839564fbb
Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7
2015-05-04 10:16:47 +08:00
WenhaiLin
22c46b5c14
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-04 10:07:37 +08:00
TankorSmash
88833213ca
Fix setSprite never updating progress on ProgressTimer
...
Basically whenever you set a new sprite on a ProgressTimer, the new sprite is hidden.
Calling setPercentage once with the same value doesn't work because the new percentage is the same as the old one. I've got a workaround setting the percentage to 0 and then back to the old value, but this change seems to solve that issue entirely.
2015-05-03 14:35:50 -04:00
WenhaiLin
004cb5464e
Fixed crash
2015-05-03 22:15:58 +08:00
Vladimir Timofeev
fd3e44b72b
Fix warning in the ClippingNode class. Do not define the setProgram(Node*,GLProgram*) helper function on 'non OpenGL ES' platforms.
2015-05-01 12:36:19 +03:00
Vladimir Timofeev
912956a3b3
Correct field initialization order in spine (Xcode warnings).
2015-05-01 12:20:11 +03:00
Vladimir Timofeev
0aecc15a25
Correct field initialization order in various places (Xcode warnings)
2015-05-01 12:19:30 +03:00
Vladimir Timofeev
2d8c687d6e
Fix the Frame class:
...
* Field initialization order (warning in Xcode)
* Make conditions with && and || more readable for programmers (warning in Xcode)
2015-05-01 11:51:20 +03:00
Vladimir Timofeev
ad494a7131
Make a UserDefault destructor to be virtual.
...
Because the UserDefault has virtual functions and allow programmers to inherit from, it must have a virtual destructor to allow a child object to destroy correctly.
2015-05-01 11:45:47 +03:00
samuele3hu
f4b57511b0
Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public
2015-04-30 17:18:12 +08:00
WenhaiLin
7472bafee3
Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program.
2015-04-30 15:13:41 +08:00
CocosRobot
2b916b3b80
[AUTO]: updating luabinding automatically
2015-04-30 06:56:36 +00:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
minggo
79a6f2f510
Merge pull request #11652 from MSOpenTech/v3.6-winrt-fix
...
V3.6 Windows Phone 8.1 fix for issues 11606 and 11607
2015-04-30 09:41:52 +08:00
Dale Stammen
904abeab87
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
2015-04-29 09:48:14 -07:00
Dale Stammen
f64012d77b
special shaders for Windows Phone 8.1 with no gl_PointSprite
2015-04-29 09:47:44 -07:00
WenhaiLin
1950498b0a
Replace tab with space.
2015-04-29 18:41:10 +08:00
WenhaiLin
8f3566add9
Merge branch 'v3.6' of https://github.com/WenhaiLin/cocos2d-x into v3.6
2015-04-29 18:37:18 +08:00
Wenhai Lin
1d9ff11837
VideoPlayer:Fixed can't play video on Android 2.3.x
2015-04-29 18:32:59 +08:00
minggo
9586cdf2c8
Merge pull request #11650 from xiaofeng11/v3.6
...
Fix a logical bug that may cause null pointer been used
2015-04-29 16:21:17 +08:00
XiaoFeng
9d0741544c
Fix a logical bug that may cause null pointer been used
2015-04-29 15:58:44 +08:00
minggo
d768c8c5f4
Merge pull request #11645 from xiaofeng11/v3.6
...
Fix wrong shadow & outline color bug for text component
2015-04-29 14:16:26 +08:00
XiaoFeng
49b465f0f4
Fix wrong shadow & outline color bug for text component
2015-04-29 10:46:23 +08:00
minggo
d0cf310a0b
Merge pull request #11643 from super626/v3.6
...
missing texture color
2015-04-29 10:33:32 +08:00
yangxiao
59988fdcc0
missing texture color
2015-04-29 10:30:18 +08:00
minggo
37c9a9cb98
Merge pull request #11636 from super626/v3.6
...
fix bug some 3d sprite crash when texture missing on release mode
2015-04-29 09:35:37 +08:00
yangxiao
e424cb4777
fix bug some 3d sprite crash when texture missing on release mode
2015-04-28 23:55:23 +08:00
minggo
21987592d2
Merge pull request #11632 from WenhaiLin/v3.6
...
Fixed warns and crash on Win32.
2015-04-28 21:18:42 +08:00
CocosRobot
1f02af4a94
[AUTO]: updating luabinding automatically
2015-04-28 12:21:56 +00:00
minggo
48729b653f
Merge pull request #11630 from samuele3hu/v3.6_test1
...
Add Lua-bindings for SpritePolygon and related test case
2015-04-28 20:13:52 +08:00
WenhaiLin
ce7e36f76e
Fixed warns and crash on Win32.
2015-04-28 20:10:56 +08:00
samuele3hu
5819159889
Add Lua-bindings for SpritePolygon and related test case
2015-04-28 18:19:57 +08:00
Milos Jakovljevic
0343fd4061
Changing the name of the Action, adding more comments
2015-04-28 11:48:19 +02:00
minggo
85e58dce55
Merge pull request #11598 from HueyPark/v3.6
...
Fix android http client memory leak
2015-04-28 16:38:21 +08:00
minggo
164cf78844
Merge pull request #11620 from WenhaiLin/v3.6
...
Fixed compile error on VS 2012.
2015-04-28 13:36:16 +08:00
minggo
692ed1e4ad
Merge pull request #11625 from xiaofeng11/v3.6
...
Fix simulator crash when miss some armature resource
2015-04-28 13:34:32 +08:00
XiaoYang
8920491287
Merge pull request #314 from lvlonggame/v3
...
fix bug: set sprite name
2015-04-28 12:00:24 +08:00
XiaoFeng
27e3dce628
Fix simulator crash when miss some armature resource
2015-04-28 11:54:36 +08:00
samuele3hu
2a59180da3
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1
2015-04-28 11:30:01 +08:00
samuele3hu
c801d1868c
Update Sprite3DTest and VideoPlayerTest about Lua
2015-04-28 11:27:50 +08:00
andyque
854fcdf2bf
fix spritepolygon
2015-04-28 11:26:21 +08:00
andyque
a6a2dddfe9
fix spritepolygon
2015-04-28 10:51:26 +08:00
WenhaiLin
41e2d84116
Fixed compile error on VS 2012.
2015-04-28 10:35:21 +08:00
minggo
99482d4e48
Merge pull request #11614 from xiaofeng11/v3.6
...
Fix simulator crash when add animation under a user defined lua extension
2015-04-28 09:45:44 +08:00
minggo
a32a1029f5
Merge pull request #11617 from lvlonggame/v3
...
fix bug: set sprite name
2015-04-28 09:35:04 +08:00
minggo
ce9f40fb9a
Merge pull request #11619 from samuele3hu/v3.6_test1
...
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygon
2015-04-28 09:32:30 +08:00
samuele3hu
dc765aee25
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1
2015-04-28 09:19:03 +08:00
samuele3hu
51bcac9e84
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest
2015-04-28 09:17:00 +08:00
lvlong
cecea92fde
fix bug: set sprite name
2015-04-27 19:12:44 +08:00
CocosRobot
a7edda72f5
[AUTO]: updating luabinding automatically
2015-04-27 09:47:08 +00:00
XiaoFeng
28264c0742
Fix simulator crash when add animation under a user defined lua extension
2015-04-27 17:42:20 +08:00
minggo
5197044e8c
Merge pull request #10679 from loadrunner/physics_sensor
...
added sensor property to shapes
2015-04-27 17:40:08 +08:00
WuHao
597d2289c0
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
2015-04-27 17:31:50 +08:00
WuHao
a046f74c4d
fix anchor point bug
2015-04-27 17:30:38 +08:00
WuHao
dcf8f674bc
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
...
Conflicts:
cocos/2d/SpritePolygon.cpp
cocos/2d/SpritePolygonCache.cpp
2015-04-27 17:18:26 +08:00
minggo
ee29888d8e
[ci skip] update version
2015-04-27 16:46:03 +08:00
WuHao
815c6a9b74
merge the start and end points
2015-04-27 16:33:54 +08:00
minggo
2d2f0aac59
fix indent
2015-04-27 16:25:24 +08:00
minggo
8c4cecca0d
fix indent and translate Chinese comment to English
2015-04-27 16:22:54 +08:00
CocosRobot
09a6cc19b7
[AUTO]: updating luabinding automatically
2015-04-27 07:48:42 +00:00
minggo
c0b2433bb5
Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows
2015-04-27 15:45:23 +08:00
samuele3hu
3de665b9cd
Update SpritePolygon
2015-04-27 15:19:26 +08:00
minggo
c9bacd58e8
Merge pull request #11591 from Wu-Hao/v3.6
...
V3.6
2015-04-27 14:22:21 +08:00
WuHao
c7e990dcae
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
...
Conflicts:
cocos/2d/SpritePolygon.cpp
2015-04-27 13:39:41 +08:00
WuHao
9f2ea5fbb9
fixed some SpritePolygon create, added more tests
2015-04-27 13:34:47 +08:00
samuele3hu
d7dbb910d0
Update SpritePolygonCache
2015-04-27 11:57:36 +08:00
samuele3hu
cf53d13f6f
Update SpritePolygon.cpp
2015-04-27 11:07:08 +08:00