Commit Graph

11164 Commits

Author SHA1 Message Date
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
MAUSMAUSgames 847cba026c added _flags to Action, change API to stopActionsByFlags 2015-05-28 09:52:49 +02: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
waiter 67a323e14a Fix a bug in Scheduler which may case Force Close
Fix a bug in Scheduler which may case Force Close
2015-05-28 10:53:46 +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
MAUSMAUSgames 98c3ba6f4b using Action::_tag as flag field
adding options to use tag as flag field to Node::stopAllActionsByTag
and ActionManager::removeAllActionsByTag
2015-05-24 17:30:26 +02: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
Vladimir Perminov d2b58dd39b CaptureScreen save file in thread
Check already working
Start save file in AsyncTaskPool::TaskType::TASK_IO
2015-05-17 20:48:49 +03:00
Vladimir Perminov bfb3fbb1c0 Revert _checkPath 2015-05-17 19:24:57 +03:00
joshuastray ead74ac89e add CC_ENABLE_BULLET_INTEGRATION=1 to js project 2015-05-17 23:11:17 +08:00
Vladimir Perminov 295e8532d2 FileUtilsWin32 correct use all unicode version winapi
Move to FileUtilsWin32 implements:
isDirectoryExistInternal
isDirectoryExist
createDirectory
removeDirectory
removeFile
renameFile

And use common convert to wide char.
2015-05-17 12:40:14 +03: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
samuele3hu 6f17dcecf2 Update config.json for 3rd-party-libs and SpritePolygonCache 2015-04-27 11:01:47 +08:00
minggo 0a8f533e80 Merge pull request #11590 from super626/v3
Animate3D Quality control
2015-04-27 10:58:10 +08:00
WuHao c2cefadb6f Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 2015-04-27 10:44:56 +08:00
WuHao cd0ebc1801 fix the info struct 2015-04-27 10:44:23 +08:00
CocosRobot 09cddb4d4b [AUTO]: updating luabinding automatically 2015-04-27 02:25:05 +00:00
minggo c500d6b0a7 Merge pull request #11588 from WenhaiLin/v3-jsb
[js-tests]Fixed crash.
2015-04-27 10:20:07 +08:00
minggo 033cfaa30b Merge pull request #11592 from fusijie/add_EaseRateAction_create_method
Add EaseRateAction::create() method.
2015-04-27 10:16:38 +08:00
samuele3hu bd5ca083e9 Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00
HueyPark 25a9c90b54 Fix android http client memory leak 2015-04-26 20:52:09 +09:00
Danut Chereches 5f692962b9 fixed 'seperate' typo
issue #8408
2015-04-25 00:02:39 +03:00
Jacky 633c1aed75 Add EaseRateAction::create() method. 2015-04-24 18:31:44 +08:00
WuHao 9496a48800 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-24 18:29:23 +08:00
WuHao c1d10ffa1c fixed poly2tri creation method, added testCase 2015-04-24 18:28:28 +08:00
WuHao 5620da1adf fixed anchor point issue, removed rect rotated property 2015-04-24 18:17:12 +08:00
XiaoYang d7deabc3ad Merge pull request #311 from lvlonggame/v3
animate 3d quality
2015-04-24 17:54:28 +08:00
WuHao 0e318dd8dc fixed UV issue, also taking account of contentScaleFactor, made test case better 2015-04-24 17:39:43 +08:00
WenhaiLin 5e5cd5faa1 [js-tests]Fixed crash on Win32/Universal. 2015-04-24 17:12:46 +08:00
minggo 0198c8707b Merge pull request #11572 from super626/v3
Fix memory leak
2015-04-24 16:42:33 +08:00
songchengjiang 2aee4abd66 fix https://github.com/cocos2d/cocos2d-x/issues/11203
fix the error of CCBundle3D
2015-04-24 15:31:50 +08:00
lvlong a379196340 modify comments 2015-04-24 14:06:20 +08:00
Chris Hannon da74d1be93 [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-04-24 00:17:43 -04:00
Chris Hannon e1923f3dbf [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-04-24 00:17:43 -04:00
lvlong 8e51a561b1 modify some about animate3D quality! 2015-04-24 11:49:28 +08:00
XiaoFeng 07725ce84d fix 2015-04-24 11:40:15 +08:00
minggo 2245272922 Merge pull request #11560 from natural-law/v3-jsb
Add js related files.
2015-04-24 11:11:16 +08:00
zhangbin 252e5e1183 Make the lua projects temporarily works well. 2015-04-24 10:17:38 +08:00
pandamicro 6b4f8cc0ab Fix local storage get item issue when item inexist 2015-04-23 19:06:06 +08:00
WuHao 07349ff588 initial cpp test 2015-04-23 18:03:03 +08:00
XiaoFeng faddbd8e71 Add function to texture cache for studio to check if texture have been already loaded 2015-04-23 16:50:28 +08:00
WuHao ada7ced0a8 change getVecCount to ssize_t 2015-04-23 16:40:11 +08:00
zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 2015-04-23 15:46:19 +08:00
lvlong 59b7ab8154 fix bug: animation curve memory leak ! 2015-04-23 14:35:37 +08:00
WuHao 1ee87140b1 renamed PolySprite to SpritePolygon 2015-04-23 14:34:56 +08:00
zhangbin dcca32bd82 Update the CMakeLists & the remote url of submodule js-bindings. 2015-04-23 14:23:19 +08:00
Dale Stammen ac8755868d need to call Cleanup() if app is terminating 2015-04-22 19:13:12 -07:00
Dale Stammen b78f830ed8 cleaned up Draw() 2015-04-22 19:11:42 -07:00
Dale Stammen 4119b0f10d cleaned up Draw() 2015-04-22 19:11:29 -07:00
Dale Stammen 22daece170 made Cleanup() public 2015-04-22 19:08:11 -07:00
hobogenized 30b2821729 Reverting spine files 2015-04-22 22:07:52 -04:00
Dale Stammen c3335551b8 added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE 2015-04-22 19:07:48 -07:00
samuele3hu 7c77bc9587 Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
minggo 1f5e5b5058 Merge pull request #11536 from xiaofeng11/v3
Update Node3DReader compatibility
2015-04-22 10:25:49 +08:00
minggo 44fefde83d Merge pull request #11537 from CocosRobot/update_lua_bindings_1429611994
[AUTO]: updating luabinding automatically
2015-04-22 10:25:31 +08:00
Dale Stammen 0f3ff6f762 Merge branch 'v3' into v3-winrt-typo-fix 2015-04-21 18:18:00 -07:00
Dale Stammen 84a47000b5 rename -win to -winrt 2015-04-21 18:17:18 -07:00
Dale Stammen aec086a473 convert BGR and RGB to GUID_WICPixelFormat24bppRGB 2015-04-21 18:16:54 -07:00
Dale Stammen 516966a96f check for PixelFormat::DEFAULT 2015-04-21 18:11:56 -07:00
Dale Stammen a2ed8e7234 disable INCREMENTAL for ARM builds. Fixes lnk2013 error 2015-04-21 08:38:19 -07:00
Dale Stammen 0c47df5df2 fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments 2015-04-21 06:21:32 -07:00
lvlong 4f96037e15 1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3
2. fix bug: memory leak!
2015-04-21 19:38:38 +08:00
CocosRobot 30ccbe3526 [AUTO]: updating luabinding automatically 2015-04-21 10:29:17 +00:00
pipu fcd48ce2c3 Reset method purge() definition. 2015-04-21 18:16:38 +08:00
pipu 04cde1c52c Modify that serialize base attribute for Node3DReader. 2015-04-21 18:05:46 +08:00
minggo 80bc3bf021 Merge pull request #11523 from MSOpenTech/v3-winrt-backbutton
V3 Windows Phone 8.1 back button support
2015-04-21 17:10:01 +08:00
lvlong cae82fcdeb fix bug: memory leak 2015-04-21 15:02:09 +08:00
hobogenized e2aaa88f1e Attempting to fix build error; removed extraneous comment 2015-04-21 01:56:02 -04:00
hobogenized 33f642c298 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into my_fix_branch 2015-04-21 01:51:52 -04:00
hobogenized 9b34e60896 Renamed another shadowed variable since ii was already taken 2015-04-21 00:12:51 -04:00
zhangbin 8abd2269bd Update js bindings. 2015-04-21 11:46:00 +08:00
hobogenized b7b6307703 Using ii instead of currIndex for brevity 2015-04-20 23:13:53 -04:00
hobogenized 22df7df76a Renamed shadowed variables to reduce confusion when reading source code 2015-04-20 22:57:55 -04:00
minggo f6276dd4b3 Merge pull request #10983 from perminovVS/v3-texture-init-check-error
Clean possible GL error init Texture2D
2015-04-21 09:50:54 +08:00
Dale Stammen 83b68ef693 added comment on how back button event is handled 2015-04-20 18:36:58 -07:00
minggo 7a1a021974 Merge pull request #11517 from andyque/fix-widget-gray-shader-issue
Fix widget gray shader issue
2015-04-21 09:34:18 +08:00
minggo fa6735e68f Merge pull request #11518 from perminovVS/v3-dev-optimize-vec3-v2.1
Optimize Vec3 use constructor default.
2015-04-21 09:33:05 +08:00
Dale Stammen 50f381f070 added CCLOG message to describe how to handle Windows Phone back button event 2015-04-20 18:30:52 -07:00
minggo 3e9fd67ab2 Merge pull request #11520 from super626/v3
Improve Animate3D
2015-04-21 09:30:43 +08:00
Dale Stammen 4169ebf5c8 Windows Phone 8.1 back button and terminate app support 2015-04-20 10:43:34 -07:00
Dale Stammen e00b0dfbd9 Merge branch 'v3' into v3-winrt-backbutton 2015-04-20 08:17:16 -07:00
yangxiao 7c37123dbd remove fade in animation if no running animation 2015-04-20 19:45:31 +08:00
yangxiao e8b21589fc avoid some remap 2015-04-20 19:33:16 +08:00
htl 2476f2b52d fixed win32 application return code 2015-04-20 18:27:21 +08:00
yangxiao 1a50610c00 Merge branch 'newcode' into v3 2015-04-20 18:21:07 +08:00
zhangbin 6ee624796a Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb 2015-04-20 18:09:57 +08:00
zhangbin a1b5fa5a8e Solve the error in js template. 2015-04-20 18:09:39 +08:00
Vladimir Perminov 6ef1e7e3d0 Optimize Vec3 use constructor default.
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
2015-04-20 12:56:43 +03:00
andyque 484153aff7 remove ui shaders in windows platform 2015-04-20 17:54:49 +08:00
yangxiao bc62338b36 map use node instead of sprite 2015-04-20 17:49:01 +08:00
minggo 15fe283c2e Merge pull request #11515 from xiaofeng11/v3
update compatibility for upgraded node3d come with 2.2.5 version
2015-04-20 17:05:32 +08:00
andyque 6fb29ad1b0 remove uishader settings 2015-04-20 17:04:49 +08:00
andyque e02dad3489 fix ui grayscale shader memory release issue 2015-04-20 17:00:40 +08:00
minggo cdf00408a7 Merge pull request #11513 from andyque/fix-wp8.1-include-path
fix freetype include path on win-8.1
2015-04-20 16:01:55 +08:00
pipu 388e4b3a93 Modify that parse position for Node3DReader. 2015-04-20 15:56:36 +08:00
andyque 1e514f0a2b fix freetype include path on win-8.1 2015-04-20 15:54:31 +08:00
minggo 76613fc85f Merge pull request #11506 from CocosRobot/update_lua_bindings_1429508341
[AUTO]: updating luabinding automatically
2015-04-20 15:51:57 +08:00
minggo 8f88afa123 Merge pull request #11510 from xiaofeng11/v3
Bug fix
2015-04-20 15:50:44 +08:00
CocosRobot 87e29db218 [AUTO]: updating luabinding automatically 2015-04-20 05:40:58 +00:00
minggo fc16bc6154 Merge pull request #11501 from samuele3hu/v3_studio2
Add Lua bindings for WebView and related test case
2015-04-20 13:36:08 +08:00
samuele3hu 9477e89723 Fix the compile error on the win32 2015-04-20 11:46:48 +08:00
pipu 4b320a1677 Modify that parse text shadow and outline. 2015-04-20 11:39:43 +08:00
minggo bb4e749a93 Merge pull request #11489 from dumganhar/clean-order
[Director FIX]: Clean all schedulers and remove all eventlisteners after exiting scene
2015-04-20 10:47:37 +08:00
minggo c7fe7704d4 Merge pull request #11499 from perminovVS/v3-dev-user-default-only-delegate
UserDefault::setDelegate
2015-04-20 10:36:56 +08:00
samuele3hu 4f22a1470b Update the project setting 2015-04-20 10:11:39 +08:00
WenhaiLin dc768dbd8c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-20 10:06:48 +08:00
samuele3hu 067ad6ad60 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
	cocos/scripting/lua-bindings/proj.android/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
2015-04-20 10:05:02 +08:00
Dale Stammen 5f263968ae Merge branch 'v3' into v3-winrt-backbutton 2015-04-19 18:55:02 -07:00
minggo 5b5d9f1337 Merge pull request #11498 from perminovVS/v3-dev-optimize-vec2
Optimize Vec2
2015-04-20 09:53:28 +08:00
Dale Stammen ec378b612e added listener if back button event not handled by app 2015-04-19 18:53:10 -07:00
Dale Stammen a97d5c5370 added support for hardware back button on Windows Phone 8.1 2015-04-19 16:31:30 -07:00
Vladimir Perminov 87d0d4f677 UserDefault::setDelegate
UserDefault very slow, each call need read / write and parse xml file.
Delegate makes it possible to use other variants.
2015-04-19 22:07:48 +03:00
Vladimir Perminov 4c33050536 Optimize Vec2
small function Vec2 move to Vec2.inl
Added:
setZero();

Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
Vladimir Perminov 694b9adc1e Add FileUtils::getSuitableFOpen
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.

Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename

all fopen use FileUtils::getSuitableFOpen
2015-04-19 14:00:27 +03:00
Milos Jakovljevic a13c519882 Adding FloatAction to animate any property over time. 2015-04-18 14:35:14 +02:00
James Chen 6864a4a7bb [Director FIX]: Clean all scheduler and remove all eventlisteners after exiting scene 2015-04-18 15:06:09 +08:00
Dale Stammen f1f0c5a653 start of back button support 2015-04-17 15:47:52 -07:00
Dale Stammen 79f312d101 call pause on correct thread 2015-04-17 09:31:02 -07:00
Dale Stammen 2ccff5671a fix for encoding images with WIC 2015-04-17 09:20:23 -07:00
minggo f210fadb00 Merge pull request #11472 from milos1290/v3
Adding Lerp for Vec3
2015-04-17 17:56:10 +08:00
minggo e133f81226 Merge pull request #11482 from samuele3hu/v3_remove_useless
[ci skip]Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B
2015-04-17 17:54:53 +08:00
minggo f38bfdf212 Merge pull request #11478 from WenhaiLin/v3-label-fix
Label:Fixed the shadow effect of system font might not be shown.
2015-04-17 17:53:52 +08:00
minggo 768d2bdb48 Merge pull request #11481 from andyque/remove-all-lz-in-android
remove system zlib dependency since we use our own prebuilt version
2015-04-17 17:49:14 +08:00
samuele3hu 9aadc2a993 Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B, 2015-04-17 17:40:28 +08:00
zhangbin e5672b6e1f Update js bindings. 2015-04-17 17:27:47 +08:00
andyque d3a06de6d6 remove system zlib dependency since we use our own prebuilt version of
zlib now.
2015-04-17 17:24:33 +08:00
minggo e3463d23a8 Merge pull request #11479 from samuele3hu/v3_remove_useless
Remove the reference of quick module
2015-04-17 17:13:51 +08:00
samuele3hu b300701ec4 Remove the reference of quick module 2015-04-17 15:52:45 +08:00
WenhaiLin 9c2e39dd49 Label:Fixed the shadow color of system font may be incorrect. 2015-04-17 15:42:41 +08:00
WenhaiLin 5a438ed9a1 Label:Fixed the shadow effect of system font might not be shown. 2015-04-17 15:26:43 +08:00
zhangbin 57805737d1 Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb 2015-04-17 14:59:47 +08:00
zhangbin b8b49a387e Update the js template. 2015-04-17 14:59:12 +08:00
WenhaiLin 0ac99002d5 Label:disableEffect(LabelEffect::XXXX) support disable all effect. 2015-04-17 14:39:52 +08:00
samuele3hu b72034a3f6 Add Lua bindings for WebView and related test case 2015-04-17 14:08:47 +08:00
Wenhai Lin 03ef9b962a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-17 11:47:09 +08:00
lvlong f55af40016 fix bug: label action in multiple cameras. 2015-04-17 10:19:20 +08:00
Milos Jakovljevic a33d775b51 Adding linear interpolation convenient method in MathUtils. 2015-04-16 15:17:25 +02:00
Milos Jakovljevic b3ee529a8c Adding Lerp for Vec3 2015-04-16 14:43:12 +02:00
minggo 3c7d5afce2 Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
Fix crash when play streamed MP4 file.
2015-04-16 18:16:28 +08:00
zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
Conflicts:
	build/cocos2d-wp8.sln
2015-04-16 17:04:07 +08:00
WenhaiLin fc75f46abb Fix crash when play streamed MP4 file. 2015-04-16 16:27:09 +08:00
minggo 408d164fea Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization
fix side effect of ui::button clone
2015-04-16 16:15:25 +08:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
minggo 0e7c096201 Merge pull request #11455 from xiaofeng11/v3
Fix won't load child bug
2015-04-16 14:37:22 +08:00
minggo 97f150a89f Merge pull request #11452 from MSOpenTech/v3-remove-wp8
V3 remove WP8 project files
2015-04-16 14:32:11 +08:00
pipu d1dcf3f620 Modify that serialize attribute "Children". 2015-04-16 13:58:01 +08:00
CocosRobot f1bd23aa32 [AUTO]: updating luabinding automatically 2015-04-16 02:19:38 +00:00
minggo 29de9d397f Merge pull request #11445 from andyque/improve-the-arguments
make scrollview time arguments more meaningful
2015-04-16 10:14:11 +08:00
minggo c7e41e1045 Merge pull request #11451 from WenhaiLin/v3-jni-string
Fixed JNI illegal start byte error
2015-04-16 10:00:22 +08:00
minggo 458aa0028b Merge pull request #11450 from jianglong0156/v3
uiWebView constructor add CC_CONSTRUCTOR_ACCESS
2015-04-16 09:58:23 +08:00
minggo 2b82c0c837 Merge pull request #11442 from xiaofeng11/v3
Fix action timeline bug
2015-04-16 09:34:45 +08:00
Dale Stammen b1c9c34c19 added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:19:38 -07:00
Dale Stammen 01135f892f fixed typo 2015-04-15 09:19:17 -07:00
Dale Stammen 7d22e49642 only needed if _MSC_VER < 1900 2015-04-15 09:18:48 -07:00
Dale Stammen 68430ce4fa added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:18:23 -07:00
Dale Stammen 081b9ccac2 updated freetype include path 2015-04-15 08:20:03 -07:00
Dale Stammen c9eb2790be updated chipmunk and freetype libs 2015-04-15 08:08:18 -07:00
Dale Stammen 911f8f6f8a removed WP8 UIEditBox project files 2015-04-15 07:16:39 -07:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
Wenhai Lin 2dd88e8be5 Fixed JNI illegal start byte error 2015-04-15 18:20:52 +08:00
jianglong0156 8f8599a49b uiWebView constructor add CC_CONSTRUCTOR_ACCESS 2015-04-15 17:54:09 +08:00
andyque 96f8842ee1 make scrollview time arguments more meaningful 2015-04-15 16:37:11 +08:00
zhangbin 3641451c47 Update the submodule js-bindings & update solution files for js-bindings. 2015-04-15 13:58:41 +08:00
xiaofeng11 a8fcaf4f4f Merge pull request #17 from geron-cn/xiaov3
fix actiontimeline step over frame when (noloop play && timespeed>1)
2015-04-15 13:41:49 +08:00
geron-cn 7b376fd384 fix action timeline step over frame when no (loop play && timespeed>1) 2015-04-15 13:32:04 +08:00
minggo 60ef01b870 Merge pull request #11394 from giginet/intersects-circle
Implement Rect::intersectsCircle
2015-04-14 18:10:16 +08:00
CocosRobot 66fcba02b1 [AUTO]: updating luabinding automatically 2015-04-14 09:10:16 +00:00
minggo caf308f061 Merge pull request #11431 from CocosRobot/update_lua_bindings_1429000943
[AUTO]: updating luabinding automatically
2015-04-14 17:03:10 +08:00
minggo fbb1c578a2 Merge pull request #11430 from minggo/update-spine
update spine runtime to v2.1.25
2015-04-14 17:01:11 +08:00
CocosRobot 0e4a209241 [AUTO]: updating luabinding automatically 2015-04-14 08:44:30 +00:00
minggo 8b98dcd06b Merge pull request #11429 from andyque/optimize-button-memory-usage-v3
optimize memory usage of ui::Button
2015-04-14 16:38:47 +08:00
andyque 240bf58bfc fix edge case crash 2015-04-14 15:34:15 +08:00
minggo c62b34ac01 update spine runtime to v2.1.25 2015-04-14 15:23:16 +08:00
zhangbin 8c2413aa54 Add submodule js-bindings & html5. 2015-04-14 15:20:46 +08:00
andyque a2df0ca769 optimize memory usage of ui::Button 2015-04-14 15:00:42 +08:00
yangxiao 8c8058a9be merge cocos resolve conflict 2015-04-14 13:56:05 +08:00
minggo 4aaa494be7 Merge pull request #11421 from CocosRobot/update_lua_bindings_1428977404
[AUTO]: updating luabinding automatically
2015-04-14 10:58:08 +08:00
minggo 1ebcca8d9f Merge pull request #11417 from super626/terrain
Terrain
2015-04-14 10:50:21 +08:00
minggo 2b66bb7082 [ci skip] update version 2015-04-14 10:46:20 +08:00
CocosRobot a0a6b9cda4 [AUTO]: updating luabinding automatically 2015-04-14 02:12:05 +00:00
minggo 4211b20134 Merge pull request #11414 from likexx/patch-1
Update CCLabel.cpp
2015-04-14 10:06:09 +08:00
minggo 7f1d48978f Merge pull request #11416 from super626/v3
Sprite3D fix
2015-04-14 10:04:22 +08:00
minggo d246c33974 Merge pull request #11413 from WenhaiLin/v3-label-sf-position
Label:Fixed the position of system font is wrong if it is visited by a new camera.
2015-04-14 09:59:09 +08:00
minggo 06a2042a11 Merge pull request #11345 from IgorMats/v3
Add getStroke/setStroke methods for motion streak.
2015-04-14 09:36:03 +08:00
XiaoYang 37dc4c33d9 Merge pull request #300 from lvlonggame/v3
fix bug: create single node recursively.
2015-04-14 09:10:24 +08:00
zhukaixy 6684491249 1: update cube texture for sky box
2: add mouse-controled camera for test case (skybox)
2015-04-14 01:39:23 +08:00
Igor Mats e54a51be02 Fix comment. 2015-04-13 19:24:19 +03:00
giginet 2a0524322e Implement Rect::intersectsCircle
This method checks the intersect status between the rect and a circle.
2015-04-13 23:16:06 +09:00
likexx 6f341e3284 Update CCLabel.cpp
in rare case, the texture atlas becomes NULL. Added an additional check to make sure it won't crash here.
2015-04-13 20:53:34 +08:00
minggo bc34554bd9 Merge pull request #11407 from samuele3hu/v3_studio2
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
2015-04-13 18:22:18 +08:00
WenhaiLin d24a1243da Label:Fixed the position of system font is wrong if it is visited by a new camera. 2015-04-13 18:22:05 +08:00
yangxiao 284c8e5a97 add to animation cache 2015-04-13 17:14:58 +08:00
samuele3hu 24654a4847 synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests 2015-04-13 16:29:44 +08:00
WenhaiLin 9ef04943a8 Label:Fixed System font can't scale. 2015-04-13 16:28:55 +08:00
CocosRobot 698a75e17f [AUTO]: updating luabinding automatically 2015-04-13 05:44:29 +00:00
lvlong 57a44194f4 fix bug: create single node Recursively. 2015-04-13 11:35:52 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3
Reader update
2015-04-13 11:20:53 +08:00
minggo 1d1d574a61 Merge pull request #11393 from akermen/v3_fix_macros_namespace
added 'cocos2d' namespace for macros
2015-04-13 11:20:36 +08:00
tangziwen 380d829548 move reset draw polygon state in corresponding position 2015-04-13 10:14:03 +08:00
minggo 952f9da2c1 Merge pull request #11385 from super626/terrain
Improve Terrain
2015-04-13 09:18:50 +08:00
akermen 2957263c9d =cocos2d namespace added macros 2015-04-11 10:45:19 +03:00
akermen 1d83229956 =cocos2d namespace adder for CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES macro 2015-04-11 10:32:33 +03:00
CocosRobot bd3b978c89 [AUTO]: updating luabinding automatically 2015-04-10 10:18:33 +00:00
minggo 9cc03407a8 Merge pull request #11383 from WenhaiLin/v3-physics-rotation
Physics: Fixed the rotation of PhysicsBody is wrong if the rotation of node is set before PhysicsBody attached.
2015-04-10 18:12:43 +08:00
pipu 755134ba3f Update parse animation easing 2015-04-10 17:05:55 +08:00
Wenhai Lin 1949348124 Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached. 2015-04-10 17:01:21 +08:00
minggo 698d93a42b Merge pull request #11379 from WenhaiLin/v3-physics-fix
Physics: Fixed position of physics body is wrong when the position of parent node changes
2015-04-10 16:45:45 +08:00
minggo 3d2fb6250e Merge pull request #11378 from andyque/fix-outline-update-do-not-change-content-size
fix ui::Text outline don't change content size
2015-04-10 16:41:24 +08:00
Wenhai Lin 97082cb169 Physics: Fixed position of physics body is wrong when the position of parent node changes 2015-04-10 15:39:39 +08:00
andyque 10c90b06aa fix ui::Text outline don't change content size 2015-04-10 15:33:48 +08:00
CocosRobot 15f22d936f [AUTO]: updating luabinding automatically 2015-04-10 07:27:51 +00:00
xiaofeng11 5ec9b14a33 Merge pull request #13 from geron-cn/xiaov3
fix
2015-04-10 14:27:09 +08:00
geron-cn b8083f2c99 fix 2015-04-10 14:24:48 +08:00
tangziwen a7aed360a1 update terrain 2015-04-10 14:22:07 +08:00
andyque c8d8a0d220 add disableEffect API for ui::Text 2015-04-10 14:18:16 +08:00
xiaofeng11 dda662a7c1 Merge pull request #12 from geron-cn/xiaov3
add blendfunc frame
2015-04-10 14:04:35 +08:00
geron-cn d238f9905e add blendfunc frame 2015-04-10 13:34:39 +08:00
xiaofeng11 ee98b40af9 Merge pull request #11 from geron-cn/xiaov3
add tween easing to ccframe
2015-04-10 10:46:58 +08:00
minggo 0aef6b9446 Merge pull request #11295 from Almax27/v3
RenderQueue command buffer optimisation
2015-04-10 09:33:43 +08:00
geron-cn c206725be5 fix color 2015-04-09 19:13:14 +08:00
Igor Mats f5c61b4f9a Ooops. 2015-04-09 13:36:17 +03:00
minggo 09c50c44dc Merge pull request #11224 from hawkwood/patch-7
Remove use of autorelease NSString and NSURL
2015-04-09 18:36:07 +08:00
geron-cn 56bb0a68bb add tween easing to carfare 2015-04-09 18:10:37 +08:00
pipu e86071e77e Rest CCFrame. 2015-04-09 17:21:52 +08:00
Igor Mats 60759764ff Add getStroke method. 2015-04-09 12:05:21 +03:00
pipu 80ad7bbee8 Animation easing. 2015-04-09 16:55:15 +08:00
minggo e9c88a61da Merge pull request #11354 from samuele3hu/v3_terrain
Update the Lua bindings for terrain and TerrainTest.lua
2015-04-09 14:22:19 +08:00
minggo 9891a94e87 Merge pull request #11352 from super626/v3
Fix Sprite3D memory leak
2015-04-09 13:57:03 +08:00
samuele3hu 9bf2a920b4 Update the Lua bindings for terrain and TerrainTest.lua 2015-04-09 13:41:52 +08:00
CocosRobot 22da4c4832 [AUTO]: updating luabinding automatically 2015-04-09 03:50:13 +00:00
minggo 69eac3b78f Merge pull request #11337 from super626/terrain
Terrain fix
2015-04-09 11:44:26 +08:00
yangxiao 575d32c5ec correct words 2015-04-09 11:31:56 +08:00
yangxiao 9cefa3a9da weak ref to vertexdata 2015-04-09 10:52:05 +08:00
tangziwen 176532eef4 update Terrain Lua binding 2015-04-09 10:01:40 +08:00
tangziwen 4ca6b559e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 2015-04-09 09:40:22 +08:00
Igor Mats 7f24eb0cf6 Add setStroke method. 2015-04-08 21:55:24 +03:00
Dale Stammen c88e8064c7 updated dll name to v3.6 2015-04-08 07:51:40 -07:00
Dale Stammen 272bb35246 Merge branch 'v3' into v3-wp8-fix 2015-04-08 07:29:45 -07:00
minggo 1177310550 Merge pull request #11334 from andyque/fix-windows-universal
update freetype2 and chipmunk on wp8 and wp8.1
2015-04-08 21:28:15 +08:00
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +08:00
minggo 8a1aa78f7d Merge pull request #11336 from xiaofeng11/v3
Update reader
2015-04-08 18:40:32 +08:00
minggo 3ce6602f3a Merge pull request #11335 from super626/v3
Modify changelog and add getAABBRecursively
2015-04-08 18:03:48 +08:00
andyque 24c0c8d811 fix wp8 compile issue 2015-04-08 18:01:56 +08:00
pipu ca74486f60 Update CSParseBinary_generated 2015-04-08 16:54:58 +08:00
yangxiao a7a39d71f5 modify getAABBRecursively 2015-04-08 16:40:04 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
minggo 263506fb74 Merge pull request #11282 from hawkwood/patch-8
Fix iOS 5.1.1 crash caused by interruptionHandler
2015-04-08 16:23:12 +08:00
andyque f52899c257 update freetype2 and chipmunk on wp8 and wp8.1 2015-04-08 16:21:19 +08:00
tangziwen dc7cd520b2 update terrain 2015-04-08 15:17:05 +08:00
minggo 00c0e4c432 Merge pull request #10909 from babcca/webview_ios_load_data_fix
Webview ios load data fix
2015-04-08 14:34:42 +08:00
minggo e4099acdc8 Merge pull request #11328 from CocosRobot/update_lua_bindings_1428464979
[AUTO]: updating luabinding automatically
2015-04-08 13:54:22 +08:00
CocosRobot 58ca1b7911 [AUTO]: updating luabinding automatically 2015-04-08 03:52:03 +00:00
minggo e9cdf333f9 Merge pull request #11246 from xiaofeng11/v3
V3 reader fix
2015-04-08 11:46:40 +08:00
minggo 4bcfcb1d09 Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
2015-04-08 11:45:46 +08:00
minggo 21c5bc96e5 Merge pull request #11319 from CocosRobot/update_lua_bindings_1428458531
[AUTO]: updating luabinding automatically
2015-04-08 10:53:07 +08:00
minggo 4d9e376a18 Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log
Log message can't detect image format
2015-04-08 10:52:56 +08:00
minggo dff62e329e Merge pull request #11313 from stari4ek/v3-FileUtils-constness
FileUtils: replace const_cast with mutable in path getters
2015-04-08 10:50:43 +08:00
tangziwen 3ab4e75a71 update 2015-04-08 10:10:05 +08:00
CocosRobot 4bcf6b7b67 [AUTO]: updating luabinding automatically 2015-04-08 02:04:07 +00:00
samuele3hu 3a2601a1f8 Add lua bindings for Terrain and two test cases about it. 2015-04-08 10:03:50 +08:00
andyque 8a4a7344b0 fix freetype include 2015-04-08 09:24:34 +08:00
andyque e4cf3885a5 use prebuilt zlib for android and mac 2015-04-07 23:20:02 +08:00
Michael Sotnikov f962e14b43 replace const_cast with mutable in path getters;
more getters (is*/get*) became const;
2015-04-07 17:15:15 +03:00
tangziwen a220a8f669 fix wrong attribute location bind, fix memory leak, enable back-face culling 2015-04-07 18:47:19 +08:00
minggo ca090281a4 Merge pull request #11307 from WenhaiLin/v3-label-effect
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
2015-04-07 18:22:35 +08:00
minggo 50fa15c0cd Merge pull request #11301 from samuele3hu/v3_lua_jit
Add luajit support for iOS 64bit devices and related test cases
2015-04-07 18:17:09 +08:00
lvlong c9014e12b4 Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
	CHANGELOG
2015-04-07 16:40:57 +08:00
lvlong 99ef79f940 modify INT_NEAR 2015-04-07 16:37:51 +08:00
WenhaiLin 927cda3f0d Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label. 2015-04-07 15:51:57 +08:00
minggo eb928432ce Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor
Label: Fixed shadow color is incorrect.
2015-04-07 15:27:19 +08:00
minggo 353c2b0d75 Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
Optimize Vec3
2015-04-07 14:04:57 +08:00
WenhaiLin c5c5d3e39d Label: Fixed shadow color is incorrect. 2015-04-07 11:17:01 +08:00
minggo 1646278be2 [ci skip] update version 2015-04-07 10:36:38 +08:00
minggo 295b6d7044 [ci skip] update version 2015-04-07 10:35:49 +08:00
minggo deaa6a19f0 Merge pull request #11257 from super626/terrain
Terrain
2015-04-07 09:32:35 +08:00
XiaoFeng 16aa704ffd Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3 2015-04-07 09:11:14 +08:00
XiaoFeng 4929d8102a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-07 09:06:06 +08:00
Ricardo Quesada a782eb022d fixes warnings on Xcode 6.3
instead of using `abs()` it uses `std::abs()`
2015-04-06 12:08:30 -07:00
samuele3hu a64e90d469 Update the related project setting for Luajit and related test cases 2015-04-06 22:41:34 +08:00
Aaron Baumbach 9edfa5bb29 RenderQueue command buffer optimisation
Made _commands an array of vectors that is no longer reallocated every frame
Provided method to reallocate queues manually and reserve memory in order to minimise std::vector dynamic reallocation
2015-04-06 14:45:19 +01:00
Vladimir Perminov ba06886e01 GLViewImpl initWithRect bug size
glfwCreateWindow not guarantees create windows need size, watch real
create size and change setFrameSize( see declaration glfwCreateWindow)

Example Windows 7, if request height size > Desktop height make window
size: Desktop height - height Caption.
2015-04-06 14:24:22 +03:00
Vladimir Perminov 105bac2d55 Optimize Vec3
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();

Change all code:
_vec3 = Vec3(x, y, z);   ->   _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z);   ->  Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z);   ->   _vec3.add(x, y, z);
_vec3 = Vec3::ZERO;   ->   _vec3.setZero();
2015-04-05 13:09:50 +03:00
Vladimir Perminov 3931273a58 Log message can't detect image format
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.

Log message if format unknown
2015-04-04 13:19:47 +03:00
minggo 0f09fd8956 Merge pull request #11278 from CocosRobot/update_lua_bindings_1428047459
[AUTO]: updating luabinding automatically
2015-04-04 07:18:39 +08:00
Justin Hawkwood 84fd73630a Fix iOS 5.1.1 crash caused by interruptionHandler
checks OS version and sets handling based on what is available.
2015-04-03 15:57:47 -07:00
lvlong 4c6eec9ec1 add getAABBRecursively 2015-04-03 18:04:33 +08:00
zhukaixy 6eb86f736c add for wp8 support --ziwen.tang 2015-04-03 17:12:44 +08:00
tangziwen 72f5121959 Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain 2015-04-03 16:58:27 +08:00
tangziwen d79c38e17a add WP8 support 2015-04-03 16:50:09 +08:00
yangxiao 7ea1c1ac1f reset 2015-04-03 16:15:09 +08:00
CocosRobot e20a747138 [AUTO]: updating luabinding automatically 2015-04-03 07:53:06 +00:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-04-03 15:45:51 +08:00
Daiki Asahi fc92acf587 remove interlevel argument. 2015-04-03 16:43:39 +09:00
tangziwen ee41c9b3f1 add win rt support 2015-04-03 14:36:29 +08:00
tangziwen 8a7b318c1a Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment 2015-04-03 13:49:07 +08:00
Huabing.Xu 98371e4fbb Merge pull request #11267 from WenhaiLin/v3-at01
Disable MessageBox when the device does not have an accelerometer on WinRT.
2015-04-03 11:53:07 +08:00
WenhaiLin fdba25cdde Disable MessageBox when the device does not have an accelerometer on WinRT 2015-04-03 11:51:00 +08:00
Huabing.Xu cb77d0145a Merge pull request #11266 from WenhaiLin/v3-at01
Add getInScene,getDuration for TransitionScene class.
2015-04-03 11:50:44 +08:00
WenhaiLin f2dc7958bf Add getInScene,getDuration for TransitionScene class. 2015-04-03 11:49:15 +08:00
Huabing.Xu bf31214796 Merge pull request #11263 from WenhaiLin/v3-menuitem-fix
MenuItem: Fixed crash if MenuItem::onExit is called multiple times.
2015-04-03 09:53:57 +08:00
tangziwen e4ae88ef15 add new line at end of file 2015-04-03 09:11:09 +08:00
Dale Stammen d8b6a0aaf9 removed unused method 2015-04-02 09:11:19 -07:00
Dale Stammen 47b338e4e6 fix deprecated warnings 2015-04-02 09:08:26 -07:00
Dale Stammen 957bf48790 fire foreground and background events 2015-04-02 09:07:44 -07:00
WenhaiLin aaae566b7b Performance: Fixed lag if Director::setContentScaleFactor is called frequently 2015-04-02 23:35:56 +08:00
WenhaiLin a544eadab8 MenuItem: Fixed crash if MenuItem::onExit is called multiple times. 2015-04-02 23:27:07 +08:00
XiaoYang 63a27d14b7 Merge pull request #282 from lvlonggame/terrain
fix bug: about minFilter and magFilter
2015-04-02 17:26:35 +08:00
lvlong 60bed4f461 revert alpha map minFilter 2015-04-02 15:10:51 +08:00
lvlong c3cc8b917c fix bug: about minFilter and magFilter 2015-04-02 15:01:14 +08:00
yangxiao 827231f5c9 add to cocos2d 2015-04-02 14:29:02 +08:00
yangxiao 1b63e5168a add to linux 2015-04-02 14:21:51 +08:00
yangxiao 9aabbabe6e reset 2015-04-02 14:20:36 +08:00
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
XiaoYang 984babc9c9 Merge pull request #281 from tangziwen/terrain
update terrain
2015-04-02 10:19:11 +08:00
yusheng.lu 82c6e623e0 Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters 2015-04-02 10:15:36 +08:00
samuele3hu 826fe4cf31 Update the Xcode project setting for luajit 2015-04-02 10:07:31 +08:00
CocosRobot dfc2390659 [AUTO]: updating luabinding automatically 2015-04-02 01:51:14 +00:00
minggo 6cf344ded6 Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup
Remove useless (char*) casts in CCTMXXMLParser.cpp
2015-04-02 09:45:22 +08:00
minggo e7a6c7eada Merge pull request #11245 from CocosRobot/update_lua_bindings_1427857074
[AUTO]: updating luabinding automatically
2015-04-02 09:39:36 +08:00
minggo 332ce1a8f3 Merge pull request #11249 from super626/v3
Release note for texturecube skybox and animtion quality
2015-04-02 09:39:16 +08:00
minggo 199fb2b694 Merge pull request #11250 from super626/texturecube
Texturecube Modify
2015-04-02 09:38:26 +08:00
lvlong 1da7ef121e _aabbDirty = true 2015-04-02 09:33:48 +08:00
tangziwen 6cd1077cb0 update terrain 2015-04-01 18:24:05 +08:00
yangxiao 2cc9814702 modify 2015-04-01 17:58:41 +08:00
yangxiao 4b7ae430a8 Merge branch 'texturecube' of https://github.com/super626/cocos2d-x into texturecube 2015-04-01 17:37:55 +08:00
yangxiao 9540fd590f modify skybox 2015-04-01 17:34:57 +08:00
yangxiao 591fff4046 release note for texturecube skybox and animtion quality 2015-04-01 16:40:40 +08:00
xiaofeng11 ea8538117b Merge pull request #7 from pipu/remove_CCNodeReader
Remove CCNodeReader.h/.cpp.
2015-04-01 14:12:09 +08:00
pipu 340e26d81a Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
pipu 41661830ff Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
yusheng.lu 01a091ef2c Delete CCNodeReader for Win8.1 project 2015-04-01 11:49:36 +08:00
CocosRobot 17a80b0c54 [AUTO]: updating luabinding automatically 2015-04-01 02:59:47 +00:00
lvlong 72722ba5b0 fix aabbDirty bug. 2015-04-01 10:57:19 +08:00
minggo 02e8a08de7 Merge pull request #11241 from tangziwen/v3_doc
update 3d doc
2015-04-01 10:52:35 +08:00
minggo eefd06415b Merge pull request #11229 from xiaofeng11/v3
Add destroyCocosStudio()
2015-04-01 10:49:49 +08:00
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
tangziwen 8cde333d36 update 3d doc 2015-04-01 09:47:09 +08:00
minggo 7b2fcb5287 Merge pull request #11237 from perminovVS/v3-dev-rename-file-win32
Win32 correct rename file
2015-04-01 09:35:18 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
Vladimir Perminov b7279524d6 Win32 correct rename file
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
2015-03-31 13:52:40 +03:00
CocosRobot 46f32142c7 [AUTO]: updating luabinding automatically 2015-03-31 10:26:49 +00:00
minggo cb0c9ad6ee Merge pull request #11233 from super626/texturecube
Bug fix: ios devices crash on release mode
2015-03-31 18:21:22 +08:00
minggo c1cd041912 Merge pull request #11221 from super626/v3
3d animation quality control
2015-03-31 17:23:58 +08:00
zhukaixy 3835675cab bugfix: TextureCube will be crashed on release environment 2015-03-31 16:56:02 +08:00
pipu bb110449be Reset method purge() definition for some Reader. 2015-03-31 14:56:24 +08:00
lvlong 336e719a2f initialize _forceDepthWrite 2015-03-31 14:41:07 +08:00
lvlong ab2c773c5c clean all action from s_fadeInAnimates, s_fadeOutAnimates, s_runningAnimates!!!! 2015-03-31 14:26:40 +08:00
pipu 91acd6aea9 Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader. 2015-03-31 14:21:10 +08:00
CocosRobot 00792e98a3 [AUTO]: updating luabinding automatically 2015-03-31 04:01:57 +00:00
minggo 6ef27df2fc Merge pull request #11223 from hawkwood/patch-6
Remove use of autorelease NSString and NSURL
2015-03-31 11:57:00 +08:00
pipu a0a461f319 Supplement some Reader. 2015-03-31 11:22:34 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain
update Terrain, support skirt
2015-03-31 09:14:27 +08:00
Justin Hawkwood 237e809f23 Remove use of autorelease NSString and NSURL
Since there is no autorelease pool, these were leaking.
2015-03-30 16:27:05 -07:00
Justin Hawkwood 3641ef266c Remove use of autorelease NSString and NSURL
Since there is no autorelease pool, these were leaking.
2015-03-30 16:24:48 -07:00
VisualSJ a29becb185 [ci skip] Add javascript notes...
cocos/ui/UIHBox.h
  cocos/ui/UIHelper.h
  cocos/ui/UIImageView.h
  cocos/ui/UILayout.h
  cocos/ui/UIText.h
  cocos/ui/UITextAtlas.h
  cocos/ui/UITextBMFont.h
  cocos/ui/UITextField.h
  cocos/ui/UIVBox.h
  cocos/ui/UIVideoPlayer.h
  cocos/ui/UIWebView.h
  cocos/ui/UIWidget.h
2015-03-30 21:38:32 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
lvlong 4bc44c207d modify config-example.plist 2015-03-30 18:07:32 +08:00
lvlong cbdfd77400 modify some name. 2015-03-30 17:46:45 +08:00
pipu 6f20da4444 Add destroyCocosStudio() 2015-03-30 16:46:33 +08:00
lvlong 5032194e98 modify animate 3d quality to bool 2015-03-30 15:57:58 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
minggo 0b400a0b20 Merge pull request #11207 from andyque/fix-remaining-missing-comments
Finish the missing comments
2015-03-30 14:54:48 +08:00
lvlong 6fe9f0d1c8 add comments for 3d animation quality!!! 2015-03-30 14:05:03 +08:00
yangxiao c6a86ac287 move shader to shaders 2015-03-30 13:45:50 +08:00
lvlong ccb5039411 Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
	cocos/base/CCConfiguration.h
2015-03-30 11:50:01 +08:00
lvlong b2a7a753c2 add comments 2015-03-30 11:44:30 +08:00
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments
Conflicts:
	cocos/base/CCIMEDelegate.h
2015-03-30 10:56:42 +08:00
minggo d437ce3e59 Merge pull request #11208 from samuele3hu/v3_5_comment
Update Sprite3DCubeMap  lua test case and the related bindings-generator submodule
2015-03-30 10:48:36 +08:00
minggo 59441adc2c Merge pull request #11213 from super626/texturecube
Texturecube bug fix
2015-03-30 10:48:10 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
yangxiao 7affd8edcf large value for min max 2015-03-30 10:00:06 +08:00
minggo 30db8ab7fa Merge pull request #11159 from super626/v3
node animation support
2015-03-30 09:32:36 +08:00
minggo 73279e3b3f Merge pull request #11205 from WenhaiLin/v3-doxygen
[ci skip]Update comments.
2015-03-30 09:31:36 +08:00
VisualSJ 875b5d95f4 [ci skip] Add javascript notes...
cocos/ui/UIListView.h
  cocos/ui/UILoadingBar.h
  cocos/ui/UIPageView.h
  cocos/ui/UIRelativeBox.h
  cocos/ui/UIRichText.h
  cocos/ui/UIScale9Sprite.h
  cocos/ui/UIScrollView.h
  cocos/ui/UISlider.h
2015-03-28 16:02:47 +08:00
VisualSJ 6285e72d1e [ci skip] Add javascript notes...
cocos/3d/CCBundle3D.h
  cocos/3d/CCBundle3DData.h
  cocos/3d/CCBundleReader.h
  cocos/3d/CCFrustum.h
  cocos/3d/CCMeshSkin.h
  cocos/3d/CCMeshVertexIndexData.h
  cocos/3d/CCOBB.h
  cocos/3d/CCObjLoader.h
  cocos/3d/CCPlane.h
  cocos/3d/CCRay.h
  cocos/3d/CCSprite3DMaterial.h
  cocos/base/CCAsyncTaskPool.h
  cocos/base/CCIMEDelegate.h
  cocos/base/CCIMEDispatcher.h
  cocos/base/CCMap.h
  cocos/base/CCScriptSupport.h
2015-03-28 15:11:51 +08:00
samuele3hu 921981833e Update Sprite3DCubeMap test case 2015-03-28 14:59:47 +08:00
VisualSJ 9ba82584a9 [ci skip] Add javascript notes...
cocos/2d/CCClippingNode.h
  cocos/2d/CCTMXTiledMap.h
  cocos/2d/CCTMXObjectGroup.h
  cocos/2d/CCTMXLayer.h
  cocos/2d/CCSpriteBatchNode.h
  cocos/2d/CCSprite.h
  cocos/2d/CCRenderTexture.h
  cocos/2d/CCProtectedNode.h
  cocos/2d/CCMenuItem.h
  cocos/2d/CCMenu.h
  cocos/2d/CCLabelAtlas.h
  cocos/2d/CCLabel.h
  cocos/2d/CCGrid.h
  cocos/2d/CCGLBufferedNode.h
  cocos/2d/CCFastTMXTiledMap.h
  cocos/2d/CCFastTMXLayer.h
  cocos/2d/CCDrawingPrimitives.h
  cocos/2d/CCDrawNode.h
  cocos/2d/CCComponentContainer.h
  cocos/2d/CCClippingRectangleNode.h
  cocos/2d/CCTextFieldTTF.h
  cocos/2d/CCTileMapAtlas.h
2015-03-28 14:28:16 +08:00
andyque e3fc9b082e Finish the missing comments 2015-03-27 20:56:12 +08:00
Wenhai Lin ff3777dfd1 [ci skip]Update comments. 2015-03-27 18:26:14 +08:00
zhukaixy 5bff8f5bf3 Bugfix: for glcontext recreated 2015-03-27 17:20:46 +08:00
minggo b78b0f7238 Merge pull request #11202 from minggo/add-documentation
[ci skip]fix doxygen comment
2015-03-27 17:12:37 +08:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
minggo 8b5a6d9ccc Merge pull request #11196 from tangziwen/doc
3d fix doxygen add to group
2015-03-27 17:09:24 +08:00
minggo c4ac84d4f6 Merge pull request #11200 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
2015-03-27 17:08:26 +08:00
zhukaixy a1bad14c1e Update ccShader_3D_Skybox.frag 2015-03-27 17:07:30 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
minggo b6ac2fa422 Merge pull request #11199 from WenhaiLin/v3-doxygen
[ci skip]Update comments
2015-03-27 16:04:25 +08:00
samuele3hu f54512a618 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 2015-03-27 15:59:05 +08:00
Wenhai Lin 6f117c4f49 [ci skip]Update comments 2015-03-27 15:31:42 +08:00
samuele3hu bb225d052e Update comments of some header files 2015-03-27 15:27:08 +08:00
minggo 3c3163d7dd Merge pull request #11193 from CocosRobot/update_lua_bindings_1427435046
[AUTO]: updating luabinding automatically
2015-03-27 15:26:36 +08:00
Wenhai Lin 8f3bbe3c40 [ci skip]Update comments 2015-03-27 15:25:44 +08:00
tangziwen 56c31845ff fix conflict again 2015-03-27 15:25:16 +08:00
tangziwen 12bcdc8868 fix conflict 2015-03-27 15:08:20 +08:00
minggo 7d0a49a98f Merge pull request #11198 from SuYaoHui/cocosapi
[ci skip]Add comment
2015-03-27 15:00:22 +08:00
SuYaohui 3d772df930 Add comment 2015-03-27 14:43:24 +08:00
minggo 9d428d8e48 Merge pull request #11194 from WenhaiLin/v3-doxygen
[ci skip]Fixed warnings
2015-03-27 14:34:26 +08:00
minggo 033a3e09b9 Merge pull request #11191 from fusijie/cocosapi
[ci skip]update comments.
2015-03-27 14:33:49 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
CocosRobot 4785e6e383 [AUTO]: updating luabinding automatically 2015-03-27 05:46:01 +00:00
Jacky d9b0c67f65 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi
Conflicts:
	cocos/2d/CCNode.h
2015-03-27 13:43:38 +08:00
tangziwen a2cce0594b update 2015-03-27 13:43:09 +08:00
minggo 85530648a7 Merge pull request #11180 from andyque/fix-comments
remove unneeded js & lua NA and remove deprecated list from navtree
2015-03-27 13:40:54 +08:00
Jacky 4edf9e76fd update comments. 2015-03-27 12:07:19 +08:00
Huabing.Xu 0367d752af Merge branch 'v3' into v3_comments
Conflicts:
	cocos/renderer/ccShaders.h
2015-03-27 12:05:15 +08:00
andyque 602093e474 fix extra @ symbol in Base group 2015-03-27 12:01:20 +08:00
Wenhai Lin a47cad0354 [ci skip]Fixed warnings 2015-03-27 11:59:10 +08:00
Huabing.Xu 3d657df9f6 [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
tangziwen 5a76a628d3 add some utility functions 2015-03-27 11:46:02 +08:00
minggo 29c5da8429 Merge pull request #11189 from SuYaoHui/cocosapi
Add comments
2015-03-27 11:46:02 +08:00
SuYaohui 17bd26e9d4 Add comments 2015-03-27 11:39:31 +08:00
minggo 8691602b81 Merge pull request #11185 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
2015-03-27 11:35:11 +08:00
Huabing.Xu 6cb99312ee [ci skip]add group base to files in math folder 2015-03-27 11:34:52 +08:00
andyque 813bcc4017 Merge branch 'v3' into fix-comments 2015-03-27 11:26:46 +08:00
Huabing.Xu b22f92635f [ci skip]fix warning for doxygen 2015-03-27 11:20:50 +08:00
samuele3hu a1b054911c Update comments of some header files 2015-03-27 11:13:28 +08:00
minggo d9680b2c74 Merge pull request #11178 from calfjohn/v3
[ci skip]fixed doxygen warning for physics and texture2d
2015-03-27 11:11:28 +08:00
minggo 8b4f662ac0 Merge pull request #11179 from WenhaiLin/v3-doxygen
[ci skip]Fixed warnings when generating docs by doxygen.
2015-03-27 11:10:43 +08:00
minggo 2ea8b8272a Merge pull request #11177 from CocosRobot/update_lua_bindings_1427423082
[AUTO]: updating luabinding automatically
2015-03-27 11:10:19 +08:00
Huabing.Xu 49bf8d5e13 Merge pull request #11181 from dabingnn/v3_comments
V3 comments
2015-03-27 11:09:17 +08:00
minggo 24aef7c6bb Merge pull request #11164 from super626/texturecube
Texturecube
2015-03-27 11:06:28 +08:00
Huabing.Xu cbcdef11c3 [ci skip]fix warning for doxygen 2015-03-27 11:05:01 +08:00
Huabing.Xu f18fac48ed [ci skip]fix warning for doxygen 2015-03-27 11:03:21 +08:00
andyque bc2ffe4e19 remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08:00
Wenhai Lin fdffad3956 [ci skip]Fixed warnings when generating docs by doxygen. 2015-03-27 10:52:59 +08:00
calfjohn 0af4f9f1ed fixed doxygen warning for physics and texture2d 2015-03-27 10:34:01 +08:00
CocosRobot c73602a523 [AUTO]: updating luabinding automatically 2015-03-27 02:26:35 +00:00
zhangbin 58bc56f759 Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +08:00
tangziwen 8b376e511c update Terrain 2015-03-27 10:12:24 +08:00
CocosRobot a4e633a299 [AUTO]: updating luabinding automatically 2015-03-26 16:17:35 +00:00
samuele3hu fb085fc2ea Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment
Conflicts:
	docs/doxygen_white_book.config
2015-03-26 22:29:37 +08:00
samuele3hu e0bde0f789 Update comments of some header files 2015-03-26 22:07:44 +08:00
yangxiao 6cd1697240 config wp8 and add comment 2015-03-26 18:10:42 +08:00
minggo f7e11a2467 Merge pull request #11168 from andyque/fix-comments
fix group error
2015-03-26 16:10:06 +08:00
andyque 42cd63fe01 fix group error 2015-03-26 15:47:14 +08:00
minggo 590cd9dc52 Merge pull request #11167 from minggo/v3
[ci skip]fix some documentation
2015-03-26 15:42:52 +08:00
minggo 1f0ba8cf2b fix some documentation 2015-03-26 15:40:54 +08:00
minggo 4eadd1ce47 Merge pull request #11165 from calfjohn/v3
[ci skip]Modify group name for physics and Texture2d, Texture2dCache, TextureAtla...
2015-03-26 15:29:17 +08:00
calfjohn 587931faaa Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas. 2015-03-26 15:20:25 +08:00
yangxiao 7d3154e2e9 add to linux 2015-03-26 14:34:11 +08:00
yangxiao c23746fbcd modify 2015-03-26 13:05:42 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
lvlong 6c29385547 animate quality! 2015-03-26 11:33:16 +08:00
lvlong c999307150 add different animate quality. 2015-03-26 11:30:22 +08:00
CocosRobot f43b666929 [AUTO]: updating luabinding automatically 2015-03-26 02:44:28 +00:00
minggo f9589d166d Merge pull request #11161 from samuele3hu/v3_5_comment
Update comments of some header files
2015-03-26 10:37:41 +08:00
minggo 52d53fd7ee Merge pull request #11148 from andyque/finish-v3-comments
Add missing comments for UI modules
2015-03-26 10:02:42 +08:00
minggo fae951d928 Merge pull request #11150 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
2015-03-26 10:00:11 +08:00
zhukaixy aead9e5855 correct for code indent 2015-03-26 09:53:41 +08:00
XiaoYang 11c021881b Merge pull request #263 from lvlonggame/v3
fix: obj file load material.
2015-03-26 09:29:58 +08:00
lvlong f93dffdeb0 node frame animation test and resource 2015-03-26 09:25:37 +08:00
lvlong ecfd66cda3 node frame code!!!!! 2015-03-26 09:12:05 +08:00
andyque 86c3e60254 fix merge issue 2015-03-25 22:16:41 +08:00
samuele3hu 1bea6a52a2 Update comments of some header files 2015-03-25 18:54:33 +08:00
andyque f32b59d565 ignore GUIDefine.h 2015-03-25 18:24:35 +08:00
andyque 248325d055 Add missing comments for UI modules
Squashed commit of the following:

commit eb23bf8972d1a580db537f3d341091eaeb99d626
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 17:08:07 2015 +0800

    finish all the documents

commit a64ec4196eb1b41771ac2f7b2ba48845d22b6211
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 09:49:33 2015 +0800

    finish scrollview

commit 4ff76623230f19dd25c4de29e2816754524570b2
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 21:40:26 2015 +0800

    add UIScale9Sprite comments

    Conflicts:
    	cocos/ui/UIScale9Sprite.h

commit e82a17b4e3cd07a03d4bfc906b0dc94d1fa08757
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 18:05:02 2015 +0800

    add comments for UIRichText

commit 7cbbcc6883ace0ef60a060f6c5808f4c296af4df
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 22:08:26 2015 +0800

    add comments for UIPageView and UIRelativeBox

commit 6fcf32a40d5407aefcba39e76aea5fb93a1a4e4a
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 21:12:27 2015 +0800

    finish loadingbar comments

commit 58e16b81dee833788018d913aef80e2ddd33d408
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:51:30 2015 +0800

    finished UiListView

commit 8278b3f1ee905c34dbd9c461975b1b4491eb7977
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:06:10 2015 +0800

    add comments for LayoutManager and LayoutParameter.

commit b2edfa06b83fbb0cdaf2f567c0d6f8d72e6f90c5
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 17:09:17 2015 +0800

    finish comments for UILayoutComponent

commit 730b5bc9c1a18139fbdef331b16c58b928cf999f
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 14:07:58 2015 +0800

    add missing comments

commit cecd97e830492e58dd07a2b1f5d0e87f19144856
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 09:31:51 2015 +0800

    add comments

commit ca0a6033bf61c7fc9caf70719ee5ea651953f580
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 21:02:36 2015 +0800

    add missing docs for UIButton, UILayout, UIIMageview and UIWidget

commit df98454583553e80d2ef4f72cc58de4b433f43c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 14:02:05 2015 +0800

    add missing comments for UIHbox and UIHelper

commit 4baf76dd92672b745d3d84e47e5fed8c680b01c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 11:28:32 2015 +0800

    add comments for UICheckbox

commit 77c4080b3c70268b6a07cfa12d1e9319c86a2f38
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 00:01:42 2015 +0800

    update coments

commit 4506327ace5b7786ee8b490aab1653462a834418
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 20:32:57 2015 +0800

    add comments for UIEditbox

commit 4937f30adb8912a02ab10353b6cc5fe2eed9d4bf
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:51:20 2015 +0800

    add missing comments for UIEditBox

commit 64a48c6b09f4eaf6b84cc8446ef59d382cf8767b
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:12:08 2015 +0800

    fix indentation problem

commit b38c921c114bb4a707be0f29dcdf8c46e43a445a
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:08:46 2015 +0800

    add missing comments for CCIMEDispatcher

commit 4412cf52429f22351a5c9fbb7c392bca64c2a2c6
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:57:52 2015 +0800

    add missing documents for CCIMedelegate

commit 53d3242f2cafde2bebedebe8353c6be625e5ce84
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:43:33 2015 +0800

    add missing documentation for CCTilemapatlas

commit 1f6183086b6e21557e5b05bf4cede43d472611a1
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:38:59 2015 +0800

    add missing comments for CCTextfieldttf

commit a7fe234153cebc4113cc97064d20dfd3515f9611
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 22:03:31 2015 +0800

    supplement comments for ProtectedNode

commit 3b02d22850b6a9e99e779ca09e5ce0b5bf24d602
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:55:03 2015 +0800

    add comments to CCMenuitem.h

commit 58e054c5cd28986e4420c2ae44af7e9a2beab4ce
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:36:14 2015 +0800

    add comments to Menu
2015-03-25 18:17:58 +08:00
yinjimmy 75a7927bad Load all lua module as default 2015-03-25 16:35:11 +08:00
minggo cb07aa4ae2 Merge pull request #11091 from super626/v3
fix memory leak
2015-03-25 16:16:28 +08:00
yangxiao c6af12bcd9 use CC_SAFE_DELETE 2015-03-25 14:33:53 +08:00
zhukaixy 54472497a4 fix comments 2015-03-25 13:43:55 +08:00
minggo 518536964f Merge pull request #11142 from CocosRobot/update_lua_bindings_1427255864
[AUTO]: updating luabinding automatically
2015-03-25 13:36:49 +08:00
minggo 326233ab02 Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash
Avoid crash during parse TextAtlas.
2015-03-25 13:36:28 +08:00
CocosRobot 1ced296b58 [AUTO]: updating luabinding automatically 2015-03-25 03:59:57 +00:00
minggo 5604c98558 Merge pull request #11122 from chengstory/AvoidTimelineCrash
Avoid timeline crash when custom widget is placed in scene.
2015-03-25 11:44:54 +08:00
minggo d67bd549f1 Merge pull request #11135 from fusijie/cocosapi
[ci skip]add comments.
2015-03-25 11:10:31 +08:00
minggo 51329ac130 Merge pull request #11136 from WenhaiLin/v3-doxygen
[ci skip]Update comments.
2015-03-25 11:10:08 +08:00
WenhaiLin f13065a038 [ci skip]Update comments 2015-03-25 11:07:11 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
Jacky 8b57b66f16 add comments. 2015-03-25 10:13:17 +08:00
lvlong 7efd4c2df6 replace setAdditionnalTransform() 2015-03-25 10:04:51 +08:00
minggo 1f4d7c598f Merge pull request #11126 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
2015-03-25 09:53:28 +08:00
minggo bed7746459 Merge pull request #11120 from fusijie/cocosapi
[ci skip]add comments.
2015-03-25 09:49:52 +08:00
minggo 671be8e157 Merge pull request #11131 from natural-law/v3
[ci skip] Update the group of CCClippingRectangleNode.
2015-03-25 09:48:41 +08:00
zhangbin 2f7397f6b9 Update the group of CCClippingRectangleNode. 2015-03-25 09:46:00 +08:00
Huabing.Xu 63a65b1dd1 [ci skip]update comments CCAffineTransform.h 2015-03-24 23:29:41 +08:00
Huabing.Xu d06d575e6e Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments 2015-03-24 23:01:18 +08:00
samuele3hu f3890d3bb3 Update comments of some header files 2015-03-24 21:52:56 +08:00
samuele3hu 020b3ba5cb Update comments of some header files 2015-03-24 21:46:18 +08:00
Huabing.Xu 133955dba1 [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
Huabing.Xu b84c1f2c2c [ci skip]update comments CCGeometry.h 2015-03-24 21:33:55 +08:00
Huabing.Xu e6d1dcef58 Merge pull request #11123 from WenhaiLin/v3-doxygen
V3 doxygen
2015-03-24 20:33:17 +08:00
WenhaiLin 89f9ae044d [ci skip]Update comments 2015-03-24 20:29:13 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
zhangcheng e2e0ed0595 Avoid timeline crash when custom widget is placed in scene. 2015-03-24 19:59:27 +08:00
Huabing.Xu 9923a0b575 [ci skip]update comments Mat4.h, MathUtil.h, Quaternion.h 2015-03-24 19:27:13 +08:00
Jacky 32f37b8701 [ci skip]add comments. 2015-03-24 18:22:52 +08:00
lvlong 5ce4fbe6df merge node transform problem!!! 2015-03-24 17:59:24 +08:00
minggo 9e9d263a17 Merge pull request #11114 from VisualSJ/v3-docs
[ci skip] Add javascript notes...
2015-03-24 17:40:40 +08:00
VisualSJ 6590d34bda [ci skip] Add javascript notes...
cocos/base/CCEventListener.h
  cocos/base/CCEventListenerAcceleration.h
  cocos/base/CCEventListenerController.h
  cocos/base/CCEventListenerCustom.h
  cocos/base/CCEventListenerFocus.h
  cocos/base/CCEventListenerKeyboard.h
  cocos/base/CCEventListenerMouse.h
  cocos/base/CCEventListenerTouch.h
  cocos/base/CCEventMouse.h
  cocos/base/CCEventTouch.h
2015-03-24 16:37:09 +08:00
CocosRobot 08919a1445 [AUTO]: updating luabinding automatically 2015-03-24 08:35:26 +00:00
minggo e50a71609f Merge pull request #11071 from pipu/reconstruct_ColorFrame
Reconstruct ColorFrame.
2015-03-24 16:29:55 +08:00
lvlong 5c20d49cd7 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-03-24 16:07:42 +08:00
lvlong 6e6b2c1869 fix bug: load *.obj can't load sub-mesh material. 2015-03-24 16:03:51 +08:00
zhukaixy 3b8a796404 config project config file for cocos2d-win8.1-universal 2015-03-24 16:01:06 +08:00
pipu 90da9dbee5 Avoid crash during parse TextAtlas. 2015-03-24 15:59:21 +08:00
zhukaixy aa0193044b discard modify of lua_cocos2dx_3d_auto.cpp 2015-03-24 15:49:24 +08:00
zhukaixy 6eaa78d1cb add reload mechanism for TextureCube and Skybox 2015-03-24 15:43:59 +08:00
minggo 9cb02c800a Merge pull request #11102 from WenhaiLin/v3-doxygen
[ci skip]Update comments
2015-03-24 15:15:40 +08:00
WenhaiLin 3b555be91a [ci skip]Update comments 2015-03-24 15:13:05 +08:00
WenhaiLin 9e7e819eab [ci skip]Update comments 2015-03-24 14:43:54 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
minggo 8f9eb6ce22 Merge pull request #11097 from CocosRobot/update_lua_bindings_1427167387
[AUTO]: updating luabinding automatically
2015-03-24 14:01:35 +08:00
WenhaiLin 8ae81e6c7a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:43:09 +08:00
minggo 6cc8fb4348 Merge pull request #11092 from fusijie/cocosapi
[ci skip]update headers' module name.
2015-03-24 11:27:54 +08:00
WenhaiLin 1450dfbc7b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:26:10 +08:00
CocosRobot 9d886cc5f2 [AUTO]: updating luabinding automatically 2015-03-24 03:25:31 +00:00
minggo 4973de2b25 add more doxygen document 2015-03-24 11:15:40 +08:00
minggo 14574bdd41 add doxygen comment of CCFileUtils.h 2015-03-24 10:34:44 +08:00
Jacky af12891cfc [ci skip]update headers' module name. 2015-03-24 10:34:41 +08:00
yangxiao fad4fb8e6f fix memory leak 2015-03-24 10:22:55 +08:00
minggo 9976885d37 Merge pull request #11079 from fusijie/cocosapi
add comments.
2015-03-24 09:50:19 +08:00
minggo 73a3051417 Merge pull request #11087 from CocosRobot/update_lua_bindings_1427121273
[AUTO]: updating luabinding automatically
2015-03-24 09:49:54 +08:00
minggo 13062a36fb Merge pull request #11088 from minggo/disable-travis-building
[ci skip]Disable travis building
2015-03-24 09:46:22 +08:00
CocosRobot 0fb2aeb2b2 [AUTO]: updating luabinding automatically 2015-03-23 14:37:03 +00:00
minggo 2dfc0e11db Merge pull request #11081 from VisualSJ/v3-docs
[ci skip] Add javascript notes...
2015-03-23 22:18:34 +08:00
minggo 67e0cd20d2 Merge pull request #11080 from SuYaoHui/cocosapi
[ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....
2015-03-23 22:18:00 +08:00
WenhaiLin 78a8ba7f98 [ci skip]Update comments 2015-03-23 22:17:59 +08:00
minggo 7f60b1cea2 Merge pull request #11078 from calfjohn/v3
[ci skip] Add documents for Texture2D\TextureAtlas\TextureCache
2015-03-23 22:16:56 +08:00
minggo e86e954abf add doxygen comment for CCVector.h 2015-03-23 22:13:04 +08:00
Huabing.Xu 92b110ce25 [ci skip]update comments Vec2/3/4.h TransformUtils.h 2015-03-23 21:49:36 +08:00
Huabing.Xu b14cf9b775 Merge pull request #11082 from dabingnn/v3_comments
V3 comments
2015-03-23 21:48:00 +08:00
Huabing.Xu 044c954155 [ci skip] update comments CCGLGroupCommand.h 2015-03-23 21:36:01 +08:00
Huabing.Xu 027106c9ee [ci skip] update comments CCGLProgramStateCache.h, CCPrimitive.h CCPrimitiveCommand.h 2015-03-23 21:19:02 +08:00
Zhe Wang 8e2e1e5723 Add comments of async load, to avoid confusions of developers. 2015-03-23 20:58:16 +08:00
Huabing.Xu 126186e413 [ci skip]update comments CCMathBase.h CCGLProgramState.h CCRenderer.h 2015-03-23 20:30:37 +08:00
VisualSJ b5fa6d2e95 [ci skip] Add javascript notes...
cocos/2d/CCMotionStreak.h
  cocos/2d/CCParticleBatchNode.h
  cocos/2d/CCParticleExamples.h
  cocos/2d/CCParticleSystem.h
  cocos/2d/CCParticleSystemQuad.h
  cocos/2d/CCTransition.h
  cocos/2d/CCTransitionPageTurn.h
  cocos/base/CCConfiguration.h
  cocos/base/CCTouch.h
2015-03-23 20:27:13 +08:00
Huabing.Xu 2dde1e69e3 Merge branch 'v3' into v3_comments 2015-03-23 20:00:31 +08:00
Jacky 7f41b091e0 add comments. 2015-03-23 18:39:27 +08:00
SuYaohui d8a033c2ef Action,Sprite,TmxTiledMap,UTF8,GLView 2015-03-23 18:37:28 +08:00
calfjohn 657f270855 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-23 17:50:53 +08:00
calfjohn ff0e852044 Add document for Texture2D\TextureAtlas\TextureCache 2015-03-23 17:50:22 +08:00
minggo 2923ad6cd6 Merge pull request #11076 from CocosRobot/update_lua_bindings_1427099413
[AUTO]: updating luabinding automatically
2015-03-23 16:34:17 +08:00
minggo 3f9862d008 Merge pull request #11075 from CocosRobot/update_lua_bindings_1427099254
[AUTO]: updating luabinding automatically
2015-03-23 16:33:07 +08:00
CocosRobot 9f17ed6bed [AUTO]: updating luabinding automatically 2015-03-23 08:32:54 +00:00
CocosRobot 01930b408e [AUTO]: updating luabinding automatically 2015-03-23 08:29:35 +00:00
minggo 3180f21640 Merge pull request #11068 from minggo/add-documentation
[ci skip]update document for CCValue.h
2015-03-23 16:25:38 +08:00
minggo c587d19e8b Merge pull request #11059 from SuYaoHui/cocosapi
add comments.
2015-03-23 16:24:22 +08:00
minggo 4143eae713 Merge pull request #11061 from fusijie/cocosapi
add comments.
2015-03-23 16:23:51 +08:00
pipu 787225ce21 Make _alpha of ColorFrame become deprecated attribute. 2015-03-23 15:45:32 +08:00
pipu c068e60aa6 Reconstruct ColorFrame. 2015-03-23 13:37:24 +08:00
SuYaohui 6310e75071 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-23 11:35:30 +08:00
minggo 27c4104ca7 Merge pull request #11049 from MSOpenTech/v3-wp8-shaders
Edit V3 updated precompiled shaders for WP8
2015-03-23 11:28:18 +08:00
CocosRobot ef631d743c [AUTO]: updating luabinding automatically 2015-03-23 03:20:47 +00:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc
add 3D doc, fixed typo
2015-03-23 10:45:41 +08:00
Jacky cc09b84153 add comments. 2015-03-21 18:02:56 +08:00
SuYaohui 367fb6ed4c add comments. 2015-03-21 17:06:26 +08:00
Dale Stammen fc94659fd5 updated precompiled shaders for WP8 2015-03-20 23:50:48 -07:00
CocosRobot fd7ac235ce [AUTO]: updating luabinding automatically 2015-03-21 04:55:48 +00:00
dingpinglv ef56088886 Issue: Added js Annotates to CCNode.h 2015-03-21 11:07:39 +08:00
dingpinglv b30b6db09b Issue: added js annotates to CCLayer.h 2015-03-21 10:23:42 +08:00
zhukaixy 52280e6376 add 3d test case(skybox and texture cube) for lua project 2015-03-20 17:53:05 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
samuele3hu 865aa886a9 Update comments of some header files 2015-03-20 14:39:33 +08:00
minggo 7c4f8b238d Merge pull request #11014 from pipu/InnerActionSpeed_flatbuffer_data
Create flat buffer format data for "InnerActionSpeed".
2015-03-20 13:39:09 +08:00
CocosRobot 7ea110134c [AUTO]: updating luabinding automatically 2015-03-20 04:53:00 +00:00
Huabing.Xu abaa8dba77 update comments 2015-03-20 11:24:52 +08:00
pipu 8791e36d3f Create flat buffer format data for "InnerActionSpeed". 2015-03-20 11:10:22 +08:00
minggo f3398eafbf Merge pull request #11008 from andyque/change-jenkins-to-use-msbuild
use msbuild in windows slaves
2015-03-20 10:38:50 +08:00
andyque a29a298ec3 fix wrong comment 2015-03-20 09:49:34 +08:00
Huabing.Xu d075a2bf86 Merge pull request #11009 from dabingnn/v3_comments
[ci skip] update comments in renderer folder
2015-03-20 09:47:30 +08:00
Huabing.Xu 055b71569a [ci skip] update comments in renderer folder 2015-03-20 09:46:08 +08:00
minggo a5eca355fd Merge pull request #11005 from CocosRobot/update_lua_bindings_1426774505
[AUTO]: updating luabinding automatically
2015-03-20 09:28:57 +08:00
CocosRobot 7da412a4e1 [AUTO]: updating luabinding automatically 2015-03-19 14:17:17 +00:00
minggo 78ff70a8f6 Merge pull request #10972 from pipu/fix_armaturenode_load
Avoid crash during parse armature node.
2015-03-19 22:10:34 +08:00
minggo d28e5d61b6 Merge pull request #10998 from dingpinglv/Iss_Annotate
[ci skip] Added js annotates to -x
2015-03-19 22:09:43 +08:00
minggo 8e019de83b Merge pull request #11003 from fusijie/cocosapi
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
2015-03-19 22:09:20 +08:00
minggo f4e2469730 update document for CCValue.h 2015-03-19 21:52:56 +08:00
minggo 0648ac7ca0 Merge pull request #11004 from SuYaoHui/cocosapi
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
2015-03-19 21:47:32 +08:00
dingpinglv de73f25e42 Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h 2015-03-19 21:44:44 +08:00
SuYaohui 5e236fd753 progressTimer,ApplicationProtocol 2015-03-19 21:42:31 +08:00
Jacky 85c04ff605 [ci skip]add comments to CCLayer & CCNode & CCConfiguration. 2015-03-19 21:41:40 +08:00
dingpinglv 41822ef131 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:27:52 +08:00
dingpinglv 3413c716df Issue: Added js annotates to CCScheduler.h 2015-03-19 21:25:09 +08:00
minggo 8e32933dd3 Merge pull request #10340 from seobyeongky/network_bugfix2
receive content data even though status code is not 2xx
2015-03-19 21:12:51 +08:00
SuYaohui c295952c71 NodeGrid,Config,NS,ApplicationProtocol 2015-03-19 21:03:28 +08:00
dingpinglv c03703ddab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:01:17 +08:00
dingpinglv 069791a0a2 Corrected a wrong indent in CCSpriteFrameCache.h 2015-03-19 21:00:33 +08:00
minggo 35078b70da Merge pull request #10997 from CocosRobot/update_lua_bindings_1426768076
[AUTO]: updating luabinding automatically
2015-03-19 20:44:33 +08:00
CocosRobot 21e46efb00 [AUTO]: updating luabinding automatically 2015-03-19 12:30:15 +00:00
dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
Conflicts:
	cocos/audio/include/SimpleAudioEngine.h
2015-03-19 20:28:29 +08:00
dingpinglv baa723a899 Issue : Added js annotates to CCController.h 2015-03-19 20:26:44 +08:00
Vincent Yang 93ccdae7df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-03-19 20:22:59 +08:00
Vincent Yang ca4c71bf0e Add MainPageWhiteBook.h, and move doxygen_modules.h to docs. 2015-03-19 20:21:40 +08:00
dingpinglv 1b179c2b02 Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h 2015-03-19 20:20:16 +08:00
minggo 0b19781d8c Merge pull request #10989 from pipu/serialize_InnerActionSpeed
Serialize attribute "InnerActionSpeed" during create from .csd file.
2015-03-19 20:11:34 +08:00
minggo 1539b5de78 Merge pull request #10991 from VisualSJ/v3-docs
Add javascript notes...
2015-03-19 20:09:41 +08:00
minggo 8075cc1602 Merge pull request #10986 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
2015-03-19 20:01:43 +08:00
minggo f3e518b103 Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash
fix crash problem when switch to a new scene after call RenderTexture::s...
2015-03-19 20:00:31 +08:00
minggo 5601eed02f Merge pull request #10987 from samuele3hu/v3_5_f_bug
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
2015-03-19 19:59:28 +08:00
dingpinglv 7a50af4407 Issue : added js annotate to CCLight.h 2015-03-19 19:54:46 +08:00
dingpinglv 194c8d8f17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 19:46:01 +08:00
VisualSJ f87b06a1c8 Add javascript notes...
cocos/2d/CCAction.h
  cocos/2d/CCActionCamera.h
  cocos/2d/CCActionCatmullRom.h
  cocos/2d/CCActionInstant.h
  cocos/2d/CCActionInterval.h
  cocos/2d/CCActionManager.h
  cocos/audio/include/AudioEngine.h
  cocos/audio/include/SimpleAudioEngine.h
2015-03-19 18:41:11 +08:00
calfjohn 97048c8fdc Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-19 18:00:08 +08:00
calfjohn c2cded367c add document for physics 2015-03-19 17:58:08 +08:00
pipu e9b6ca724d Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator. 2015-03-19 17:54:26 +08:00
samuele3hu 5a5acc624a issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32 2015-03-19 17:31:57 +08:00
samuele3hu 1eb1057875 Update comments of some header files 2015-03-19 16:59:21 +08:00
samuele3hu 31b34ddf77 Update comments of some header files 2015-03-19 16:45:53 +08:00
Huabing.Xu 8b04a15ee8 fix crash problem when switch to a new scene after call RenderTexture::saveToFile() 2015-03-19 16:39:45 +08:00
CocosRobot 0afd385412 [AUTO]: updating luabinding automatically 2015-03-19 08:29:09 +00:00
Vladimir Perminov 133be7e57f Clean possible GL error
CHECK_GL_ERROR_DEBUG work debug only.
Clean need for correct check glTexImage2D and glCompressedTexImage2D

Release now work: If gl error before any code, initWithMipmaps return
false always
2015-03-19 11:10:49 +03:00
zhangbin f196d213ee Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
zhukaixy 0587122ccc Move Skybox.shader from Sprite3DTest to Shader3D folder 2015-03-19 15:11:24 +08:00
minggo a8471dd507 Merge pull request #10978 from natural-law/v3
[ci skip] Update comments of some header files.
2015-03-19 13:42:48 +08:00
zhangbin d755a7b46a Update comments of some header files. 2015-03-19 13:41:21 +08:00
minggo a8d29b6122 Merge pull request #10970 from CocosRobot/update_lua_bindings_1426737203
[AUTO]: updating luabinding automatically
2015-03-19 11:56:41 +08:00
minggo 1d37016912 Merge pull request #10962 from dingpinglv/Iss_Annotate
[ci skip] added js annotate to classes
2015-03-19 11:56:07 +08:00
CocosRobot f2c49b3311 [AUTO]: updating luabinding automatically 2015-03-19 03:55:42 +00:00
minggo 194510dacc Merge pull request #10969 from pipu/parse_csd_position
Fix that parse position from .csd file.
2015-03-19 11:53:31 +08:00
minggo b3d9b72f27 Merge pull request #10944 from pipu/manage_actiontimelinedata_reference
Manage reference count of ActiontimelineData object.
2015-03-19 11:53:07 +08:00
minggo aec86d7e61 Merge pull request #10967 from VisualSJ/v3-docs
Add javascript notes...
2015-03-19 11:52:44 +08:00
pipu c1f147b7a1 Avoid crash during parse armature node. 2015-03-19 11:51:34 +08:00
minggo 74de66a286 Merge pull request #10964 from CocosRobot/update_lua_bindings_1426687157
[AUTO]: updating luabinding automatically
2015-03-19 11:49:54 +08:00
pipu 46741e1035 Fix that parse position from .csd file. 2015-03-19 11:22:11 +08:00
minggo b469f460c7 Merge pull request #10968 from WenhaiLin/v3-update-document
[ci skip]Update document
2015-03-19 10:46:06 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
VisualSJ 62b3f537ce Add javascript notes...Fixed error 2015-03-19 10:33:11 +08:00
SuYaohui 2edb7f7d50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-19 10:05:24 +08:00
SuYaohui bc2b897dc6 ProgressTimer 2015-03-19 10:00:30 +08:00
dingpinglv 9be573e92f Added js annotate to CCSpriteFrameCache.h 2015-03-18 22:24:03 +08:00
dingpinglv 4bb78a2eec Added js annotate to CCScene.h 2015-03-18 22:08:50 +08:00
CocosRobot b7881eab88 [AUTO]: updating luabinding automatically 2015-03-18 14:02:42 +00:00
dingpinglv ee44f024f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
Conflicts:
	cocos/2d/CCActionGrid.h
	cocos/2d/CCAnimation.h
	cocos/2d/CCAnimationCache.h
	cocos/base/CCRef.h
2015-03-18 21:58:07 +08:00
minggo 8306aaaab2 Merge pull request #10955 from dabingnn/v3_comments
[ci skip] update comments CCRenderCommand.h
2015-03-18 21:48:47 +08:00
minggo ddb6230c13 Merge pull request #10953 from fusijie/cocosapi
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
2015-03-18 21:48:28 +08:00
minggo a9f13148f4 Merge pull request #10961 from minggo/add-documentation
[ci skip]update document for ccUtils.h
2015-03-18 21:46:20 +08:00
dingpinglv a99c2c7893 Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h 2015-03-18 21:45:58 +08:00
minggo 7f825d3dae update document for ccUtils.h 2015-03-18 21:45:00 +08:00
VisualSJ 3576df4b89 Add javascript notes...
cocos/base/CCDirector.h
2015-03-18 21:39:50 +08:00
VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs
Conflicts:
	cocos/base/CCAutoreleasePool.h
	cocos/base/CCData.h
2015-03-18 21:38:56 +08:00
minggo bf0d48e483 Merge pull request #10957 from natural-law/v3
[ci skip] Update comments of some header files.
2015-03-18 21:33:13 +08:00
minggo 0267faa7d1 Merge pull request #10958 from minggo/add-documentation
[ci skip]update document for CCUserDefault.h
2015-03-18 21:27:13 +08:00
minggo 85811bd710 update document for CCUserDefault.h 2015-03-18 21:24:31 +08:00
zhangbin f31a833df4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 21:10:17 +08:00
zhangbin a5e148c829 Update comments of some header files. 2015-03-18 20:56:17 +08:00
VisualSJ cb50c7d89a Add javascript notes...
cocos/2d/CCActionPageTurn3D.h
  cocos/base/CCAutoreleasePool.h
  cocos/base/CCData.h
2015-03-18 20:51:18 +08:00
minggo 660cfdf964 Merge pull request #10954 from minggo/add-documentation
[ci skip]Add documentation
2015-03-18 20:43:33 +08:00
Jacky 2d50327323 update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache 2015-03-18 20:40:29 +08:00
minggo 19fc6a1495 update document for CCScheduler.h 2015-03-18 20:37:43 +08:00
minggo 10703bce66 Merge pull request #10952 from SuYaoHui/cocosapi
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
2015-03-18 20:33:00 +08:00
Huabing.Xu 0c8218581f [ci skip] update comments CCRenderCommand.h 2015-03-18 20:30:52 +08:00
SuYaohui 31944da08c [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:26:16 +08:00
Huabing.Xu 431b3593a7 [ci skip] update comments CCQuadCommand.h 2015-03-18 20:12:34 +08:00
calfjohn e67a57512f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 20:10:16 +08:00
SuYaohui ee8776f041 [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:07:00 +08:00
Huabing.Xu a87c5755e9 [ci skip] update comments CCTrianglesCommand.h 2015-03-18 19:52:08 +08:00
Huabing.Xu 4ae4500a68 [ci skip]adjust comments 2015-03-18 19:32:10 +08:00
minggo 359e25327d Merge pull request #10946 from natural-law/v3
[ci skip] Update comments of some header files.
2015-03-18 18:25:31 +08:00
zhangbin b55916c283 Update comments of some header files. 2015-03-18 18:15:34 +08:00
Huabing.Xu fb1d9899c7 [ci skip]adjust comments CCVertexIndexBuffer.h and CCVertexIndexData.h 2015-03-18 17:40:10 +08:00
Huabing.Xu a71fb9f946 [ci skip]update comments CCVertexIndexBuffer.h 2015-03-18 17:18:25 +08:00
pipu e7c89dadf1 Manage reference count of ActiontimelineData object in ObjectExtensionData. 2015-03-18 16:56:16 +08:00
calfjohn 83e69f4532 add comments for PhysicsWorld 2015-03-18 16:35:38 +08:00
minggo 0408fc0667 update document for CCRef.h 2015-03-18 15:02:03 +08:00
Huabing.Xu eb2786f40d [ci skip]update comments CCVertexIndexData.h 2015-03-18 14:43:44 +08:00
minggo aa5f257243 Merge pull request #10938 from minggo/add-documentation
[ci skip]Add documentation
2015-03-18 14:11:30 +08:00
minggo 723244f62d Merge pull request #10932 from lyubomirv/v3-bulgarian
Added Bulgarian language.
2015-03-18 14:01:26 +08:00
minggo 5271c75c11 Merge pull request #10936 from super626/v3
Camera mask for label
2015-03-18 14:00:44 +08:00
minggo eeebe97547 Merge pull request #10937 from CocosRobot/update_lua_bindings_1426657990
[AUTO]: updating luabinding automatically
2015-03-18 13:57:08 +08:00
CocosRobot 611ec0a4a5 [AUTO]: updating luabinding automatically 2015-03-18 05:55:07 +00:00
Huabing.Xu edf785cec3 [ci skip]update version 2015-03-18 13:52:52 +08:00
yangxiao 44af57459e add comment 2015-03-18 11:58:36 +08:00
yangxiao 21d581a72c set camera mask when member created 2015-03-18 11:41:43 +08:00
pipu faf9d6b01c Avoid crash during parse .csd file. 2015-03-18 10:28:12 +08:00
minggo be2af44583 update document for CCDirector.h 2015-03-17 22:32:26 +08:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
minggo 44c04153a6 update document for CCDataVisitor.h 2015-03-17 20:54:47 +08:00
minggo 36bf7c6d39 update document for CCAutoreleaseData.h 2015-03-17 20:49:00 +08:00
minggo 5b55e873d0 update document for CCAutoreleasePool.h 2015-03-17 20:15:50 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3
Bug fix
2015-03-17 19:29:21 +08:00
songchengjiang 73caf536da fix the bug of lighting shader 2015-03-17 16:43:08 +08:00
lvlong 3ce0449c97 decompose 2015-03-17 15:17:23 +08:00
CocosRobot 9df3f57e0d [AUTO]: updating luabinding automatically 2015-03-17 06:28:14 +00:00
minggo aa573a9553 Merge pull request #10904 from pipu/fixed_widget_reader_actiontag
Optimize parse action tag for node and widget.
2015-03-17 14:18:22 +08:00
minggo f51e2b9537 Merge pull request #10912 from perminovVS/v3-dev-console
Create Console before any sub systems
2015-03-17 14:17:35 +08:00
lvlong 733a89100e remove old code! 2015-03-17 13:13:03 +08:00
lvlong 080132d072 modify sub node transform! 2015-03-17 12:15:03 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
minggo f7d5a16734 Merge pull request #10873 from konopka/fix_compiler_override_warnings
Fix compiler override warnings
2015-03-17 10:38:19 +08:00
Vladimir Perminov e745d5949a Create Console before any sub systems
Sub system use cocos2d::log in constructors.
2015-03-16 20:22:20 +03:00
Petr Babička fa245c44b9 Spaces instead of tabs 2015-03-16 17:22:17 +01:00
Alok Sahay 80576b5903 Don't set scale and loadHTMLString on nil. 2015-03-16 17:00:01 +01:00
konopka 0387b13bb6 Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
konopka 7fb79272ca Undo changes that are not allowed by spine license 2015-03-16 16:35:41 +01:00
Dale Stammen e2a5eb2f9f updated to Angle ddbf057c52 2015-03-16 08:18:26 -07:00
Dale Stammen 08ceae3de2 removed no-gl_PointSize shaders for Windows Phone 8.1 2015-03-16 08:08:02 -07:00
pipu a5e9ebc4e6 Fix parse action tag for widget. 2015-03-16 20:04:59 +08:00
yangxiao 8b3e116ed6 check running scene 2015-03-16 18:04:50 +08:00
Dale Stammen ef5e6fc473 fixed use of Color4B 2015-03-16 02:17:05 -07:00
yangxiao 5b26ba3c68 override setCameraMask 2015-03-16 17:11:17 +08:00
yangxiao f56d8c4784 fix camra mask for label does not work 2015-03-16 15:31:29 +08:00
CocosRobot a3ddd92307 [AUTO]: updating luabinding automatically 2015-03-16 07:11:12 +00:00
minggo f25be54e95 Merge pull request #10671 from kpkhxlgy0/v3
enable setWritablePath on platform win32 and mac
2015-03-16 14:57:26 +08:00
minggo d0753674b2 Merge pull request #10514 from cpascal/uiEditBox_Win32
Fixed missing ui::EditBox functionalities on Win32
2015-03-16 14:56:49 +08:00
minggo 23dbbf6d99 Merge pull request #10887 from CocosRobot/update_lua_bindings_1426488653
[AUTO]: updating luabinding automatically
2015-03-16 14:54:26 +08:00
CocosRobot 7a4e727ee2 [AUTO]: updating luabinding automatically 2015-03-16 06:53:18 +00:00
minggo 1916bc1f1f Merge pull request #10693 from Mazyod/editbox-text-alpha-support
Support Color4B for editbox text
2015-03-16 14:52:36 +08:00
minggo 2ea88a30bb Merge pull request #10817 from garfieldkwong/fix_autorelease_branch
fix issue autorelease will not release trigger by autorelease.
2015-03-16 14:47:30 +08:00
minggo ebe5dff7a6 Merge pull request #10737 from newnon/v3_scale9_blend_func
blending function for Scale9Sprite
2015-03-16 14:45:08 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo cfa1f0c84f Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
2015-03-13 21:12:35 -07:00
Nite Luo 3194da4e7d Merge pull request #10720 from darkdukey/hide_cursor
Hide cursor
2015-03-13 10:48:15 -07:00
SunLightJuly 6871e30b8d define __G__TRACKBACK__ in cocos.init 2015-03-13 16:39:36 +08:00
CocosRobot 2f0eb6712d [AUTO]: updating luabinding automatically 2015-03-13 07:15:34 +00:00
Huabing.Xu 639ed335b3 Merge pull request #10839 from pipu/node_load_callback
To add the function node load callback called during create node from csb file.
2015-03-13 15:06:14 +08:00
Huabing.Xu 03c3a4d5ed Merge pull request #10836 from pipu/reconstruct_object_extension_data
To reconstruct object extension data.
2015-03-13 15:04:41 +08:00
CocosRobot fa2fe74986 [AUTO]: updating luabinding automatically 2015-03-13 06:19:29 +00:00
Huabing.Xu 1fa9145a56 Merge pull request #10832 from super626/v3
fix bugs
2015-03-13 14:13:24 +08:00
Huabing.Xu c3aea9f6c0 update version string and releaseNotes for 3.5 2015-03-13 11:51:32 +08:00
Martin Konopka 350b81501d Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
pipu 56c3d1c6f6 To add the function node load callback called during create node from csb file. 2015-03-12 17:36:39 +08:00
pipu 7515fc78f5 To set csd version for serializing. 2015-03-12 16:15:17 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
yangxiao 50c3a9cb4c fix removeAllChildren cause camera to be destroyed bug 2015-03-12 10:39:21 +08:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
mogemimi 8cf0ec1aca Minor refactor TMXMapInfo
* Replace with range-based for loop
* Replace some size() with !empty()
* Refactor scope of local variable
2015-03-12 01:21:57 +09:00
mogemimi 279604bac5 Add missing white spaces and some minor cleanups
* Add missing white space
* Fix if-else statement without curly braces
* Fix indentation
* Clean up code
2015-03-12 01:19:37 +09:00
mogemimi abeb269534 Remove useless (char*) cast 2015-03-12 01:14:05 +09:00
GarfieldKwong 656842d6f1 fix issue autorelease will not release trigger by autorelease. 2015-03-11 15:31:06 +08:00
minggo d2be2290a3 Merge pull request #10796 from Mazyod/http-client-mac
Http client mac
2015-03-11 14:26:08 +08:00
CocosRobot e079216248 [AUTO]: updating luabinding automatically 2015-03-11 02:45:36 +00:00
minggo 04393854e8 Merge pull request #10789 from fusijie/fix-moveto-reverse
disable MoveTo::reverse()
2015-03-11 10:39:45 +08:00
minggo c4ac2b5f47 Merge pull request #10795 from pipu/optimize_ButtonReader
To optimize ButtonReader for source path and source.
2015-03-11 10:05:48 +08:00
minggo c701f89329 Merge pull request #10683 from Mazyod/mac-editbox-fix
Fix editbox on Mac
2015-03-11 10:00:50 +08:00
pipu 90da84a663 To modify that check whether or not string is not empty. 2015-03-11 09:59:07 +08:00
Jacky 605ce58293 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
minggo 858178ad8e Merge pull request #10772 from super626/v3
refactor init method
2015-03-10 17:50:06 +08:00
pipu 00bf9f5bfb To optimize the situation that source path is existed, but source is not existed. 2015-03-10 17:48:48 +08:00
minggo afb06b5c42 Merge pull request #10770 from m2q1n9/patch-1
fix cocostudio anchor point bug
2015-03-10 13:40:44 +08:00
minggo 8e6d9d5dd2 Merge pull request #10740 from newnon/v3_windows_network_path
Windows network path fix
2015-03-10 11:25:53 +08:00
minggo f3567ba1af Merge pull request #10780 from ryule/fix_CCDevice-ios_font_stroke_alpha
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-10 11:19:29 +08:00
minggo 5ac2fb398c Merge pull request #10774 from minggo/sync-from-v4
Label:Fixed transform not update correctly
2015-03-10 09:54:20 +08:00
minggo a4698eaaaf Merge pull request #10781 from mogemimi/add-const-to-member-function
Add const to Value::getDescription() function
2015-03-10 09:49:56 +08:00
yangxiao 5131a23de4 solve conflict 2015-03-10 09:18:13 +08:00
Dale Stammen 24d706cb7a added /bigobj to C++ compiler command line options 2015-03-09 09:39:36 -07:00
Dale Stammen 35222a8193 Merge branch 'v3' into v3-wp8-fix 2015-03-09 09:20:25 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
mogemimi de4105516a Add const to Value::getDescription() function 2015-03-09 22:34:24 +09:00
Jongryul Kook 0d65dd13be Fix CCDevice-ios.mm to have the right alpha color for a stroke effect. 2015-03-09 21:20:17 +09:00
WenhaiLin cd95905a04 Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera 2015-03-09 17:26:43 +08:00
yangxiao 45bd6180ad fix create bundle using empty path 2015-03-09 17:09:18 +08:00
yangxiao ff3eba6143 refact init 2015-03-09 16:29:57 +08:00
m2q1n9 c97742072f fix cocostudio anchor point bug
fix a bug which will cause anchor point config not work
2015-03-09 14:30:41 +08:00
Dale Stammen a9479a1585 updated WP8 precompiled shaders 2015-03-08 21:42:27 -07:00
Dale Stammen 6cd881d8f8 added missing Particle3D files 2015-03-08 21:37:29 -07:00
Dale Stammen 362edec6d6 added missing Particle3D files 2015-03-08 21:31:43 -07:00
minggo badfa5501d Merge pull request #10723 from pipu/reconstruct_parse_callbackbind
To reconstruct callback binding for nest node
2015-03-09 10:55:47 +08:00
pipu c21538e6e2 Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:38:02 +08:00
CocosRobot 1f78b18d22 [AUTO]: updating luabinding automatically 2015-03-09 02:27:14 +00:00
pipu 1fa9b2577a Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:16:14 +08:00
Mazyad Alabduljaleel ce377c4a1e Fix compilation issues on Android and Win 2015-03-06 16:05:05 +04:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
XiaoYang 27ae60e626 Merge pull request #249 from songchengjiang/particle_merge
support win8.1
2015-03-06 17:57:34 +08:00
minggo 2238cb0dbb Merge pull request #10546 from krishnanm86/knarasimhan_sourcerefactor_jni_audio
Sourcr Refactor. Abstracted common functionality from two jni methods an...
2015-03-06 16:14:59 +08:00
minggo 15853a435e Merge pull request #10738 from newnon/v3_mingw_build_fix
MinGW build fix
2015-03-06 15:49:13 +08:00
minggo 65926a9f0b Merge pull request #10734 from pipu/projectnode_animation_innerspeed
Serialize and parse attribute "innerspeed" for ProjectNode.
2015-03-06 15:43:57 +08:00
songchengjiang 4ca90341b9 support win8.1 2015-03-06 15:35:02 +08:00
minggo c96f3b135a Merge pull request #10733 from pipu/modify_layout_attribute_name
To modify layout attribute name that are used in serialized and parsed.
2015-03-06 15:00:33 +08:00
yangxiao 457ac3fdd7 reset unproject with viewport cocostudio using it 2015-03-06 11:29:40 +08:00
yangxiao d7c1d6b6aa add billboard to transparent queue 2015-03-06 09:57:48 +08:00
andyque e93f39fae1 fix typo 2015-03-05 17:05:08 +08:00
andyque a229793e31 fix Linux glfw linker error on v3 2015-03-05 16:34:51 +08:00
Sergey 8270355ad6 blending function for Scale9Sprite 2015-03-05 11:13:51 +03:00
Sergey de284c98ce MinGW build fix 2015-03-05 11:11:13 +03:00
Sergey Perepelitsa 215fe8a0c9 Windows network path fix 2015-03-05 11:10:03 +03:00
pipu fadac31868 Serialize and parse attribute "inner speed" for ProjectNode. 2015-03-05 15:48:17 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b
modify ParticleUniverse file structure
2015-03-05 14:54:32 +08:00
pipu be1b0b7239 To modify layout attribute name that are used in serialized and parsed. 2015-03-05 14:34:35 +08:00
yangxiao faf299c5a1 make path shorter 2015-03-05 13:24:06 +08:00
Jacky c38c4a1373 fixed source coding error. 2015-03-04 18:15:05 +08:00
Krishna 35403439f3 Fixed compilation issue. Introduced missing CLASS_NAME 2015-03-04 10:48:30 +01:00
Krishna ec3a8d49f9 Fixed compilation error. 2015-03-04 10:43:31 +01:00
pipu 010a077fa8 To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader. 2015-03-04 17:29:40 +08:00
yangxiao ea7dfe1147 lua test 2015-03-04 10:42:08 +08:00
yangxiao 68eaadaffb merge cocos 2015-03-04 09:57:42 +08:00
Dale Stammen e93fe1b13b Merge branch 'v3' into v3-wp8-fix 2015-03-03 08:40:07 -08:00
CocosRobot 93c2b48779 [AUTO]: updating luabinding automatically 2015-03-03 15:15:43 +00:00
minggo 13e4525772 Merge pull request #10659 from super626/v3
Remove expolosion particle
2015-03-03 23:03:02 +08:00
cpascal db9985d7cd Added new line with the left curl bracket. 2015-03-03 20:39:25 +09:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
byeonggee.seo b3335f34ae Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2 2015-03-03 16:33:48 +09:00
byeonggee.seo 3811c9f1a3 connError added 2015-03-03 16:33:35 +09:00
Nite Luo 49912c2f62 clean up the formatting 2015-03-02 23:29:15 -08:00
Chad 395c14f07d Hide Cursor - Feature Request #8766
Added the ability to hide or show the cursor on desktop builds.
2015-03-02 23:21:18 -08:00
tangziwen 840b531a9a update 2015-03-03 14:14:50 +08:00
cpascal a6ee1451f4 changed one more indentation.
I made mistake, (now replacing the spaces to tab)
2015-03-03 13:44:43 +09:00
cpascal 4058e16f16 Added line break & removed function call in compare operator. 2015-03-03 13:40:40 +09:00
yangxiao 38636dc8b7 allow transition time to 0 2015-03-03 11:04:34 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
Dale Stammen 44b951a51a Merge branch 'v3' into v3-wp8-fix 2015-03-02 16:42:05 -08:00
Mazyad Alabduljaleel 9d5fdcb973 Support Color4B for editbox text 2015-03-02 15:31:59 +04:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
Mazyad Alabduljaleel 4387844176 Fix editbox on Mac 2015-03-01 23:56:18 +04:00
loadrunner 1a1c1f1ed0 added sensor property to shapes 2015-03-01 11:03:01 +02:00
kpkhxlgy0 99dea9395d enable setWritablePath on platform win32 and mac 2015-02-28 18:21:57 +08:00
yangxiao 56f3f34ee3 add Animate3D::setTransitionTime 2015-02-28 17:40:25 +08:00
CocosRobot 84fb4094fc [AUTO]: updating luabinding automatically 2015-02-28 03:23:08 +00:00
minggo 0755400a79 Merge pull request #10279 from seobyeongky/motionstreak_bug_fix
MotionStreak MoveTo/MoveBy action OK
2015-02-28 11:17:28 +08:00
Dale Stammen fd11984e0a disable LTCG 2015-02-27 11:21:36 -08:00
Dale Stammen e4db9f396e disable LTCG. set warning level to W3 2015-02-27 11:16:40 -08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen e04fd6eb1d updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:54:27 -08:00
Dale Stammen d486cc78fb updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:52:32 -08:00
Dale Stammen 8bc5b37b40 removed missing include files from project 2015-02-27 10:48:53 -08:00
Dale Stammen b5e936c657 disabled LTCG to speed up release builds 2015-02-27 10:43:13 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
Dale Stammen e9ef92291f renamed cocos2d dll from 3.4 to 3.5 2015-02-27 10:26:58 -08:00
Dale Stammen 49b16718a2 removed missing .h files from solution 2015-02-27 10:24:02 -08:00
seobyeongky 91b0104fd0 Fix an issue with iOS HTTP Request code (https://github.com/cocos2d/cocos2d-x/pull/10543) 2015-02-27 21:31:33 +09:00
Wenhai Lin 5af895b24d Fixed the position of physics body is wrong when the position of parent node has been change. 2015-02-27 17:55:25 +08:00
minggo 7805adce94 Merge pull request #10325 from seobyeongky/httpclient_bugfix
HttpResponse reference counting bug fixed
2015-02-27 14:32:41 +08:00
CocosRobot 8a310c09c0 [AUTO]: updating luabinding automatically 2015-02-27 03:54:42 +00:00
yangxiao dd070e177e modify unproject 2015-02-27 10:20:32 +08:00
yangxiao 437a59fb9a modify project & unproject api 2015-02-27 10:01:57 +08:00
yangxiao 6f395edf0e modify according to minggo 2015-02-26 17:37:45 +08:00
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
minggo e69e648d7c Merge pull request #10483 from redism/ios-network-header-fix
apply custom request header for every request type (ios)
2015-02-26 16:40:12 +08:00
minggo e37bbee1c2 Merge pull request #10545 from Mazyod/ios-http-request-leaks
Fix major memory leaks in iOS http request
2015-02-26 15:41:10 +08:00
yangxiao a1642757f9 merge setcameramask 2015-02-26 15:33:18 +08:00
yangxiao 9a64eb18dd add project function 2015-02-26 15:20:20 +08:00
Krishna 58df860b4e Made the loadeffect utility method into a static method. Removed declaration of old method from header file 2015-02-26 06:53:20 +01:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
Fix win32 resource search path to be relative to the executable.
2015-02-25 20:24:07 -08:00
minggo 366a938a86 Merge pull request #10603 from sun-ray/v3
CocosStudio 3DReader
2015-02-26 11:01:28 +08:00
minggo 5d8071bdcf Merge pull request #10597 from loadrunner/v3
added Romanian language
2015-02-26 10:51:46 +08:00
Ray bfb5c1ca23 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-02-26 10:44:20 +08:00
minggo 39d2f0629c [ci skip] update version 2015-02-26 10:40:30 +08:00
minggo e6ce627632 [ci skip]update version 2015-02-26 10:39:37 +08:00
minggo 31e8d0dccd Merge pull request #10521 from ryule/fix_httpclient-ios
Fixed HttpClient-ios request to work when the data is started by 0x00.
2015-02-26 10:32:20 +08:00
Ray 1a2aa8633f fix w8 project 2015-02-26 10:27:12 +08:00
Ray a2dc8b85c4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-26 09:20:16 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Dale Stammen 38d513648a added missing UserCameraReader files to Universal App project 2015-02-25 08:33:19 -08:00
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02:00
minggo 524c723daa Merge pull request #10587 from sun-ray/v3
CocosStudio 3DReader
2015-02-25 20:19:06 +08:00
Krishna 3b54af1763 Introduced missing function declarators 2015-02-25 10:26:59 +01:00
pandamicro 9bf22a51ea Fix ListView::setDirection issue 2015-02-25 16:17:43 +08:00
Mazyad Alabduljaleel 23093b9c53 Just a few more leak fixes 2015-02-25 10:56:25 +04:00
Mazyad Alabduljaleel c80312bea6 Two more memory leaks 2015-02-25 10:52:15 +04:00
Mazyad Alabduljaleel 3e60e0ddf6 For some reason, this is causing a conflict 2015-02-25 10:44:00 +04:00
Ray 2f4fbbf4e8 fix the define problem 2015-02-25 14:28:39 +08:00
Ray 94523b667a Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-25 14:19:37 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
lvlong ac5d34b93d recover bundle3d 2015-02-25 10:56:01 +08:00
lvlong 2d89ee34ef recover bundle3d 2015-02-25 10:54:49 +08:00
lvlong 7437bfad15 recover bundle3D. 2015-02-25 10:33:16 +08:00
minggo c2479adc59 Merge pull request #10549 from mogemimi/fix-typo
Fix typo in Image::Format
2015-02-25 09:32:58 +08:00
Dale Stammen b39b078593 fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms 2015-02-24 14:39:21 -08:00
minggo 0d2566c202 Merge pull request #10520 from mannewalis/v3
adding CC_DEPRECATE(version) macro
2015-02-24 09:30:21 +08:00
mogemimi d384f7ce1e Fix typo: unkown -> unknown 2015-02-24 02:39:50 +09:00
mogemimi 9e7ce0cd85 Fix typo in Image::Format 2015-02-24 02:36:20 +09:00
Krishna Narasimhan 80ea81884b Source refactor. Corrected compile issue 2015-02-23 13:01:19 +01:00
Krishna Narasimhan 239a5f307f Sourcr Refactor. Abstracted common functionality from two jni methods and saved space/resources 2015-02-23 10:20:12 +01:00
Ray c5cc1ebaa2 fix test project 2015-02-23 16:35:46 +08:00
Mazyad Alabduljaleel 839f1a851d One more memory leak fix:
When you get the allHeaderFields, the net retain count is 0, because it is autoreleased.
Then, a copy message is issued +1
After that the property itself retains it +1
Total = 2, released once in the dealloc -> leak.
2015-02-23 11:52:49 +04:00
Mazyad Alabduljaleel a2f9956d00 Fix major memory leaks in iOS http request
... and other small fixes

Brief:

1. In iOS, whenever you have a new spawned thread with its own run loop (i.e. while true), you must wrap it with an autorelease pool, so it cleans up the objects at the end of each loop cycle.
2. There were a few "alloc" and "new" objects that weren't released.
3. The HttpAsync class itself was missing dealloc, also property assignment should use `self.property` so the previous value gets released as appropriate.
4. Resolved a small warning

**NOTE**: I have a cocos2d-x game that heavily relies on the HTTP requests, with cookies, but without SSL, so I couldn't test the SSL.
I haven't tested the cookies and SSL yet, but for starters, these improvements are meant to fix the memory issues only, not the logic.
2015-02-23 10:38:33 +04:00
cpascal 8d9da362e5 changed indentation. 2015-02-23 11:55:27 +09:00
Ray fbe9e5b767 complate project file 2015-02-23 00:52:50 +08:00
Ray 35e3e8d62d Sprite3D Reader and tests 2015-02-23 00:34:30 +08:00
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
Ray 73e40f1c4b Node3DReader Test 2015-02-19 16:18:54 +08:00
Ray 2f01deee89 3D Editor Reader
Node3DReader
2015-02-19 12:08:09 +08:00
Jongryul Kook c05dd4357d Fixed HttpClient-ios request to work when the data is started by 0x00. 2015-02-18 16:51:12 +09:00
mannewalis 21dbc29ad1 adding CC_DEPRECATE(version) macro 2015-02-17 13:01:53 -08:00
Dale Stammen 0801160a37 added precompiled Particle3D shaders 2015-02-16 11:28:24 -08:00
Dale Stammen 76233d4c6e added missing Particle3D files and tests 2015-02-16 10:41:03 -08:00
Dale Stammen 795f65c85f added missing Particle3D files and tests 2015-02-16 10:01:09 -08:00
cpascal e7a39287f1 Fixed missing ui::EditBox functionalities on Win32
1. There was 100-byte input limit at ui::EditBoxImplWin::openKeyboard()
2. Implemented MaxLength as LengthFilter, not ByteFilter. (same as
Android's InputFilter - LengthFilter)
3. Users can input unicode characters that is not supported by CP_ACP.
2015-02-16 18:21:26 +09:00
CocosRobot 6a91450f7c [AUTO]: updating luabinding automatically 2015-02-15 11:53:55 +00:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge
add 3d particle (Particle Universe)
2015-02-15 19:48:18 +08:00
minggo d5e82521de Merge pull request #10359 from flamefox/3dattachnode
getAttachNode should failed when there is no bone with name
2015-02-15 19:03:52 +08:00
minggo dd7d8a61ef Merge pull request #8980 from fspadoni/v3
CCPhysicsWorld.cpp Remove cpArbiterIgnore call from collisionPreSolveCallback
2015-02-15 18:58:17 +08:00
samuele3hu 3a7cbe9d67 Add Particle3DTest for Lua and update related configure files 2015-02-15 15:56:20 +08:00
Vladimir Perminov 9f5efe5153 Fix visual studio project out of date
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
2015-02-13 11:18:14 +03:00
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
Justin Fraize 3667cc6e1f Cleaned up CCAction.cpp
*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
2015-02-12 21:00:12 -08:00
minggo 87e444873f Merge pull request #10268 from kompjoefriek/Fixing-warnings
Fixed some compiler warnings
2015-02-13 10:04:19 +08:00
yangxiao d4ace2a08c Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-02-13 09:49:07 +08:00
yangxiao 2789ad1393 remove unused code 2015-02-13 09:48:27 +08:00
kompjoefriek a2ef1abef3 Fixed unwanted changes 2015-02-12 23:07:24 +01:00
zhukaixy acc0476f01 Solve compile errors on win32 platform 2015-02-12 19:36:03 +08:00
Jeff Oh e33854f3eb apply custom request header for every request type (ios) 2015-02-12 20:07:19 +09:00
CocosRobot a643691795 [AUTO]: updating luabinding automatically 2015-02-12 10:47:08 +00:00
minggo afd4e94c4c Merge pull request #10160 from lite3/wildpointer
fix wild pointer
2015-02-12 18:01:10 +08:00
minggo 7fd6b5bfe7 Merge pull request #10172 from sergeant-wizard/make_tmx_object_group_name_getter_const
make CCTMXObjectGroup::getGroupName const
2015-02-12 18:00:49 +08:00
minggo 8716164a5d Merge pull request #10206 from sergeant-wizard/specify_default_capacity_for_sprite_batch_node
Specify default capacity for sprite batch node
2015-02-12 17:58:59 +08:00
minggo 3a4e9ced46 Merge pull request #10442 from Dhilan007/v3-accelerometer-fix
Fixed Accelerometer has lagged on iOS
2015-02-12 17:20:07 +08:00
yangxiao 58bfae2e57 adjust and remove unused code 2015-02-12 16:58:34 +08:00
minggo f44ea6468e Merge pull request #10461 from ntotani/fix-lua-framework-v3
fix SpriteEx
2015-02-12 16:17:46 +08:00
yangxiao 8f290b2d24 modify according to minggo 2015-02-12 16:09:08 +08:00
minggo 9d6f399584 Merge pull request #10467 from minggo/audio-issue
audio resume issue
2015-02-12 15:39:48 +08:00
Wenhai Lin eb7a7a9fb7 Fixed audio can't resume after the interruption of audio session has ended on iOS. 2015-02-12 15:38:44 +08:00
sawada_yasuharu cf8a7cd6da Changed the option to be passed to calculate bounding rect size for
strings.

As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
2015-02-12 15:30:46 +08:00
Naoyuki Totani 2b43c12b88 fix SpriteEx 2015-02-12 15:16:48 +09:00
lvlong ee03bb8eea setCameraMask for cocostudio-ui 2015-02-12 09:24:04 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
WenhaiLin 20ad425407 Fixed Accelerometer has lagged on iOS 2015-02-11 16:28:43 +08:00
lvlong 6304a89462 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-02-11 14:27:25 +08:00
KompjoeFriek 7f28230311 Fixed merge error 2015-02-10 21:37:18 +01:00
kompjoefriek 00edc542cb Merged with upstream/v3
Merged with upstream/v3 and resolved merge conflicts
2015-02-10 21:27:20 +01:00
minggo 1e11f3b3da Merge pull request #10310 from perminovVS/v3
Fix visual studio project out of date
2015-02-10 14:18:13 +08:00
Chad befbc0a14e FIX for Build error when CC_USE_CULLING=0 #10373
Fix for build error when using CC_USE_CULLING
2015-02-09 18:15:22 -08:00
Vladimir Timofeev 653bf1549d win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable. 2015-02-09 02:23:01 +03:00
yangxiao 2ac0b35283 fix render state 2015-02-06 10:09:23 +08:00
Nite Luo ee2781e6a6 Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core
Cmake build system fixes for MSVC (partial)
2015-02-04 23:18:08 -08:00
lvlong 6152925739 If parse the vertex attribute is fail, then discard the vertex attribute. 2015-02-04 16:19:30 +08:00
flamefox 4b405db77d fix tab to space 2015-02-04 10:36:16 +08:00
flamefox c2e17d6b1d getAttachNode should failed when there is no bone with name 2015-02-04 10:32:44 +08:00
XiaoYang c9fe5251a9 Merge pull request #229 from lvlonggame/v3
add Camera::project
2015-02-04 09:38:31 +08:00
yangxiao 19edeb971b fix warning 2015-02-03 17:51:16 +08:00
yangxiao 66da4e8096 mac work 2015-02-03 17:38:40 +08:00
byeonggee.seo 753335726a receive content data even though status code is not 2xx 2015-02-03 16:28:23 +09:00
lvlong a0c7723edb add GP_ASSERT 2015-02-03 14:21:12 +08:00
lvlong 6d92b7adc9 modify Camera::project 2015-02-03 11:59:43 +08:00
Nite Luo 6f53719772 Merge pull request #10317 from darkdukey/G17hao-patch-12
Improve group command
2015-02-02 14:12:50 -08:00
yangxiao 265e6fec1a fix index 2015-02-02 16:54:55 +08:00
yangxiao f608377bdb make vao work 2015-02-02 15:44:47 +08:00
byeonggee.seo 23e0320cac HttpResponse reference counting bug fixed 2015-02-02 12:23:15 +09:00
lvlonggame 23df00b0b9 Merge branch 'v3' of github.com:lvlonggame/cocos2d-x into v3 2015-02-01 21:17:12 +08:00
lvlonggame 4c65332550 add project function to camera 2015-02-01 21:14:37 +08:00
Nite Luo e9b4e4e19c Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:59 -08:00
Nite Luo 07cda0db37 Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:31 -08:00
samuele3hu fec0d9c41d Set default value for `Content-Type` of headfield in `PUT` method 2015-01-31 22:15:15 +08:00
samuele3hu 75dc45bfea Remove useless blank line 2015-01-31 15:21:03 +08:00
samuele3hu e6d50d7086 Fix the error that the binary data would be truncated 2015-01-31 14:31:24 +08:00
Vladimir Perminov bb2d2c9a07 Fix visual studio project out of date
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
2015-01-30 17:37:19 +03:00
zhukaixy 806a5011e5 solve the problems noted in comments 2015-01-30 17:23:30 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
minggo 8efbafd09e Merge pull request #10281 from Dhilan007/v3-win32-fix
Fixed compile error on win32
2015-01-29 19:48:29 +08:00
WenhaiLin 6873713c31 Fixed compile error on win32 2015-01-29 19:38:55 +08:00
minggo dff7d6f639 Merge pull request #10277 from super626/v3
fix bug on loading .mtl
2015-01-29 19:21:31 +08:00
zhukaixy f3536056d8 Simpilify skybox 2015-01-29 19:01:10 +08:00
byeonggee.seo fa683ec98b MotionStreak MoveTo/MoveBy action OK 2015-01-29 19:30:00 +09:00
huangshiwu cd00de572d add glBindBuffer for drawnode and clippingnode to avoid crash 2015-01-29 18:06:20 +08:00
tangziwen 89cff149fc add new ray intersection method ,add new Doc to explain the terrain 2015-01-29 18:06:00 +08:00
yangxiao 3eeeaf051f fix load mtl 2015-01-29 17:54:22 +08:00
kompjoefriek 89152b2856 Tabs to spaces
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
minggo 73e8026336 Merge pull request #10274 from darkdukey/forceDepthTest
Force depth test
2015-01-29 16:29:13 +08:00
Nite Luo f914297703 Fix force depth write logic 2015-01-28 23:55:26 -08:00
minggo 18a45e36eb Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 13:56:11 +08:00
Dale Stammen 652baed1ee increase build heap memory option to /Zm384 2015-01-28 20:37:39 -08:00
Dale Stammen be8075b29c increase build heap memory option to /Zm384 2015-01-28 20:32:32 -08:00
WenhaiLin 05db3bfd72 Fixed system font can't display the proper text when the text contains '&' on win32. 2015-01-29 11:55:49 +08:00
CocosRobot fcf0a2272f [AUTO]: updating luabinding automatically 2015-01-29 02:27:42 +00:00
minggo de3e9be2c5 Merge pull request #10265 from samuele3hu/v3_4_fi
Add AsyncLoadSprite3D test case and update the related lua binding
2015-01-29 10:16:49 +08:00
minggo 8b635fea1c Merge pull request #10250 from samuele3hu/v3_4_rc1
Fix the error that HttpClient-android didn’t set responseCode when connecting failed
2015-01-29 10:14:00 +08:00
minggo 2f04e7a6ac Merge pull request #10239 from super626/v3
fix bug on uniform cache
2015-01-29 10:13:11 +08:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
samuele3hu 0ec8510f00 Fix linux compile error 2015-01-29 09:19:57 +08:00
kompjoefriek 0c70660551 Fixed warnings
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
Nite Luo c0ff8d1177 Don't clear depth between queues 2015-01-28 15:28:14 -08:00
Nite Luo 94d5810efd Merge pull request #10254 from super626/fixbillboard
Tested locally fix the billboad testcase
2015-01-28 14:06:53 -08:00
samuele3hu 80c2e0c153 Add AsyncLoadSprite3D test case and update the related lua binding 2015-01-28 21:47:52 +08:00
andyque ac3d79a516 add constructor to AnimationInfo 2015-01-28 16:59:27 +08:00
minggo 34c132280e Merge pull request #10244 from geron-cn/fixProjectNodeLoader
Fix project node crash in simulator and add its test-cpp
2015-01-28 15:30:53 +08:00
Wenhai Lin 4a218ea3e2 Fixed game awaked by the clock on Android 2015-01-28 15:30:52 +08:00
minggo 757c4a6cdb Merge pull request #10253 from CocosRobot/update_lua_bindings_1422429538
[AUTO]: updating luabinding automatically
2015-01-28 15:24:52 +08:00
minggo 80cf4439f2 Merge pull request #10241 from Dhilan007/v3-scheduled-fix
Fixed may access wrong memory address in Scheduler::schedule
2015-01-28 15:22:40 +08:00
yangxiao fc1dbf49fb fix billboard 2015-01-28 15:21:57 +08:00
CocosRobot ba5b23d2a5 [AUTO]: updating luabinding automatically 2015-01-28 07:21:15 +00:00
minggo b233d6928e Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
2015-01-28 15:16:23 +08:00
minggo 2738745614 Merge pull request #10248 from dabingnn/v3_fixRenderer
V3 fix renderer
2015-01-28 15:15:08 +08:00
samuele3hu 93665c5c6d Fix the error that HttpClient didn’t setResponseCode when connecting failed 2015-01-28 13:49:19 +08:00
CocosRobot 78463a4a66 [AUTO]: updating luabinding automatically 2015-01-28 05:46:25 +00:00
minggo f54916cf69 Merge pull request #10247 from samuele3hu/v3_4_fi
Add more 3D test case and adjust some binding function
2015-01-28 13:41:34 +08:00
samuele3hu cd42806367 Fix the error of tolua_cocos2d_Mat4_decompose 2015-01-28 11:12:12 +08:00
Huabing.Xu c8a783e4ac use const auto& 2015-01-28 10:59:29 +08:00
samuele3hu 82a95bf2fc Modify some script files 2015-01-28 10:57:30 +08:00
Huabing.Xu 5f5c00b7d2 remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE 2015-01-28 10:32:22 +08:00
minggo 8d681dfe7d Merge pull request #10218 from andyque/fixIssue10183
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
2015-01-28 09:57:34 +08:00
samuele3hu 6208e9cba5 Add more test cases about 3D 2015-01-28 09:40:20 +08:00
Nite Luo be6ca1b6d2 add force depth write 2015-01-27 17:05:51 -08:00
Nite Luo c364323bbc Not using static value to save previous render state since other commands like custom command could change them 2015-01-27 16:26:31 -08:00
Nite Luo 8f539a0107 Make PositionZ independent from global Z 2015-01-27 15:41:58 -08:00
Nite Luo b89e255099 Finish organize the render queue 2015-01-27 14:41:16 -08:00
Nite Luo 78d8a694c8 Merge branch 'v3' into v3_fixRenderer
Conflicts:
	cocos/renderer/CCRenderer.cpp
	cocos/renderer/CCRenderer.h
2015-01-27 11:23:48 -08:00
Nite Luo 3c635d044e Add Queue_count for render queues 2015-01-27 11:12:51 -08:00
Nite Luo 2be140fccc Merge pull request #10225 from darkdukey/saveRenderState
save/restore render state
2015-01-27 11:12:05 -08:00
Nite Luo 75253d66ff Merge branch 'v3' into v3_fixRenderer 2015-01-27 10:56:28 -08:00
geron-cn df10a974fa fix projectnode 2015-01-27 23:19:27 +08:00
minggo f09626bcfb Merge pull request #10235 from pipu/modify_parse_ignoresize
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 18:44:01 +08:00
WenhaiLin d9bb6192dc Fixed may access wrong memory in Scheduler::schedule 2015-01-27 17:29:12 +08:00
Huabing.Xu cee1df2278 Merge branch 'v3' into v3_fixRenderer 2015-01-27 16:54:35 +08:00
yangxiao 220b34d105 Merge branch 'newcode' into v3 2015-01-27 16:35:54 +08:00
yangxiao fad8f9f1da format 2015-01-27 16:31:15 +08:00
yangxiao af8a6c16b1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-01-27 16:24:07 +08:00
Wenhai Lin f2335fb3bc Fixed Scale9Sprite can't run move/scale/rotation action in physics scene 2015-01-27 16:13:45 +08:00
lvlong 57970da398 Do some optimize 2015-01-27 15:50:05 +08:00
minggo 15bf919000 Merge pull request #10231 from geron-cn/fixanimationlistclone
FIX BUG:  animationinfos lost after actiontimeline clone
2015-01-27 15:24:25 +08:00
tangziwen 9ec366a130 update terrain test add new method to get normal 2015-01-27 15:18:59 +08:00
pipu ed1b7edce7 Modify that parse ignoreSize for TextAtlas, TextBMFont. 2015-01-27 15:09:48 +08:00
Huabing.Xu a38b210803 add depth in renderCommand
refactor rendering order of renderQueue
2015-01-27 14:29:09 +08:00
minggo 5a4fbf691b Merge pull request #10234 from CocosRobot/update_lua_bindings_1422338223
[AUTO]: updating luabinding automatically
2015-01-27 14:00:36 +08:00
CocosRobot 4792a44a87 [AUTO]: updating luabinding automatically 2015-01-27 05:58:53 +00:00
minggo 880abfe814 Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
Fix loading bar reload texture issue
2015-01-27 13:50:38 +08:00
minggo e1afb7c789 Merge pull request #10226 from andyque/removeDuplicateCode
remove unused code
2015-01-27 13:50:15 +08:00
minggo 2a94ede427 Merge pull request #10227 from cpascal/add_EditBox_getDescription
Added override of ui::EditBox::getDescription()
2015-01-27 13:49:55 +08:00
geron-cn 390c336a19 FIX animationfio lost after actiontimeline clone 2015-01-27 12:04:14 +08:00
andyque 7b81f3a811 remove unused code 2015-01-27 10:17:41 +08:00
cpascal d857164768 Added override of ui::EditBox::getDescription() 2015-01-27 11:10:04 +09:00
Nite Luo 15adaf2877 save/restore render state 2015-01-26 16:37:11 -08:00
geron-cn d3baae0304 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader 2015-01-26 21:21:31 +08:00
geron-cn a1a7273436 fix bug: fix crash when lack of projected file 2015-01-26 21:20:26 +08:00
lvlong bb419719aa fix bug: about caching uniform. 2015-01-26 18:40:00 +08:00
andyque 95e8072afa fixed issue #10183 2015-01-26 18:26:59 +08:00
minggo f54c6c93bb Merge pull request #10215 from andyque/fixIssue10210
don't release the scale9Image when updateSprites
2015-01-26 17:58:21 +08:00
andyque 732050d940 don't release the scale9Image when updateSprites 2015-01-26 16:04:43 +08:00
minggo 5dc09d8489 Merge pull request #10208 from pipu/modify_parse_TMXTiledMap
Checking whether tileset is valid during parses TMXTiledMap.
2015-01-26 15:52:18 +08:00
Vladimir Timofeev b6201f9328 cmake: try to fix lua-bindings for msvc 2015-01-26 10:09:49 +03:00
Vladimir Timofeev 991ea4532d cmake: fix using of external/xxhash for msvc generated project 2015-01-26 10:03:49 +03:00
andyque 0e67cfcbff improve loading Bar Test 2015-01-26 14:39:44 +08:00
minggo cba0e19252 Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield
Change the order of detach and attach of TextField::upadate
2015-01-26 14:00:58 +08:00
minggo 4ac50f2c26 Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
Fixed sets the page's base URL for WebView doesn't work.
2015-01-26 13:51:08 +08:00
andyque fdbf84a118 add uploading switch scale9 tests 2015-01-26 13:49:54 +08:00
minggo 988a2729d7 Merge pull request #10203 from Dhilan007/v3-bmf-performance
Improved the parsing performance of bitmap fonts
2015-01-26 13:46:04 +08:00
pipu 35c1e73b8f Checking whether tileset is valid during parses TMXTiledMap in GameMapReader. 2015-01-26 13:14:17 +08:00
Ryo Miyajima d1d4ec2ac6 fix grammar in comment 2015-01-26 10:56:43 +09:00
Ryo Miyajima 4985653f5b specify default capacity 2015-01-26 10:56:38 +09:00
minggo bc1b588062 Merge pull request #10202 from dabingnn/v3_fixCrashWithNoVAO
V3 fix crash with no vao
2015-01-26 09:48:25 +08:00
WenhaiLin 9afa871164 Improved the parsing performance of bitmap fonts 2015-01-24 16:23:30 +08:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
Huabing.Xu 285a280bb4 enable attribute cache as before 2015-01-23 18:19:25 +08:00
Huabing.Xu 030394bffe refactor the rendering and creation of DrawNode
make LayerColor rendering safer
2015-01-23 18:19:03 +08:00
tangziwen d6c3320d49 fix memory leak 2015-01-23 18:14:44 +08:00
tangziwen d04b3feb50 add new test, fix memory leak 2015-01-23 18:09:54 +08:00
minggo ebc75579a2 Merge pull request #9838 from htlxyz/v3_origin
modify trans lua value to fontdefinition error
2015-01-23 16:55:01 +08:00
minggo 0addc3fb1d Merge pull request #10173 from tmr111116/fix_random_int_overflow
fix random int overflow
2015-01-23 16:38:08 +08:00
minggo 516c6f1387 Merge pull request #10187 from joshuastray/fix-win32-editbox-clip
Fix win32 editbox content not clipped correctly
2015-01-23 16:16:00 +08:00
minggo 42b6fbd1c6 Merge pull request #9919 from edwardzhou/luaLoadChunksFromZIP_supports_folder_structured_lua
Lua load chunks from zip supports folder structured lua
2015-01-23 16:13:09 +08:00
Huabing.Xu 421310f3a8 Merge branch 'v3' into v3_fixCrashNoVAO
Conflicts:
	cocos/renderer/ccGLStateCache.cpp
2015-01-23 14:50:21 +08:00
Huabing.Xu 550fc44187 disbale cache for s_attributeFlags 2015-01-23 14:32:36 +08:00
Jialong Zhai b295c8e817 fix indentation 2015-01-23 14:13:36 +08:00
Jialong Zhai 7ef80e9dae Update UIEditBoxImpl-win32.cpp 2015-01-23 14:11:22 +08:00
minggo 44bcee60c7 Merge pull request #10182 from super626/v3
Fix bug on loading .obj's .mtl file
2015-01-23 12:02:00 +08:00
yangxiao e336a4c86c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-01-23 11:23:47 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
minggo 38b0d25bc5 Merge pull request #10175 from andyque/fixSliderProgressRender
fix slider scale9 render
2015-01-22 17:59:17 +08:00
minggo f9116f7c6d Merge pull request #10166 from pipu/parse_anchorpointframe
Modify bug that parses AnchorPointFrame.
2015-01-22 17:58:08 +08:00
lvlong 662117e878 mtlPath 2015-01-22 17:33:24 +08:00
lvlong c5f955466a fixbug: load obj file's material. 2015-01-22 17:28:35 +08:00
andyque 94e35d8d95 fix slider scale9 render 2015-01-22 15:53:33 +08:00
tmr111116 757bc03ba8 fix random int overflow
before:
```
random(2147483648, 2147483649): -2147483648
```

after:
```
random(2147483648, 2147483649): 2147483649
```

code:
```
int64_t min = int64_t(INT_MAX) + 1;
int64_t max = int64_t(INT_MAX) + 2;
auto rand = cocos2d::random(min, max);
CCLOG("random(%lld, %lld): %lld", min, max, rand);
```
2015-01-22 16:46:57 +09:00
Ryo Miyajima 75847bc383 make CCTMXObjectGroup::getGroupName const 2015-01-22 16:37:51 +09:00
CocosRobot ad9e5e21c3 [AUTO]: updating luabinding automatically 2015-01-22 06:08:11 +00:00
Huabing.Xu a505c0e6e6 Merge pull request #10165 from samuele3hu/v3_4_rc1
Update Lua LayoutComponent Test case of UIEditTest
2015-01-22 14:02:31 +08:00
pipu c0a662ff13 Modify bug that parses AnchorPointFrame. 2015-01-22 11:20:01 +08:00
samuele3hu d74fb0e8b5 Update LayoutComponent Test case of UIEditTest 2015-01-22 10:21:38 +08:00
minggo ece379bc64 Merge pull request #10162 from Dhilan007/v3-label-blockfix
Fixed label may become white/black block after resume from background on android
2015-01-22 09:48:10 +08:00
minggo 3eba023f2a Merge pull request #10059 from cpascal/v3
Fixed inconsistent time-scale in Httpclient.
2015-01-22 09:47:40 +08:00
Dale Stammen e5b54f8c47 updated precompiled shaders for wp8 2015-01-21 10:50:44 -08:00
Wenhai Lin 5076b9f008 Fixed crash 2015-01-21 22:46:31 +08:00
Wenhai Lin 342c582124 Fixed label may become white/black block after resume from background on android 2015-01-21 21:58:18 +08:00
lite3 0923a28e4d fix wild pointer 2015-01-21 21:01:57 +08:00
minggo a0091058f6 Merge pull request #10157 from dabingnn/v3_fixandroidCrashWithoutneon
only mathUtil.cpp compiles with neon
2015-01-21 20:23:20 +08:00
minggo 954f372775 Merge pull request #10156 from vovkasm/fix-warnings
Fix warnings
2015-01-21 20:23:00 +08:00
Huabing.Xu daa6d47b40 only mathUtil.cpp compiles with neon 2015-01-21 18:29:28 +08:00
Vladimir Timofeev 6e01cab380 Fix, thanks @minggo! 2015-01-21 13:19:43 +03:00
Vladimir Timofeev 610e24b453 Fix warning: CCLOG_STRING_TAG not used by enclosing it in platform ifdef. Provide empty SendLogToWindow implementation by default. 2015-01-21 13:07:21 +03:00
Vladimir Timofeev 4e25ffbc7f Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences. 2015-01-21 12:59:53 +03:00
CocosRobot 5e273da0ec [AUTO]: updating luabinding automatically 2015-01-21 09:33:26 +00:00
minggo 72fb059aeb Merge pull request #10144 from andyque/fixButtonPressActionIssue
fix button pressAction scale issue
2015-01-21 16:37:59 +08:00
WenhaiLin 5fd9ccfecb Fixed AudioEngine causes game 'freeze' on Android 2015-01-21 16:18:47 +08:00
minggo 86b1f4594a Merge pull request #10147 from geron-cn/fixProjectNodeLoader
ProjectNode's actiontimeline  should  jump to 0 frame when  after nest i...
2015-01-21 15:49:39 +08:00
geron-cn 2fc79e2da5 ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd 2015-01-21 15:21:23 +08:00
minggo 97f29adf84 Merge pull request #10138 from dabingnn/v3_fixcrashForTextureAtlas
fix crash for textureAtlas
2015-01-21 15:02:06 +08:00
andyque d58426db99 fix button pressAction scale issue 2015-01-21 14:54:37 +08:00
CocosRobot 4f7b6608c4 [AUTO]: updating luabinding automatically 2015-01-21 06:46:49 +00:00
minggo 26bdd8b532 Merge pull request #10140 from minggo/crash-fix
check if plist file exist
2015-01-21 14:41:44 +08:00
minggo 097d4f3266 check if plist file exist 2015-01-21 14:36:49 +08:00
Huabing.Xu 0ca47ab40f fix crash for textureAtlas 2015-01-21 14:14:53 +08:00
minggo 335f69d95d Merge pull request #10110 from super626/v3
Fix Animate3D speed bug and add parameter to Ray::intersects
2015-01-21 14:11:11 +08:00
minggo 607ae4c2ca Merge pull request #10136 from andyque/fixSliderProgressBarRender
fix progress bar render issue when switch scale9
2015-01-21 14:10:18 +08:00
CocosRobot b31b22491d [AUTO]: updating luabinding automatically 2015-01-21 05:44:30 +00:00
andyque 7f7506fb99 fix progress bar render issue when switch scale9 2015-01-21 13:41:40 +08:00
minggo 08d392dd5f Merge pull request #10132 from samuele3hu/v3_4_issue9537
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
2015-01-21 13:39:29 +08:00
samuele3hu 205ead5b63 Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h 2015-01-21 11:48:34 +08:00
minggo 342d12201b Merge pull request #10131 from CocosRobot/update_lua_bindings_1421809643
[AUTO]: updating luabinding automatically
2015-01-21 11:12:42 +08:00
CocosRobot 8f099c7f0d [AUTO]: updating luabinding automatically 2015-01-21 03:09:35 +00:00
minggo fde86c7fd2 Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix
Fixed the alpha channel of text color of system font not take effect
2015-01-21 11:09:27 +08:00
minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537
issue #10107: Binding AnimationInfo to lua
2015-01-21 11:02:11 +08:00
minggo dca1edccd7 Merge pull request #10113 from liamcindy/Scale9Error
update for ui object scale9 state refresh
2015-01-21 10:51:55 +08:00
minggo 9f24b9a350 Merge pull request #10090 from Dhilan007/v3-issue10089
Fixed lose the precision of label's dimensions
2015-01-21 10:51:27 +08:00
minggo 372b11422d Merge pull request #10115 from dabingnn/FixCrashOnWin32
Fix crash on win32
2015-01-21 10:34:22 +08:00
minggo 0d95e6595a Merge pull request #10124 from CocosRobot/update_lua_bindings_1421806130
[AUTO]: updating luabinding automatically
2015-01-21 10:13:05 +08:00
CocosRobot 2f75d56c9b [AUTO]: updating luabinding automatically 2015-01-21 02:10:47 +00:00
samuele3hu 666af29681 issue #10107: Binding AnimationInfo to lua 2015-01-21 10:06:48 +08:00
minggo 5f37ba8096 Merge pull request #10095 from super626/fixnode
fix anchor point bug
2015-01-21 09:58:00 +08:00
minggo e8b6705d29 Merge pull request #10071 from liamcindy/Text_2.4
fix uitext size error
2015-01-21 09:40:34 +08:00
minggo f65e2690f3 Merge pull request #10122 from CocosRobot/update_lua_bindings_1421804049
[AUTO]: updating luabinding automatically
2015-01-21 09:37:28 +08:00
minggo eb2ca9eef5 Merge pull request #10069 from liamcindy/Button_2.4
add function for ui button
2015-01-21 09:36:35 +08:00
CocosRobot dae3e365ed [AUTO]: updating luabinding automatically 2015-01-21 01:36:21 +00:00
minggo 6870692cfe Merge pull request #10072 from liamcindy/TextBMFont
BMFont need to refresh size by refresh the string
2015-01-21 09:32:54 +08:00
minggo 38fbe91a5f Merge pull request #10097 from doomsdayer/v3_version_1
Flatbuffer generation updated
2015-01-21 09:25:11 +08:00
minggo b61a28633e Merge pull request #10102 from andyque/addListViewReuseCell
Refactoring bad coding style
2015-01-21 09:24:56 +08:00
Liam 902fba0638 fix slider and loadingbar scale9 error 2015-01-20 20:57:54 +08:00
G17hao 29c4f83fd8 Update CCGroupCommand.cpp
add a vector container for save unused id.
traversal unordered_map is too slow, use vector to replace it
2015-01-20 19:28:30 +08:00
G17hao ff1731eded Update CCGroupCommand.h
add a vector container for save unused id.
traversal unordered_map is too slow, use vector to replace it
2015-01-20 19:27:01 +08:00
Liam a72e65b4de add function for uiText and uiTextField 2015-01-20 18:40:25 +08:00
Huabing.Xu 65b6500491 Merge branch 'v3' into FixCrashOnWin32
Conflicts:
	cocos/2d/CCDrawNode.cpp
	cocos/renderer/ccShaders.cpp
2015-01-20 18:09:11 +08:00
Wenhai Lin b20d59c596 Fixed the alpha channel of text color of system font not take effect[android] 2015-01-20 17:34:13 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
Huabing.Xu 79eee9b145 fix crash on windows 2015-01-20 16:50:51 +08:00
CocosRobot 9a15610983 [AUTO]: updating luabinding automatically 2015-01-20 08:17:36 +00:00
minggo 4ff7a95d5a Merge pull request #10106 from samuele3hu/v3_4_issue9537
issue #9537:Make parameters more sense
2015-01-20 16:11:08 +08:00
minggo 151146deff Merge pull request #10103 from damorton/v3
Update CCRef.cpp
2015-01-20 16:09:35 +08:00
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +08:00
yangxiao 0df14763a4 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-01-20 15:48:43 +08:00
samuele3hu d4db54dc64 issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CocosRobot 37dcdacc7f [AUTO]: updating luabinding automatically 2015-01-20 07:38:26 +00:00
David 1e3ee08561 Update CCRef.cpp
Updated the comment explaining the Ref::retain and Ref::release functions for readability.
2015-01-20 07:32:18 +00:00
minggo 6ebe1169f6 Merge pull request #10066 from samuele3hu/v3_4_rc1_check
Add macro judgement for CC_PLATFORM_MAC
2015-01-20 15:32:05 +08:00
andyque 9a43706db8 refactor variable names of ui::Scale9Sprite 2015-01-20 15:29:25 +08:00
minggo 7dee9d2356 Merge pull request #10074 from liamcindy/LayoutComponent_2.4
update for lay out component
2015-01-20 15:12:49 +08:00
andyque 38906dce45 refactor for scale9Sprite 2015-01-20 15:10:03 +08:00
yusheng.lu f274277367 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1 2015-01-20 14:35:15 +08:00
andyque 1fb30c61f7 clean up coding style 2015-01-20 14:24:10 +08:00
andyque 221e7a4310 refactor remedyLayoutParamter function 2015-01-20 14:24:10 +08:00
Liam 81f3995cc1 update uiTextBMFont setString 2015-01-20 14:20:20 +08:00
yangxiao 2a2330438c fix anchor point bug 2015-01-20 14:10:11 +08:00
Liam 118b74e95c update uiTextBMFont setFontFile 2015-01-20 13:55:39 +08:00
minggo bad526e8de Merge pull request #10064 from pipu/fix_memory_leak
Fix memory leak
2015-01-20 13:48:35 +08:00
WenhaiLin f2c6a48976 Fixed lose the precision of label's dimensions 2015-01-20 11:46:43 +08:00
minggo a3046730d7 Merge pull request #10073 from liamcindy/Widget_2.4
the ui widget need to refresh size by ignore state
2015-01-20 11:23:23 +08:00
lvlong 7934d36e24 modify function description. 2015-01-20 10:46:00 +08:00
minggo a05fc8bc8e Merge pull request #10070 from liamcindy/Imageview_2.4
fix imageview render error
2015-01-20 10:41:17 +08:00
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
Dale Stammen 56d8e62409 added support for device orienation change. Fixed gravity for winrt landscape flipped 2015-01-19 09:38:49 -08:00
pipu ea84ae78dc Invoke FileUtils::getInstance()->getStringFromFile() instead of FileUtils::getInstance()->getFileData(). 2015-01-19 17:16:26 +08:00
Liam 3b0ba72b01 update for lay out component 2015-01-19 17:11:04 +08:00
Liam 62020483fc the ui widget need to refresh size by ignore state 2015-01-19 17:09:15 +08:00
Liam d38b802780 BMFont need to refresh size by refresh the string 2015-01-19 17:07:15 +08:00
Liam e8fa6597df fix uitext size error 2015-01-19 17:02:28 +08:00
Liam 987bfd4831 fix imageview render error 2015-01-19 17:00:53 +08:00
Liam 90df276067 add function for ui button 2015-01-19 16:58:46 +08:00
yusheng.lu 5dc87f49b0 Moved the version pair to 1st position of its map. 2015-01-19 14:42:43 +08:00
samuele3hu cc732743da Add macro judgement for CC_PLATFORM_MAC 2015-01-19 13:58:03 +08:00
pipu 103fecf3ef Fixes memory leaks of using FileUtils::getInstance()->getFileData() in FlatBuffersSerialize.cpp. 2015-01-19 11:45:20 +08:00
cpascal 281d231a5d Fixed inconsistent time-scale in Httpclient. 2015-01-19 10:50:42 +09:00
Huabing.Xu d1c0c0eeb6 [ci skip] update version 2015-01-19 09:50:19 +08:00
htl 5a87908344 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-19 09:38:34 +08:00
Dale Stammen 7b6b02d338 catch exception for older winrt tablets not supporting accelerometer report interval 2015-01-16 15:36:16 -08:00
Dale Stammen 86567afa5f added kShaderType_PositionColor_noMVP_GrayScale for WP8 to support UIScale9Sprite 2015-01-16 15:02:05 -08:00
Dale Stammen 5988cb520d added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite" 2015-01-16 14:59:08 -08:00
Dale Stammen 7b3154a7ee updated precompiled shaders for WP8 2015-01-16 11:19:32 -08:00
Dale Stammen 2c6ec3eebe added ccShader_PositionColorPointsize-no-gl_PointSize.vert for WP8.1 2015-01-16 11:19:00 -08:00
andyque fcfcb4fd71 fix websocket dead lock 2015-01-16 18:43:57 +08:00
minggo b556f970b0 Merge pull request #10043 from dualface/v3-origin
fix ResolutionPolicy support
2015-01-16 18:09:40 +08:00
dualface d39b1b7e58 fix ResolutionPolicy support 2015-01-16 18:04:13 +08:00
HoneyCat 41f53d6607 added checkfilename in win32 FileUtils
make win32 check filename case like linux
2015-01-16 17:24:54 +08:00
Huabing.Xu 19bb6a0c68 fix opengl 502 by using glGetBooleanv 2015-01-16 15:21:23 +08:00
WenhaiLin 05e25601fc Fixed fail to query the shapes which add to PhysicsWorld in the current frame 2015-01-16 14:22:16 +08:00
lvlong fc0c4bae7a modify by colleague for cocostudio. 2015-01-16 13:23:03 +08:00
minggo 9db2e54dc3 Merge pull request #10036 from samuele3hu/v3_4_rc1
Update the luaval_to_int32 conversional function to get correct value
2015-01-16 10:41:46 +08:00
minggo 53cfd8229b Merge pull request #10029 from Dhilan007/v3-34rc0
[ci skip]Fixed log level within the CocosPlayClient
2015-01-16 10:27:10 +08:00
htl 4069808d20 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-16 10:25:44 +08:00
samuele3hu 4601331dee Update the luaval_to_int32 conversional function to get correct value 2015-01-16 09:50:22 +08:00
Nite Luo d43a8cf9ca Move setDepthTest to renderer 2015-01-15 16:54:27 -08:00
Nite Luo 9848a8133b Fix Vertex Z issue 2015-01-15 16:41:07 -08:00
Nite Luo 9d7604cab7 undeprecate init for custom command 2015-01-15 15:56:44 -08:00
Nite Luo 0bddeb88c8 Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
minggo 8f8194fbc8 Merge pull request #10026 from andyque/fixWidgetNavigationNullptr
fix crash when navigation controller is null
2015-01-15 18:27:56 +08:00
WenhaiLin 6a2ac7aaf8 [ci skip]Fixed log level within the CocosPlayClient 2015-01-15 18:21:03 +08:00
htl ecbef0c45c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-15 16:14:52 +08:00
tangziwen 130c18bde0 fix LOD indices capacity,refactor the code ,add some comments 2015-01-15 15:54:12 +08:00
andyque 3f99f3d454 fix crash when navigation controller is null 2015-01-15 15:18:14 +08:00
minggo 473f04624a Merge pull request #10019 from huangshiwu/drawnodeinit
fix DrawNode init error
2015-01-15 13:33:58 +08:00
dualface 3edd78d6c3 add SHOW_ALL support for Lua framework 2015-01-15 12:01:27 +08:00
huangshiwu 65e97450d0 fix DrawNode init error 2015-01-15 11:51:21 +08:00
tangziwen 804739b38a add cmake 2015-01-15 11:45:51 +08:00
tangziwen 201ae6f321 add terrain 2015-01-15 11:45:06 +08:00
lvlong 6d7b530ea1 fix bug: add animate3D to sequence problem. 2015-01-15 11:32:28 +08:00
WenhaiLin 13b049a543 Fixed warns:truncation from double to float 2015-01-15 10:07:23 +08:00
minggo 1fa0fb584b Merge pull request #10004 from MSOpenTech/wp8-fix
WP8/WinRT fixes
2015-01-15 09:33:38 +08:00
Nite Luo 15660926d9 Fix Sprite3D not cascading 3D flag 2015-01-14 16:23:35 -08:00
Dale Stammen ef816a1bb9 fixed handling of default font 2015-01-14 11:10:58 -08:00
Dale Stammen 32c14710e7 allow custom shaders for WinRT Universal App 2015-01-14 10:37:04 -08:00
CocosRobot 97aee8cef0 [AUTO]: updating luabinding automatically 2015-01-14 09:19:31 +00:00
minggo ec54e042ea Merge pull request #9993 from zawasp/tintto_color3b
add Color3B type parameter to TintTo::create
2015-01-14 17:14:58 +08:00
minggo 825f90564c Merge pull request #9992 from samuele3hu/v3_4_issue9986
issue #9986:Add lua bindings for Component and related test cases
2015-01-14 17:05:51 +08:00
Mircea Rila 2a235f5b8d add Color3B type parameter to TintTo::create 2015-01-14 11:04:23 +02:00
Wenhai Lin b61adcfdbb Fixed can't get correct position of PhysicsBody after add PhysicsBody to PhysicsWorld in the current frame. 2015-01-14 17:01:04 +08:00
samuele3hu 77912270f9 issue #9986:Add lua bindings for Component and related test cases 2015-01-14 16:58:35 +08:00
CocosRobot e69497c7c0 [AUTO]: updating luabinding automatically 2015-01-14 08:26:14 +00:00
minggo 1641c92721 Merge pull request #9983 from samuele3hu/v3_4_issue9820
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
2015-01-14 16:11:43 +08:00
minggo 5154b844bb Merge pull request #9985 from super626/frustum
enable disable culling using macro
2015-01-14 16:11:28 +08:00
minggo 1e2029598d Merge pull request #9936 from Dhilan007/v3-cocosplay
Integrate CocosPlayClient
2015-01-14 16:10:20 +08:00
WenhaiLin 553cf58312 Remove FileUtilsAndroid::purgeCachedEntries 2015-01-14 16:05:33 +08:00
minggo d57ba984be Merge pull request #9979 from geron-cn/inneractionframe
inneractionframe rename variables
2015-01-14 15:15:51 +08:00
samuele3hu c026aa82f9 Add CC_DEPRECATED_ATTRIBUTE flag 2015-01-14 15:09:37 +08:00
yangxiao 42c40d895f enable disable culling using macro 2015-01-14 14:41:10 +08:00
Huabing.Xu 6850c7497b Merge pull request #9981 from huangshiwu/v3_ioshttp
fix HttpAsynConnection method didReciveResponse's process error
2015-01-14 14:07:31 +08:00
huangshiwu 12212dc572 fix HttpAsynConnection method didReciveResponse's process error 2015-01-14 14:01:58 +08:00
samuele3hu 951324a230 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820
Conflicts:
	cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
2015-01-14 13:58:12 +08:00
samuele3hu 1d94ae4302 issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes 2015-01-14 13:51:09 +08:00
geron-cn ab2b86b392 rename variables 2015-01-14 13:02:30 +08:00
Huabing.Xu 34582ba268 Merge branch 'v3' into v3_AddOptionsForCulling
Conflicts:
	cocos/2d/CCLabel.cpp
2015-01-14 12:44:24 +08:00
CocosRobot b134f74db4 [AUTO]: updating luabinding automatically 2015-01-14 03:43:27 +00:00
minggo 5459149279 Merge pull request #9969 from huangshiwu/pointSize
DrawNode enable draw different size points
2015-01-14 11:38:31 +08:00
Huabing.Xu 610d31d601 adjust CC_USE_CULLING macro definition 2015-01-14 11:29:02 +08:00
huangshiwu 9fd000895c modify file copyright information 2015-01-14 11:20:33 +08:00
minggo d73b5f45ec Merge pull request #9971 from pipu/parse_particlesystemquad
Modify that parses position type of ParticleSystemQuad.
2015-01-14 11:09:19 +08:00
minggo 0207c22cb6 Merge pull request #9953 from darkdukey/renderFix
Render fix
2015-01-14 11:06:33 +08:00
minggo d320941ca1 Merge pull request #9963 from Dhilan007/v3-issue9898-fix
Fixed crash if dispatch event after remove event listener in callback
2015-01-14 10:59:42 +08:00
Huabing.Xu f3d8798d39 add macro to enable to disable culling 2015-01-14 10:56:51 +08:00
lvlong 9abc5b7e82 fix bug: sequence action speed 2015-01-14 10:40:47 +08:00
pipu e31fe9565a Modify that parses position type of ParticleSystemQuad. 2015-01-14 10:24:44 +08:00
Nite Luo 4335328e3d Add support for creating empty sprite3D 2015-01-13 16:41:24 -08:00
Dale Stammen 5a4c6d75d8 clean up CC_USE_WEBP disabled for WP8 and WINRT 2015-01-13 14:37:22 -08:00
huangshiwu f4ac7c4e44 modify WP8 project and update precompileshader 2015-01-14 02:15:04 +08:00
huangshiwu fea492ab4f DrawNode enable draw different size points 2015-01-13 22:30:50 +08:00
WenhaiLin de645a7c9c Fixed crash if dispatch event after remove event listener in callback 2015-01-13 18:35:32 +08:00
Wenhai Lin 58c45ca144 Integrate CocosPlayClient 2015-01-13 17:30:07 +08:00
minggo 78e6d2f7ab Merge pull request #9951 from pipu/update_inneractionframe
Update InnerActionFrame
2015-01-13 17:10:39 +08:00
minggo 0709d9f2e9 [ci skip]update version 2015-01-13 16:35:45 +08:00
minggo e9dbe4adc6 [ci skip]update version 2015-01-13 16:34:59 +08:00
Nite Luo 45562f3203 optimize based on review commends 2015-01-12 22:52:20 -08:00
minggo bb742c30ad Merge pull request #9950 from dabingnn/v3_perf
cache director pointer to improve rendering performance
2015-01-13 14:31:03 +08:00
minggo 1bb4c12b1d Merge pull request #9948 from samuele3hu/v3_4_fix_bug
issue #9886: fix the number conversion error when passing 0x80000000
2015-01-13 14:11:49 +08:00
Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix
Conflicts:
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
2015-01-12 20:43:55 -08:00
Nite Luo a84f521e64 Clean up the debug functions in Billboard 2015-01-12 20:17:00 -08:00
Nite Luo 8591609128 Implement 3D drawing support for Sprite, Label, Particle, BatchNode 2015-01-12 20:06:50 -08:00
pipu a20cc2b151 Modify that parses plist for cocostudio editor simulator. 2015-01-13 11:12:28 +08:00
pipu 532269c44e fix bug: cut inner timeline action as outer timeline action's length 2015-01-13 11:07:06 +08:00
Huabing.Xu af9e49b28d cache director pointer to improve rendering performance 2015-01-13 10:28:25 +08:00
Nite Luo fee8bc1b28 Remove Transparent Queue, Move transform calculation of Billboard to visit 2015-01-12 18:17:47 -08:00
samuele3hu 203d20161c issue #9886: fix the number conversion error when passing 0x80000000 2015-01-13 10:02:09 +08:00
minggo eb74647210 Merge pull request #9933 from SunLightJuly/support_func_call_chain
Support func call chain
2015-01-13 09:35:12 +08:00
SunLightJuly 4d2a425450 fixed typo 2015-01-13 01:02:04 +08:00
minggo 7f5f3a2fd9 Merge pull request #9945 from jianglong0156/v3
issue cocos2d/cocos2d-js #2563 : cccomrender  constructor
2015-01-12 21:13:01 +08:00
jianglong0156 5d781d7eb4 issue cocos2d/cocos2d-js #2563 : cccomrender need to use its constructor in jsb code. So i modify the constructor to public 2015-01-12 20:49:43 +08:00
CocosRobot 93d1d9c940 [AUTO]: updating luabinding automatically 2015-01-12 12:08:54 +00:00
Huabing.Xu ae5530c29a Merge pull request #9915 from AknEp/v3
FileUtils::fullPathForFilename should return "" if resource is not found.
2015-01-12 20:01:56 +08:00
minggo 12539c24be Merge pull request #9937 from pipu/serialize_parse_inneractionframe_alphaframe
Serialize parse inneractionframe alphaframe
2015-01-12 20:01:45 +08:00
minggo 74e9fc6382 Merge pull request #9932 from dabingnn/v3_addParamForVertexIndexBufferUsage
add param for usage in class VertexBuffer and IndexBuffer
2015-01-12 19:33:18 +08:00
minggo 731e6b179d Merge pull request #9931 from dabingnn/v3_fixGL_Invalid_value
refresh attributes and uniforms in glprogramstate
2015-01-12 19:33:04 +08:00
pipu aaccdef1eb Modify cocos/editor-support/cocostudio/CMakeLists.txt. 2015-01-12 19:14:04 +08:00
pipu c7a923b658 Update method clone() for InnerActionFrame. 2015-01-12 17:59:30 +08:00
pipu d9adda89c2 Update cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp 2015-01-12 16:51:50 +08:00
SunLightJuly 3a64d723de modified lua_cocos2dx_Node_setRotationQuat() to to support chain call 2015-01-12 15:21:21 +08:00
SunLightJuly a902df93c6 modified the manual binding files to support functions call chain 2015-01-12 15:12:01 +08:00
Huabing.Xu 2b79ff1d87 add param for usage in class VertexBuffer and IndexBuffer 2015-01-12 14:59:12 +08:00
Huabing.Xu d5416d8a7a refresh attributes and uniforms in glprogramstate 2015-01-12 14:43:31 +08:00
pipu d364a329db Merge branch 'v3' into parse_inneractionframe 2015-01-12 14:26:05 +08:00
Nite Luo 7741daf091 Billboard Render correctly 2015-01-11 22:20:41 -08:00
pipu 7e83336af8 Update InnerActionFrame. 2015-01-12 13:54:17 +08:00
pipu 34402b75c9 Merge branch 'v3' into parse_inneractionframe 2015-01-12 13:38:30 +08:00
minggo 4f4d49ef79 Merge pull request #9929 from jianglong0156/v3
issue cocos2d/cocos2d-js #2563 : ActionTimelineData constructor
2015-01-12 13:38:00 +08:00
minggo 2bad7ac8d5 Merge pull request #9921 from super626/camera
Do not show the objects visible by camera when the camera is invisible
2015-01-12 11:57:49 +08:00
jianglong0156 4cc0dd129a issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public 2015-01-12 11:57:03 +08:00
minggo fe63a1a46c [ci skip]update version 2015-01-12 11:31:09 +08:00
pipu 6237115fbf Fixes bug that clone InnerActionFrame. 2015-01-12 11:09:19 +08:00
pipu 78b32332d3 Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number. 2015-01-12 10:55:15 +08:00
Jialong Zhai 6f99e161f8 Change the order of detach and attach of TextField::upadate 2015-01-12 10:18:55 +08:00
yangxiao 6d297d377b camera visible check 2015-01-12 10:08:55 +08:00
htl ae77d6fef1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-12 09:59:23 +08:00
Edward Zhou c2929a30d5 fix compile error 2015-01-11 23:01:13 +08:00
Edward Zhou 5bd9e7f1a7 support to loading folder structured lua(a.k.a normal zip file) for luaLoadChunksFromZIP 2015-01-11 22:57:14 +08:00
Satoshi SUZUKI b0d1dd2435 FileUtils::fullPathForFilename should return "" if resource is not found.
I Think this method should return empty string when the resource is not found.
Because, I cannot check if the file found or not with current implementation.
2015-01-10 19:30:42 +09:00
Nite Luo 6dfc021c02 Merge renderqueue to one 2015-01-09 14:06:21 -08:00
minggo a6e6dc2605 Merge pull request #9906 from Dhilan007/v3-video-android-fix
Fixed VideoPlayer can't play when passing the full path of video resource
2015-01-09 19:24:17 +08:00
WenhaiLin 57cd4cd3c6 Fixed VideoPlayer can't play when passing the full path of video resource 2015-01-09 19:14:19 +08:00
minggo c1b958c540 Merge pull request #9904 from Dhilan007/v3-systemfont-android-fix
Fixed dead loop when the width of label[system font] smaller then one word of the string on android
2015-01-09 19:07:24 +08:00
WenhaiLin d92a525bfa Fixed dead loop when width of label[system font] smaller then one word of the string on android 2015-01-09 16:52:40 +08:00
minggo a0aa5e716e Merge pull request #9489 from newnon/v3_clang_static_analyzer_fix
Clang static analyzer crash fix
2015-01-09 15:32:46 +08:00
minggo 465bf48442 Merge pull request #9879 from suzukaze/fix-indents
Replace tabs with spaces in cocos/2d dir
2015-01-09 14:59:27 +08:00
minggo 4818c7bbd1 Merge pull request #9889 from 2youyouo2/v3
fixed event frame will go twice loop when goto frame
2015-01-09 14:35:45 +08:00
youyou 1d7a4a5c05 fixed event frame will go twice loop when goto frame 2015-01-09 10:24:38 +08:00
htl 0cf63712e9 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-09 10:02:45 +08:00
Takao Kato ba0beaffdc fixed getParentToNodeTransform. it returned a wrong transform if _transformDirty was true. 2015-01-09 09:58:09 +08:00
minggo 3ebf8ef22b Merge pull request #9885 from Dhilan007/v3-physics-fix-scale-rotation
Fixed can't update scale and rotation of static body
2015-01-09 09:45:04 +08:00
WenhaiLin c9a8dfb6ee Fixed can't update scale and rotation of static body 2015-01-09 09:37:55 +08:00
Nite Luo e7480a7efb Enable tansparent queue and create camera rotation demo 2015-01-08 16:30:00 -08:00
yinjimmy bdac739541 Fix: executeScriptFile can not load .luac file when .lua is not exist 2015-01-09 04:18:41 +08:00
Jun Hiroe e4d560b658 Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CocosRobot 6b67f55ab5 [AUTO]: updating luabinding automatically 2015-01-08 06:32:36 +00:00
Huabing.Xu 5f8d69d447 Merge pull request #9862 from Dhilan007/v3-physics-performance2
[Physics]Reduce temporary object creation and save mathematical labor
2015-01-08 14:27:52 +08:00
Wenhai Lin 61438f7297 [Physics]Reduce temporary object creation and save mathematical labor 2015-01-08 14:25:06 +08:00
CocosRobot 822c38b129 [AUTO]: updating luabinding automatically 2015-01-08 02:40:40 +00:00
Huabing.Xu 2b71c57b52 Merge pull request #9840 from Dhilan007/v3-physics-performance
Improve performance of Physics
2015-01-08 10:33:51 +08:00
Huabing.Xu b5f8666caf Merge pull request #9855 from huangshiwu/v3_XmlHttpRequest
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 10:28:34 +08:00
htl 240b43891a Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-08 10:20:56 +08:00
huangshiwu 108e4d2b41 Add comments and improve code readability for HttpAsynConnection.m 2015-01-08 10:12:45 +08:00
minggo 1b612fd97a Merge pull request #9842 from andyque/improveTextPerformance
improve ui::Text and ui::TextField creation performance
2015-01-08 09:31:49 +08:00
minggo f0aaacae5d Merge pull request #9853 from suzukaze/fix-indents
Replace tab with spaces.
2015-01-08 09:29:05 +08:00
Huabing.Xu 0f0e54a00b Merge pull request #9839 from yinjimmy/bugfix_executeScriptFile
Compatibility code for executeScriptFile
2015-01-08 09:26:47 +08:00
yinjimmy 70e0874add Compatibility code for executeScriptFile 2015-01-08 09:01:39 +08:00
Nite Luo b675a2ca61 Turn off Depth Write by default, only 3D opaque object will write to Depth buffer 2015-01-07 16:35:08 -08:00
huangshiwu be02233815 Fix XmlHttpRequestTest parsing error of response header on iOS platform 2015-01-08 00:23:27 +08:00
Jun Hiroe ca86bce60d Replace tab with spaces 2015-01-07 23:46:28 +09:00
CocosRobot 9253ae99bc [AUTO]: updating luabinding automatically 2015-01-07 09:50:54 +00:00
Huabing.Xu b5859114b7 Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-07 17:45:43 +08:00
minggo a76d4e76da Merge pull request #9832 from super626/v3
Fix warning log when loading sphere.c3b
2015-01-07 17:28:07 +08:00
minggo c229ee0060 Merge pull request #9831 from CocosRobot/update_lua_bindings_1420600634
[AUTO]: updating luabinding automatically
2015-01-07 17:24:14 +08:00
minggo 4c7377480b Merge pull request #9837 from minggo/memory-leak
fix memory leak
2015-01-07 17:23:28 +08:00
andyque 0f49bb977d improve ui::Text and ui::TextField creation performance 2015-01-07 17:21:41 +08:00
Wenhai Lin 8524a5fb97 Improve performance of physics 2015-01-07 17:08:04 +08:00
htl 66dd8bb449 modify float convert to unsigned int 2015-01-07 16:03:46 +08:00
yinjimmy 7d430742f1 Merge branch 'bugfix_executeScriptFile' into combine 2015-01-07 15:33:15 +08:00
yinjimmy cbf9741dfd Compatibility code for executeScriptFile 2015-01-07 15:23:58 +08:00
htl 3d2aa30aa7 modify trans lua value to fontdefinition error 2015-01-07 15:18:56 +08:00
minggo 1dcdd81fc4 fix memory leak 2015-01-07 15:02:27 +08:00
minggo f69f2359c8 Merge pull request #9833 from htlxyz/v3_origin
V3 origin
2015-01-07 14:47:11 +08:00
Huabing.Xu 27d4c6a0f6 Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug
DrawNode override drawPoints function to set pointSize, fix draw points ...
2015-01-07 14:46:13 +08:00
htl 194fa09f30 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-07 14:14:52 +08:00
htl e1fd472df1 modify texture format name 2015-01-07 14:11:48 +08:00
huangshiwu f41f00fcb2 make rotated rect draw correctly 2015-01-07 11:44:16 +08:00
CocosRobot 54c75337c5 [AUTO]: updating luabinding automatically 2015-01-07 03:19:27 +00:00
minggo fbf565fd59 Merge pull request #9798 from samuele3hu/v3_4_packagesize
issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
2015-01-07 11:14:22 +08:00
lvlong f9b0c9bc92 fix bug. 2015-01-07 11:09:09 +08:00
minggo f60cbef0da Merge pull request #9811 from dabingnn/v3_refactorEGLConfigChooserJavaCode
move class cocos2dEGLConfigChooser to Cocos2dxActivity
2015-01-07 11:05:36 +08:00
huangshiwu ac7ddad4ac DrawNode override drawPoints function to set pointsize, fix draw points use last color bug and drawRect behavior bug 2015-01-07 11:02:31 +08:00
CocosRobot f83daed2cf [AUTO]: updating luabinding automatically 2015-01-07 02:27:01 +00:00
minggo 4b0a35d772 Merge pull request #9813 from Dhilan007/v3-physics-remove-infoclass
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
2015-01-07 10:21:54 +08:00
Sergey babbac4e38 comments 2015-01-06 14:45:10 +03:00
Huabing.Xu 339a8b1abc class rename for EGLConfigChooser 2015-01-06 16:18:01 +08:00
minggo 5b0925d42d Merge pull request #9802 from dabingnn/v3_fixGLProgramLogCrash
fix delete wild opengl buffers
2015-01-06 15:13:49 +08:00
WenhaiLin 2847a940ed Update project 2015-01-06 14:40:15 +08:00
WenhaiLin fdaa0bbfc6 Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics 2015-01-06 14:40:14 +08:00
minggo 31819bafc3 Merge pull request #9769 from ton1517/fix/jumpto
fix problem : JumpTo position is changed each repeat.
2015-01-06 14:09:54 +08:00
minggo c8387dd2a8 Merge pull request #9780 from Dhilan007/v3-physics-gravity
Fixed physics body not still after disable gravitational force by PhysicsBody::setGravityEnable.
2015-01-06 13:59:31 +08:00
Huabing.Xu 1180f7a41e move class cocos2dEGLConfigChooser to Cocos2dxActivity 2015-01-06 12:44:29 +08:00
WenhaiLin f620038c59 Add miss file for win32 project 2015-01-06 10:55:26 +08:00
minggo b88b9ea994 Merge pull request #9777 from ffskyfan/v3
fix the problem that engine can't get data from file on windows
2015-01-06 10:21:36 +08:00
Huabing.Xu 7f61a3d97b reset _VAOname to 0 before recreating on android 2015-01-06 09:44:19 +08:00
WenhaiLin ac8e820472 Fixed gravity of physics module not work as expected. 2015-01-05 22:15:03 +08:00
Huabing.Xu a1654e5714 fix delete wild opengl buffers 2015-01-05 17:53:31 +08:00
samuele3hu 58d946b578 issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit 2015-01-05 17:10:25 +08:00
yusheng.lu 3c992fe38c Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur.
Now it's fixed.
2015-01-05 16:59:09 +08:00
minggo c7508bb1c6 Merge pull request #9783 from doomsdayer/v3
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
2015-01-05 15:11:22 +08:00
minggo 4b2375e28c Merge pull request #9794 from htlxyz/v3_origin
modify event register function name
2015-01-05 14:22:53 +08:00
minggo ef5076983d Merge pull request #9792 from minggo/memory-leak
fix memory leak
2015-01-05 14:20:49 +08:00
htl c4cc6b5c34 modify event register function name 2015-01-05 14:19:27 +08:00
htl d754900b28 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-05 14:07:37 +08:00
htl f82404f9c9 modify node register event interface 2015-01-05 14:02:29 +08:00
minggo 1f271a3668 Merge pull request #9786 from dabingnn/v3_fixGLProgramLogCrash
fix GLProgram log crash on windows
2015-01-05 13:56:05 +08:00
Huabing.Xu 8dde42b66a code adjust, delay deprecated flag specification 2015-01-05 13:52:22 +08:00
minggo f155386f05 fix memory leak 2015-01-05 13:49:47 +08:00
yusheng.lu ec540fcaa2 Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader 2015-01-05 13:26:46 +08:00
Huabing.Xu 63e6557165 fix GLProgram log crash on windows 2015-01-04 21:51:22 +08:00
yusheng.lu 7e8d1bb74c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-01-04 19:13:20 +08:00
yusheng.lu a7fb75dc7d Update the description when the csb reader version dismatches the reader version in Cocos2d-x 2015-01-04 19:12:19 +08:00
samuele3hu c91bd076cb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_bug_xmlhttp 2015-01-04 17:10:22 +08:00
samuele3hu 832a87f5f0 Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection 2015-01-04 17:09:35 +08:00
ffskyfan cb3b760759 Update CCFileUtils-win32.cpp
fix the problem that engine can't get data from file while other app using the file on windows platform
2015-01-04 16:43:10 +08:00
minggo 4224319d61 Merge pull request #9775 from huangshiwu/iosnetwork-fixbug
fix iOS HttpClient immediately mode's bug
2015-01-04 14:45:18 +08:00
minggo 24daad384c Merge pull request #9776 from samuele3hu/v3_4_bug
Fix compile iOS compile error on the Xcode 5.1.1
2015-01-04 14:38:45 +08:00
samuele3hu 713de37c5b Fix compile iOS compile error on the Xcode 5.1.1 2015-01-04 13:49:41 +08:00
minggo 26a6502558 Merge pull request #9766 from raydelto/v3
Fixing typo in the constant INVAILD_AUDIO_ID
2015-01-04 13:36:16 +08:00
minggo 001cb59d8e Merge pull request #9764 from zhensydow/patch-1
Remove warn error on Exit
2015-01-04 11:14:53 +08:00
huangshiwu 79e3e8463d fix iOS HttpClient immediately mode's bug 2015-01-04 10:54:29 +08:00
ton a445148a5e fix problem : JumpTo position is changed each repeat.
example:

    sprite->runAction(
        RepeatForever::create(
            Sequence::create(
                JumpTo::create(1, Vec2(300, 200), 100, 2),
                MoveTo::create(1, Vec2(100, 200)),
                nullptr
            )
        )
    );
2015-01-03 01:13:57 +09:00
raydelto e20c347767 Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID 2014-12-31 20:51:45 -04:00
Dale Stammen 395b9fbaa7 added /bigobj to c++ command line options to fix arm builds 2014-12-31 12:56:16 -08:00
Luis Cabellos 651b7fc13c Remove warn error on Exit
Change the return error on Linux to  -1  to  standard EXIT_SUCCESS value.
2014-12-31 18:37:59 +01:00
dualface 432bdf3541 fix framework on iOS 2014-12-31 18:01:03 +08:00
minggo bbfa7a9183 Merge pull request #9753 from samuele3hu/v3_4_httpclient
Resolve the bug that requiring lua scrip did not consider the module dependent
2014-12-31 16:48:33 +08:00
samuele3hu 54d376db01 Resolve the bug that requiring lua scrip did not consider the module dependent 2014-12-31 16:28:14 +08:00
CocosRobot 2e1d8b4e42 [AUTO]: updating luabinding automatically 2014-12-31 08:15:01 +00:00
yusheng.lu 718cfb9d37 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version1 2014-12-31 16:06:19 +08:00
yusheng.lu 89034469f5 Updated the version check description. 2014-12-31 16:01:11 +08:00
minggo 292fff3c29 Merge pull request #9746 from pandamicro/v3_origin
Current restart game will disable ActionManager
2014-12-31 15:50:33 +08:00
pandamicro 677f7ca1d3 Improve restart game 2014-12-31 15:32:59 +08:00
CocosRobot 3614f716ae [AUTO]: updating luabinding automatically 2014-12-31 06:23:33 +00:00
minggo ad443da6a0 Revert "Feature of version check. " 2014-12-31 14:17:18 +08:00
minggo 84c193a343 Merge pull request #9737 from samuele3hu/v3_4_httpclient
Resolve the require file errror
2014-12-31 13:49:16 +08:00
samuele3hu 6bad549285 Resolve the require file errror 2014-12-31 13:43:47 +08:00
Dale Stammen d8c2927944 added base/allocator files 2014-12-30 21:41:46 -08:00
Dale Stammen 7276f64f29 updated dll name from 3.3 to 3.4 2014-12-30 21:40:01 -08:00
Dale Stammen 79e71b6c50 Merge branch 'v3' into wp8-fix2 2014-12-30 21:25:54 -08:00
Dale Stammen 2948a0cdcd used CreateMutexEx for WINRT and WP8 2014-12-30 21:24:05 -08:00
Dale Stammen ac95d292bd added base/allocator files 2014-12-30 21:21:36 -08:00
Dale Stammen 09efe9be04 removed unused winrt CCPlatformDefine.h 2014-12-30 21:03:33 -08:00
minggo 161b0a3985 Merge pull request #9727 from samuele3hu/v3_4_httpclient
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 13:00:04 +08:00
Dale Stammen df64718ef1 removed 3dExport.h as it no longer exists 2014-12-30 20:51:54 -08:00
minggo fde63be06a Merge pull request #9725 from huangshiwu/iosnetwork
iOS HttpClient replace libcurl
2014-12-31 12:50:11 +08:00
samuele3hu 3795f9cc2a Rename HttpClient-android.cpp and unify java indent format 2014-12-31 12:03:27 +08:00
yangxiao d23eb83ba1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-12-31 11:40:37 +08:00
huangshiwu 893aded9b7 iOS HttpClient replace libcurl - fix Jenkins compile error 2014-12-31 11:32:35 +08:00
samuele3hu f7ed73c1e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient 2014-12-31 10:17:12 +08:00
samuele3hu 0e94bdda3a Use android network module — HttpURLConnection to replace the libcurl on the android platform 2014-12-31 10:15:14 +08:00
minggo 51c89c3a22 Merge pull request #9720 from dabingnn/v3_perf
V3 perf
2014-12-31 10:02:59 +08:00
huangshiwu 7426b5c4b5 iOS HttpClient replace libcurl 2014-12-31 10:02:14 +08:00
minggo 274d7d2276 Merge pull request #9718 from darkdukey/depthWriteFix
Disable write to depth buffer for transparent objects
2014-12-31 10:00:48 +08:00
minggo 0d23e5906d Merge pull request #9717 from geron-cn/armaturenodefix
make current animation name take effect when autoplay is false
2014-12-31 09:58:35 +08:00
minggo 5d109d0415 Merge pull request #9721 from MSOpenTech/wp8-fix
WP8 and Windows 8.1 Universal App fixes
2014-12-31 09:47:58 +08:00
minggo a281634c1e Merge pull request #9711 from dabingnn/v3_addUpdateUniformsAndAttributes
V3 add update uniforms and attributes
2014-12-31 09:45:08 +08:00
Dale Stammen f73a07c7b9 added missing files 2014-12-30 17:27:37 -08:00
Dale Stammen bd1fef7515 added missing files 2014-12-30 16:40:04 -08:00
Dale Stammen 57f0ef41b4 added missing inet_pton() for windows phone 2014-12-30 16:39:26 -08:00
Dale Stammen d33fad0ac7 fixed check for header already included 2014-12-30 16:39:02 -08:00
Dale Stammen f4cd2e311d added missing inet_pton() for windows phone 2014-12-30 16:38:18 -08:00
Nite Luo a68dfa13ec Disable Depth Write for transparent objects 2014-12-30 13:35:29 -08:00
geron-cn 89c39d3f10 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix 2014-12-31 04:06:11 +08:00
geron-cn b048b65ae3 make current animation name take effect when autoplay is false 2014-12-31 03:59:36 +08:00
minggo 70a29a8470 Merge pull request #9709 from htlxyz/v3_origin
modify widget interface for lua
2014-12-30 18:32:20 +08:00
Huabing.Xu c60c3fb2b1 refresh uniforms and attributes when access uniform or attribute table 2014-12-30 18:32:09 +08:00
htl dce4383357 modify widget interface for lua 2014-12-30 16:45:26 +08:00
CocosRobot f4fbf51905 [AUTO]: updating luabinding automatically 2014-12-30 08:30:45 +00:00
minggo ef95b1d52d Merge pull request #9700 from minggo/use-const
fix some coding style
2014-12-30 16:24:41 +08:00
CocosRobot 5b8492770e [AUTO]: updating luabinding automatically 2014-12-30 07:49:45 +00:00
minggo 869a9bb0a9 Merge pull request #9652 from lite3/patch-2
fix incorrect font path
2014-12-30 15:43:31 +08:00
Huabing.Xu b92802a770 optimise Renderer::fillQuads() 2014-12-30 15:07:50 +08:00
Huabing.Xu 6576c16fe1 optimise QuadCommand::init() 2014-12-30 14:21:33 +08:00
minggo 538be7d973 Merge pull request #9693 from doomsdayer/v3_version
Feature of version check.
2014-12-30 13:56:16 +08:00
minggo ba4ae50868 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into use-const 2014-12-30 13:36:10 +08:00
minggo da8c007932 add const for Sprite::getTextureRect() and do some format 2014-12-30 11:55:54 +08:00
CocosRobot ed7823c08b [AUTO]: updating luabinding automatically 2014-12-30 03:52:26 +00:00
minggo c78bf0f7aa Merge pull request #9668 from pandamicro/v3_origin
Added restart game feature and getSearchPaths API in Manifest
2014-12-30 11:47:51 +08:00
Huabing.Xu 485c72651d exextract updateUniformsAndAttributes 2014-12-30 11:13:14 +08:00
yusheng.lu 9a0f302370 revert the layoutComponent codes to prevent the demos crush. 2014-12-30 10:47:00 +08:00
yusheng.lu e5961047aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
2014-12-30 10:42:54 +08:00
yusheng.lu 88f0a1e642 prevent the crush of the cocosstudio demos 2014-12-30 10:33:07 +08:00
pandamicro ffd7c30c87 Polish restart implementation 2014-12-30 10:09:56 +08:00
minggo 3c1978fcc3 Merge pull request #9611 from super626/quaternion
Rotation With Quaternion
2014-12-30 10:09:08 +08:00
minggo 73a39d0966 Merge pull request #9688 from pipu/modify_warning
Modify warning code.
2014-12-30 10:07:41 +08:00
minggo f3d91f8b79 Merge pull request #9692 from dabingnn/v3_perf
optimize rendering code
2014-12-30 10:07:17 +08:00
yusheng.lu 505a4e8ab0 Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file.
Removed the version compatible control code before.
2014-12-29 19:37:53 +08:00
Huabing.Xu 2348e5c247 optimize rendering code 2014-12-29 18:45:55 +08:00
pipu d3783cba95 Modify warning code. 2014-12-29 17:04:23 +08:00
minggo 7db279220c Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3 2014-12-29 15:04:43 +08:00
CocosRobot 75436db583 [AUTO]: updating luabinding automatically 2014-12-29 05:51:45 +00:00
dualface 653b15b4b8 add UIWidget support, fix typo 2014-12-29 13:37:20 +08:00
minggo 7ab4e0de3a Merge pull request #9634 from andyque/fixIssue9628
fix setTitleColor calls method setColor instead of setTextColor of title label.
2014-12-29 11:24:36 +08:00
minggo f1b014327f Merge pull request #9678 from dualface/update_lua_templates
Update lua templates
2014-12-29 11:01:14 +08:00
dualface 40acc98f14 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates 2014-12-29 10:58:42 +08:00
minggo 24fc26fb5d Merge pull request #9679 from super626/frustum
Release note for Frustum
2014-12-29 10:57:24 +08:00
yangxiao 0963b3d86e add comment 2014-12-29 10:51:16 +08:00
dualface 954f170e9e remove chinese comments 2014-12-29 10:44:16 +08:00
minggo d7dfdc9124 Merge pull request #9417 from lite3/spriteretainframe
retain the sprite frame in sprite
2014-12-29 10:33:42 +08:00
minggo 67ae66a90e Merge pull request #9663 from dualface/update_lua_corelib
update lua corelib
2014-12-29 10:30:50 +08:00
CocosRobot 35774cc0f6 [AUTO]: updating luabinding automatically 2014-12-29 02:07:20 +00:00
minggo d95d8d98e3 Merge pull request #9672 from CocosRobot/update_lua_bindings_1419817593
[AUTO]: updating luabinding automatically
2014-12-29 10:03:00 +08:00
minggo 212684fcd4 Merge pull request #9665 from andyque/fixLibpngWarning
Fix libpng warning
2014-12-29 10:00:43 +08:00
minggo 06cd28f524 Merge pull request #9618 from yinjimmy/bindAddress
support bind address for console
2014-12-29 09:52:01 +08:00
CocosRobot 4172e7ad7f [AUTO]: updating luabinding automatically 2014-12-29 01:49:00 +00:00
minggo 206aa94ff2 Merge pull request #9667 from SunLightJuly/fix_crash_when_display_FPS
fixed bug which caused crash when display FPS
2014-12-29 09:45:30 +08:00
minggo b01b25e17e Merge pull request #9558 from super626/frustum
Frustum Culling
2014-12-29 09:43:14 +08:00
minggo a8ac3df48c Merge pull request #9651 from CocosRobot/update_lua_bindings_1419581293
[AUTO]: updating luabinding automatically
2014-12-29 09:17:15 +08:00
minggo 2b0e287b5f Merge pull request #9656 from geron-cn/v3_actionline_animationlist
fix: auto add search path for armaturenodereader
2014-12-29 09:17:01 +08:00
dualface 8d99d8a78e fix typo 2014-12-29 05:47:37 +08:00
dualface 9684d6e164 update corelib 2014-12-29 05:41:13 +08:00
dualface 74daae1c39 update framework 2014-12-29 01:58:16 +08:00
pandamicro e3795c0223 Added restart game feature 2014-12-28 11:55:06 +08:00
SunLightJuly 4d08128e89 fixed bug which caused crash when display FPS: the value of "_secondsPerFrame" of Director was not be Initialized 2014-12-27 22:05:29 +08:00
andyque 9c974eebd0 fix libpng warning 2014-12-27 20:47:59 +08:00
dualface cc3021467f add more usable functions 2014-12-27 15:31:31 +08:00
dualface 46a0ad11ac update lua corelib 2014-12-27 11:59:14 +08:00
yinjimmy 4567cf1c40 Fix: Address family not supported by protocol 2014-12-26 21:04:49 +08:00
geron-cn b25e307dee fix add search path for armaturenodereader 2014-12-26 18:27:47 +08:00
XiaoYang 8b95c591b1 Merge pull request #189 from songchengjiang/v3
read AABB from file(v0.6+)
2014-12-26 16:15:56 +07:00
lite3 b102587590 fix incorrect font path 2014-12-26 16:20:04 +08:00
yangxiao afb01dcd9a config linux 2014-12-26 16:19:02 +08:00
CocosRobot f8b1b34025 [AUTO]: updating luabinding automatically 2014-12-26 08:10:13 +00:00
minggo f01cc596a3 Merge pull request #9637 from geron-cn/v3_actionline_animationlist
V3 actiontimeline animationlist
2014-12-26 16:05:49 +08:00
yinjimmy 5bcd3d9a00 bind address is available for all platform 2014-12-26 16:02:24 +08:00
yangxiao b0a6720cb2 reset auto lua, fix #9515 2014-12-26 15:52:27 +08:00
yangxiao 25ce54b43b reset 2014-12-26 15:46:45 +08:00
minggo 275de89746 Merge pull request #9650 from pipu/update_checkboxreader
Update that parse plist for CheckBoxReader.
2014-12-26 15:43:30 +08:00
minggo 84a88f4f76 Merge pull request #9649 from minggo/fileutil-extend
make FileUtils extendable
2014-12-26 15:37:51 +08:00
minggo 42e6232113 fix typo and memory leak 2014-12-26 14:25:55 +08:00
pipu bc18bafaa7 Update that parse plist for CheckBoxReader. 2014-12-26 14:18:28 +08:00
lvlong f592671df6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
2014-12-26 13:42:13 +08:00
minggo 94d70358b7 make FileUtils extendable 2014-12-26 11:34:31 +08:00
CocosRobot a30d606fe6 [AUTO]: updating luabinding automatically 2014-12-26 02:40:22 +00:00
minggo 9e8582e01a Merge pull request #9643 from CocosRobot/update_lua_bindings_1419557440
[AUTO]: updating luabinding automatically
2014-12-26 10:35:53 +08:00
minggo 564b9f0aef Merge pull request #9635 from super626/sync_load
ReleaseNote for Sprite3D::createAsync
2014-12-26 09:37:19 +08:00
CocosRobot ff37578611 [AUTO]: updating luabinding automatically 2014-12-26 01:32:36 +00:00
minggo 1c87c53ff8 Merge pull request #9636 from musikov/v3-language
added Turkish and Ukrainian language;
2014-12-26 09:31:57 +08:00
minggo 491d36c62b Merge pull request #9626 from liamcindy/CocoReader
update for cocos reader
2014-12-26 09:29:37 +08:00
minggo 3581c00301 Merge pull request #9619 from yinjimmy/trackLogForWindows
Track log for windows
2014-12-26 09:28:23 +08:00
minggo 3b01762db4 Merge pull request #9638 from yinjimmy/writablepath
set default resource root path & writable path
2014-12-26 09:27:59 +08:00
yinjimmy 744a9043f9 set default resource root path & writable path 2014-12-25 20:33:47 +08:00
yinjimmy b21eaab047 using suitable variable name 2014-12-25 19:39:44 +08:00
andyque 19dc8b5d19 fix conflicts and wp8, wp8.1 linker error 2014-12-25 18:11:59 +08:00
Mykyta Usikov d9b5ab4a4c added Turkish and Ukrainian language;
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
2014-12-25 12:08:23 +02:00
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
geron-cn 70eef1f660 fix play 2014-12-25 17:45:14 +08:00
yangxiao 64ff6bb51c modify msg word 2014-12-25 17:42:58 +08:00
yangxiao d9d5e1a5cb add release note 2014-12-25 17:40:26 +08:00
geron-cn 490b33405d Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_actionline_animationlist 2014-12-25 17:37:05 +08:00
geron-cn 79e5341742 remove animation list binary parse 2014-12-25 17:22:49 +08:00
andyque 3f0f7c289f change setColor to setTextColor 2014-12-25 16:07:34 +08:00
minggo 6ec03010a7 Merge pull request #9630 from andyque/fixCICompile
fix ci compile error
2014-12-25 16:03:50 +08:00
andyque 60893607cc fix ci compile error 2014-12-25 15:38:51 +08:00
lvlong 75d2deb2c8 revert 2014-12-25 15:25:19 +08:00
lvlong 3f91957e79 revert 2014-12-25 15:21:53 +08:00
Liam fa85faec68 update for cocos reader 2014-12-25 15:02:22 +08:00
yangxiao 04e273e245 bind setRotationQuat 2014-12-25 14:54:20 +08:00
CocosRobot 6b15f4edcb [AUTO]: updating luabinding automatically 2014-12-25 06:14:03 +00:00
Liam 807e63eae3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into CocoReader 2014-12-25 14:13:02 +08:00
Liam bd37d806ff update for cocos reader 2014-12-25 14:11:05 +08:00
minggo 2ec85f8c4e Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket
avoid locking when message queue is empty in websocket
2014-12-25 14:09:35 +08:00
minggo 9643b87ed0 Merge pull request #9173 from 2youyouo2/v3
improve ActionTimeline api
2014-12-25 14:06:02 +08:00
lvlong a4a108f766 fix lua binding again!! 2014-12-25 14:04:41 +08:00
minggo 0c66e638f7 Merge pull request #8183 from xseekerj/patch-3
CCPlatformMacros.h
2014-12-25 14:02:52 +08:00
minggo 2ca143959b Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile
execute script with full file path
2014-12-25 13:45:46 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
yangxiao 0db70977f9 wrong scale order 2014-12-25 10:39:48 +08:00
yangxiao 510633ba72 wrong spelling 2014-12-25 10:33:49 +08:00
yinjimmy b4a442cd8c fix compile error on windows 2014-12-25 09:33:28 +08:00
yangxiao 6eed142e03 rename _rotation_quat to _rotationQuat 2014-12-24 18:12:00 +08:00
CocosRobot 381be0f6f0 [AUTO]: updating luabinding automatically 2014-12-24 09:41:09 +00:00
minggo 03d53ba7c4 Merge pull request #9585 from doomsdayer/v3_armature_reader
V3 armature reader
2014-12-24 17:36:09 +08:00
yangxiao 17207673ff merge cocos 2014-12-24 17:34:58 +08:00
yangxiao 88e0f025ef make it clean 2014-12-24 17:18:09 +08:00
yangxiao 22ae384edf Rotation representation with quaternion fix #9510 2014-12-24 17:07:54 +08:00
minggo 705bf500f7 Merge pull request #9604 from CocosRobot/update_lua_bindings_1419403220
[AUTO]: updating luabinding automatically
2014-12-24 17:06:05 +08:00
yusheng.lu 7c34b06969 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 16:02:37 +08:00
youyou db6ffd7962 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-24 15:59:50 +08:00
minggo 0b7572f3ee [ci skip] 2014-12-24 15:35:58 +08:00
yusheng.lu c64792959c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 15:32:02 +08:00
lvlong da2683aad9 Merge branch 'frustum' of github.com:lvlonggame/cocos2d-x into frustum 2014-12-24 15:10:48 +08:00
lvlong 4d1ca0966c lua binding 2014-12-24 15:09:26 +08:00
lvlonggame 805b248af3 modify win-project 2014-12-24 15:06:58 +08:00
minggo 42f1d5fdf3 Merge pull request #9601 from minggo/set-glcolor
Director supports setting clear color
2014-12-24 14:45:43 +08:00
CocosRobot a5d3e8361b [AUTO]: updating luabinding automatically 2014-12-24 06:42:09 +00:00
minggo bb9fb9f0d6 Merge pull request #9591 from liamcindy/Layout
update for lay out
2014-12-24 14:27:08 +08:00
yusheng.lu fa5b4f8df7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters

resolve the conflicts
2014-12-24 13:06:38 +08:00
minggo b925689435 Director supports setting clear color 2014-12-24 11:53:38 +08:00
Liam dcd544cc66 update ui widget function format 2014-12-24 11:12:14 +08:00
Liam 83fcf74882 update for code format 2014-12-24 10:56:01 +08:00
minggo 5d8e004b9b Merge pull request #9600 from huangshiwu/v3_allocator_wp
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:54:16 +08:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
huangshiwu 01eeb15a8d fix allocator related compile error on wp8/8.1 and winrt 2014-12-24 10:45:29 +08:00
minggo ef9c44566b Merge pull request #9593 from CocosRobot/update_lua_bindings_1419317247
[AUTO]: updating luabinding automatically
2014-12-24 10:31:58 +08:00
minggo 4cac8e2cb4 Merge pull request #9595 from super626/v3
Do not try to load empty texture
2014-12-24 10:31:44 +08:00
songchengjiang ceb834b8d4 read AABB from file(v0.6+) 2014-12-24 10:12:31 +08:00
yinjimmy 24648db2b5 execute script with full file path 2014-12-24 02:18:29 +08:00
yinjimmy b46ee82e90 support bind address for console 2014-12-24 02:04:42 +08:00
yinjimmy a26f62186b track log for windows 2014-12-24 01:26:13 +08:00
Liam 33bd5e3f4c remove unused code 2014-12-23 20:36:18 +08:00
Liam 815ea2a1a5 update for code format 2014-12-23 20:29:53 +08:00
minggo dea483b6ef performance improve 2014-12-23 18:07:22 +08:00
yusheng.lu d543f8f6a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-23 16:12:50 +08:00
yangxiao 908b9e470d do not try to load empty texture 2014-12-23 15:52:45 +08:00
yusheng.lu 2b7c0edfed license in ArmatureNodeReader.h added. 2014-12-23 15:13:27 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
CocosRobot 864b924dfb [AUTO]: updating luabinding automatically 2014-12-23 06:49:30 +00:00
minggo ca932a38e4 Merge pull request #9538 from andyque/fixCapInsetSize
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-23 14:44:32 +08:00
minggo 90a7f99873 Merge pull request #9570 from liamcindy/UIListView
override function for listview
2014-12-23 14:25:46 +08:00
Liam e4360b7616 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout 2014-12-23 14:15:55 +08:00
CocosRobot facf9a1a66 [AUTO]: updating luabinding automatically 2014-12-23 04:05:21 +00:00
minggo 40d00e3d97 Merge pull request #9554 from super626/sync_load
create 3d sprite asynchronously
2014-12-23 12:00:13 +08:00
yusheng.lu 7eedef71e6 armature node test completed 2014-12-23 11:13:05 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
yangxiao 2309a524fd simplify AsyncTaskPool 2014-12-23 10:12:37 +08:00
lvlong 026f0a8b25 modify code format. 2014-12-23 09:57:46 +08:00
mannewalis 9d885fe664 default lock macros to nothing for unsupported platforms 2014-12-22 19:49:20 -05:00
mannewalis 09f2eed4b8 default lock macros to nothing for unsupported platforms 2014-12-22 19:46:16 -05:00
mannewalis aad45d6952 fixing windows8 build 2014-12-22 19:43:40 -05:00
yusheng.lu 1e05361873 ios/mac project compeleted 2014-12-22 20:08:27 +08:00
yusheng.lu 2de5ba7c2f vs filters update 2014-12-22 19:43:14 +08:00
yusheng.lu 02b9269cff completed multiplatform projects 2014-12-22 19:39:10 +08:00
Liam 1e85f1a080 Merge branch 'UILayout_Widget' into UILayout_Reader 2014-12-22 19:23:03 +08:00
Liam 377d8ec3c0 Merge branch 'UILayout' into UILayout_Widget 2014-12-22 19:22:09 +08:00
Liam 39d0f183d4 update for code format 2014-12-22 19:05:31 +08:00
youyou 70052b2a3f support animation list 2014-12-22 18:57:48 +08:00
Liam 0465ff8325 remote unuseful format 2014-12-22 18:39:44 +08:00
yusheng.lu b0bfc2906a change armature codes files path 2014-12-22 18:26:50 +08:00
lvlong db9f4a23fe feedback commit. 2014-12-22 18:13:07 +08:00
yusheng.lu 6de7fae114 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-22 18:00:08 +08:00
yangxiao 1ba826ea17 modify code style 2014-12-22 17:40:02 +08:00
lvlong 2058742e4a Merge branch 'frustum' of github.com:super626/cocos2d-x into frustum
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCCamera.cpp
	cocos/2d/CCCamera.h
	cocos/3d/CCFrustum.cpp
	cocos/3d/CCFrustum.h
	cocos/3d/CCPlane.cpp
	cocos/3d/CCPlane.h
	cocos/3d/CCRay.cpp
	cocos/3d/CCRay.h
	cocos/3d/CCSprite3D.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
2014-12-22 17:37:00 +08:00
yusheng.lu 62c5df2d9d armature node reader done (projs incompleted) 2014-12-22 17:35:39 +08:00
yangxiao e8c7f30541 add quaternion 2014-12-22 17:23:44 +08:00
CocosRobot 34e1bce6c3 [AUTO]: updating luabinding automatically 2014-12-22 08:02:05 +00:00
minggo feacf75f12 Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3
#9555 MoveTo and MoveBy support Vec3
2014-12-22 15:57:12 +08:00
lvlong 63ebf20026 modify code format. 2014-12-22 15:51:10 +08:00
Liam ce9f269680 update object reader for new lay out system 2014-12-22 15:38:47 +08:00
lvlong 7291e6e94a modify about feedback. 2014-12-22 15:23:41 +08:00