Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,514 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

8440 Commits

Author SHA1 Message Date
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
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
Liam f5a242be97 update for widget percent position and size logic 2014-12-22 15:23:26 +08:00
yangxiao bdc12dce8b add quaternion property 2014-12-22 15:14:18 +08:00
minggo 6ac611bd1d Merge pull request #9573 from pipu/update_parse_resource_path 
Update that parse resource path with flat buffers for readers
 2014-12-22 15:11:24 +08:00
minggo 81de0ae687 Merge pull request #9566 from austinkelleher/dev 
Fixing variable name lenght -> length.
 2014-12-22 15:07:15 +08:00
Liam 5a73ea9313 reset widget chaned 2014-12-22 15:04:25 +08:00
minggo 20beb3b9e0 Merge pull request #9567 from joewan/v3-improve-perf 
fix serious performance problem of Animate.
 2014-12-22 14:57:26 +08:00
Liam 7c4d31feab update for lay out samples 2014-12-22 14:51:50 +08:00
minggo 39f56f1303 Merge pull request #9562 from wefiends/upstream2-v3 
AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES.
 2014-12-22 14:50:38 +08:00
minggo 1268f73a7c MoveTo and MoveBy support Vec3 2014-12-22 14:34:35 +08:00
pipu 0c6e22dd77 Update that parse resource path with flat buffers for readers 2014-12-22 13:42:18 +08:00
Liam 56e42b0a0a update for lay out 2014-12-22 11:20:03 +08:00
kaile.yin a8dd2a4e80 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-12-22 11:15:07 +08:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
Liam 8d8215b148 override function for listview 2014-12-22 09:55:29 +08:00
joewanchen bb1267cd09 use auto&. 2014-12-21 14:05:34 +08:00
joewanchen a15a4a0739 fix compile error. 2014-12-21 02:03:41 +08:00
joewanchen c2473b9b99 fix. 2014-12-21 01:03:30 +08:00
joewanchen 3765f87651 fix. 2014-12-21 00:49:23 +08:00
joewanchen 7d6686eb7b fix. 2014-12-21 00:42:55 +08:00
joewanchen fc69dabca2 fix serious performance problem. 2014-12-21 00:22:23 +08:00
Austin Kelleher d3ca364259 Fixing variable name lenght -> length. 2014-12-20 07:34:44 -05:00
Ricardo Quesada 92584bbc7f Merge pull request #9547 from mannewalis/mem_alloc_again 
Mem alloc again
 2014-12-19 14:35:26 -08:00
Nick Barrios 0c2e64b8b9 AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES. 2014-12-19 16:50:47 -05:00
mannewalis 50bd3cf2b7 modify inline macro to work on windows 2014-12-19 10:57:19 -05:00
XiaoYang 9102c77840 Merge pull request #182 from lvlonggame/v3 
camera frustum update
 2014-12-19 16:14:01 +07:00
XiaoYang 6be4538f3d Merge pull request #181 from songchengjiang/sync_load 
fix errors on Windows
 2014-12-19 13:33:20 +07:00
yangxiao eb2e27ef27 Merge branch 'newcode' into sync_load 2014-12-19 14:27:17 +08:00
WenhaiLin 4366fb7230 Fix compile error on WIN32. 2014-12-19 11:49:40 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
yangxiao f4dbaa53e4 add to linux 2014-12-19 10:29:10 +08:00
lvlong 13cae3c480 deal tab 2014-12-19 10:25:59 +08:00
yangxiao 5aad841080 add stop task 2014-12-19 10:22:02 +08:00
yangxiao d1a35fe47a make bundle thread safe 2014-12-19 10:21:30 +08:00
yangxiao c788a1892d make it thread safe 2014-12-19 10:20:44 +08:00
yangxiao 37f4d67a49 make it thread safe 2014-12-19 10:20:37 +08:00
minggo 627e5dacfc Merge pull request #9543 from tjunxin/patch-1 
comment line 83
 2014-12-19 10:04:14 +08:00
minggo 8f3e9d9fb1 Merge pull request #9540 from pipu/avoid_crash_during_load_resource_with_flatbuffers 
Update that avoid crash during load resource which serialize by flat buffers.
 2014-12-19 09:58:26 +08:00
minggo 6f0a4191cb Merge pull request #9533 from andyque/fixWebpPremultiplyAlpha 
fix webp format premultipliedAlpha error
 2014-12-19 09:53:44 +08:00
yangxiao 549ec2adab make bundle thread safe 2014-12-19 09:48:20 +08:00
mannewalis 467a5e9c12 minor changes for linux build 2014-12-18 18:21:49 -05:00
mannewalis c05a6c877d adding files to cmake files 2014-12-18 18:10:13 -05:00
lvlong a5746dd2a0 1. modify Android.mk 
2. modify DrawNode3D include path
 2014-12-18 18:14:16 +08:00
lvlong f6bea9b6bb 1.add camera culling. 
2.add camera culling sample.
3.fix bug: load .obj file material.
 2014-12-18 17:18:22 +08:00
yangxiao f54f8a4826 remove return value of enque 2014-12-18 16:16:04 +08:00
yangxiao 6e99698c59 Merge branch 'newcode' into sync_load 2014-12-18 14:03:07 +08:00
tjunxin 561350c2bc comment line 83 
As known,  _glProgramStates is a cocos2d::Map container,it will call object->retain() when insert, and call position->second->release() when erase, so the statement of line 83 is redundant.
If i don't comment line 83, the application will crash when GLProgramStateCache::removeUnusedGLProgramState() is called.
 2014-12-18 13:49:54 +08:00
mannewalis 6b1f994c40 turn off global new delete 2014-12-17 13:55:14 -05:00
mannewalis a6eab3c496 Merge branch 'v3' into mem_alloc_again 2014-12-17 11:59:24 -05:00
mannewalis 34a2f6f640 minor tweak 2014-12-17 11:56:19 -05:00
mannewalis fd22242fb2 added locking semantics to fixed block allocator 
pool allocator uses lockless semantics by default
 2014-12-17 11:54:06 -05:00
pipu 79acf80fb1 Update that avoid crash during load resource which serialize by flat buffers 2014-12-17 19:00:24 +08:00
CocosRobot 9ffacb3f78 [AUTO]: updating luabinding automatically 2014-12-17 10:38:03 +00:00
minggo 9da1317f10 Merge pull request #9453 from sxd1140/v3 
add stopActionByName()
 2014-12-17 18:32:04 +08:00
andyque b11e3d74cc restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar 2014-12-17 16:46:48 +08:00
andyque 6856f03bff fix webp format premultipliedAlpha error 2014-12-17 14:21:46 +08:00
samuele3hu 5c20885ad1 Synchronize the KeyCode Enum to Lua 2014-12-17 11:27:01 +08:00
yangxiao ae0888ba8d merge cocos 2014-12-17 10:06:07 +08:00
minggo d9953d4aac Merge pull request #9519 from andyque/addNewRequirements 
refactor Button restrict capInsetSize logic and cleanup ui coding style
 2014-12-17 09:53:31 +08:00
CocosRobot 189e386846 [AUTO]: updating luabinding automatically 2014-12-16 10:44:15 +00:00
minggo 116ff0de63 Merge pull request #9439 from andyque/addcreateMethodToLoadingBar 
add TextureResType to LoadingBar's create method
 2014-12-16 18:31:20 +08:00
minggo e800b3d9ba Merge pull request #9501 from joewan/v3-fix-mismatch 
V3 fix uninitialized members.
 2014-12-16 18:28:36 +08:00
andyque 16cf396ed7 refactor Button restrict capInsetSize logic and cleanup ui coding style 2014-12-16 16:44:04 +08:00
lvlong 73a2a6385a add frustum culling. 2014-12-16 16:34:35 +08:00
CocosRobot 3d327deb6d [AUTO]: updating luabinding automatically 2014-12-16 02:14:01 +00:00
minggo b3731fa06a Merge pull request #9486 from 2youyouo2/v3_EventFrame 
fixed frame event
 2014-12-16 09:53:43 +08:00
minggo 6b18305550 Merge pull request #9497 from Dhilan007/v3-game 
Fixed content size of Label is incorrect after sets empty string.
 2014-12-16 09:48:36 +08:00
mannewalis 640695c21c reverting android properties change 2014-12-15 16:31:22 -08:00
mannewalis a095635459 android fixes 2014-12-15 16:21:12 -08:00
mannewalis b532ce74d8 diagnostics track allocator enable 2014-12-15 16:16:35 -08:00
mannewalis c50bf94c59 removing Allocator<T> and inheriting base directly. 2014-12-15 09:34:25 -08:00
joewanchen 7b23e3ab1d remove useless function call. 2014-12-15 19:47:25 +08:00
joewanchen 713d19c830 initialize _contentSizeDirty. 2014-12-15 19:43:54 +08:00
joewanchen 0cc4b58383 initialize _startPointCaptured. 2014-12-15 19:42:25 +08:00
yangxiao 5ad408530c merge cocos 2014-12-15 17:47:05 +08:00
Wenhai Lin 4ed5872ba3 Fixed content size of Label is incorrect after sets empty string. 2014-12-15 14:36:57 +08:00
youyou 69824ff07b add space for readable 2014-12-15 09:36:21 +08:00
Vladimir Timofeev be01bede63 Fix couple of warnings. Make forward declarations to match to real declarations. 2014-12-14 21:04:14 +03:00
Vladimir Timofeev 6494a7abae Hide tinyxml2 from user visible header. 2014-12-14 20:32:24 +03:00
Vladimir Timofeev 9bd1ab74c7 Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory. 
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
 2014-12-14 12:14:16 +03:00
mannewalis cb547413d2 fix range error on reporting all allocators 2014-12-13 11:45:08 -08:00
mannewalis 58be92b35f added more diagnostic info. 
still crashing, but only on device. Suspect a free(p) that was allocated with new.
 2014-12-13 11:42:35 -08:00
mannewalis e81e9a7f47 fixing some issues, still crashing, but want to keep changes. 2014-12-13 10:40:45 -08:00
Sergey 9a01b76fec Clang static analyzer crash fix 2014-12-13 12:40:04 +03:00
mannewalis 7b2fea798a add total count and fix remaining reporting issues 2014-12-12 17:16:44 -08:00
mannewalis 00da483e1b minor changes 2014-12-12 14:54:24 -08:00
mannewalis 595b3c1cd2 some minor tweaks comments and logging 2014-12-12 10:54:59 -08:00
mannewalis bc7757a366 adding allocator system 2014-12-12 08:57:06 -08:00
youyou 579bb3f8d8 fixed frame event 2014-12-12 18:02:03 +08:00
minggo cf8b6120a0 Merge pull request #9481 from super626/v3 
CullFace state change bug and fix #9465
 2014-12-12 15:48:31 +08:00
XiaoYang b106b2f7ce Merge pull request #175 from lvlonggame/v3 
fix bug: same model in mirror state cullFace problem.
 2014-12-12 09:52:01 +07:00
minggo 7acb8bfddf Merge pull request #9477 from pipu/update_serialize_plist_file_name 
Update that serialize plist file name and load plist file
 2014-12-12 10:13:18 +08:00
pipu accf66c49f Update that serialize plist file name 2014-12-11 19:15:04 +08:00
minggo 93561fcb8e [ci skip]update version 2014-12-11 18:14:28 +08:00
minggo 07c9251557 Merge pull request #9462 from edwardzhou/fix_UIText_clone_missing_contentSize 
Fix UIText miss copy contentSize for clone
 2014-12-11 17:55:32 +08:00
minggo f0f393654e Merge pull request #9459 from pipu/fix_#9457 
Fixes #9457
 2014-12-11 15:12:48 +08:00
minggo d7c722c67f Merge pull request #9455 from samuele3hu/v3_cocostudio 
Add Websocket support for Mac platform
 2014-12-11 15:12:10 +08:00
lvlong d0ce99413d fix bug: same model in mirror state cullFace problem. 2014-12-11 14:24:26 +08:00
Edward Zhou 1ca92411fc Fix UIText miss copy contentSize for clone 2014-12-11 13:33:28 +08:00
pipu 70b9767c56 1. Fixes #4957 that click test TestChangePlaySection, then it will crash. 
2. Modify default value of selectedState to serialize check box data.
 2014-12-11 11:34:31 +08:00
minggo a1c60bcf24 Merge pull request #9452 from minggo/java-style 
[ci skip]use java coding style
 2014-12-11 10:55:14 +08:00
minggo 48345a0d65 Merge pull request #9441 from pipu/update_reader 
Update Reader
 2014-12-11 10:02:38 +08:00
minggo 7c07bc6a90 Merge pull request #9449 from Dhilan007/v3-keycode 
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
 2014-12-11 09:58:57 +08:00
samuele3hu 5d3008d6ac Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio 2014-12-11 09:51:18 +08:00
Sxd 5f47bef320 add stopActionByName() 2014-12-11 02:57:13 +08:00
minggo 1d1028a68b Merge pull request #9410 from andyque/fixEditBox_v3 
Fix edit box v3
 2014-12-10 18:54:20 +08:00
minggo 0e7470505f replace tab with 4 spaces 2014-12-10 18:32:58 +08:00
Dhilan007 8b78c181ce Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT. 2014-12-10 18:11:07 +08:00
minggo 77ed7a47e2 use java coding style 2014-12-10 18:07:46 +08:00
pipu d3351a4b11 1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic. 
2. Update how to parse attribute scale9Enabled
 2014-12-10 17:35:39 +08:00
pipu e81dca372a Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader 2014-12-10 15:46:58 +08:00
pipu 6b6fe4129d Update Reader 2014-12-10 12:36:14 +08:00
minggo 33a8c0d49b Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129 
[AUTO]: updating luabinding automatically
 2014-12-10 11:15:09 +08:00
minggo eef6d08813 Merge pull request #9402 from doomsdayer/v3_listview 
V3 listview
 2014-12-10 11:13:42 +08:00
andyque 989c05cd2d add TextureResType to LoadingBar 2014-12-10 10:21:17 +08:00
youyou 41c86de0d4 update csloader 2014-12-09 22:13:17 +08:00
samuele3hu 4b43fab3e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-12-09 21:03:01 +08:00
CocosRobot b0aacdc287 [AUTO]: updating luabinding automatically 2014-12-09 10:34:49 +00:00
samuele3hu 7e8da62ebc Add Websocket support for Mac platform 2014-12-09 18:29:20 +08:00
kaile.yin 9fdd8cee06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-09 16:03:33 +08:00
pipu f54254494c Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp 2014-12-09 15:13:09 +08:00
minggo 5ab4f16fb1 Merge pull request #9411 from pipu/v3_reader_update 
V3 reader update
 2014-12-09 13:44:55 +08:00
kaile.yin cb509aa69f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-09 13:33:39 +08:00
lite3 91c7127bbd Merge branch 'v3' into spriteretainframe 2014-12-09 10:51:47 +08:00
lite3 4f4c30051e retain the sprite frame 
do not removed by SpriteFrameCache::removeUnusedSpriteFrames
 2014-12-08 21:04:15 +08:00
yusheng.lu 7426a32d9f 1. ListView demo compeleted. 
2. Optimized ListViewReader format.
 2014-12-08 19:00:12 +08:00
minggo 7749e11614 Merge pull request #9414 from CocosRobot/update_lua_bindings_1418033522 
[AUTO]: updating luabinding automatically
 2014-12-08 18:16:50 +08:00
CocosRobot e510f24663 [AUTO]: updating luabinding automatically 2014-12-08 10:14:41 +00:00
minggo dd5659b6eb Merge pull request #9401 from minggo/iss9398-not-close-dir 
invoke closedir after invoke opendir
 2014-12-08 18:10:41 +08:00
minggo b6b9a5013f Merge pull request #9404 from super626/v3 
bug fix
 2014-12-08 18:08:25 +08:00
pipu 56a25a2644 Update reader 2014-12-08 15:48:24 +08:00
andyque 119a68afd9 fix EditBox move animation position is wrong on iPhone6 Plus 2014-12-08 15:34:58 +08:00
andyque d53d71610b Merge branch 'v3' into fixEditBox_v3 2014-12-08 15:20:06 +08:00
pipu c3365a4654 Add interface that create node with flat buffers object for simulator 2014-12-08 14:32:33 +08:00
minggo 3dd68b47b3 Merge pull request #9390 from liamcindy/UIReader 
update for cocos reader
 2014-12-08 14:25:57 +08:00
minggo c067338c17 closedir when succeed 2014-12-08 11:36:11 +08:00
XiaoYang a59d4ab2a3 Merge pull request #171 from tangziwen/v3 
let billboard can rotate in the Z axis
 2014-12-08 09:34:58 +07:00
yangxiao a1ec27d0b1 calculate aabb if not exist 2014-12-08 10:30:06 +08:00
minggo 74c80296aa invoke closedir after invoke opendir 2014-12-08 09:58:58 +08:00
Dale Stammen 1d908f94ab fixed renameFile for wp8 and winrt to pass file and assetmangers tests 2014-12-05 18:12:25 -08:00
Liam e4b6a2bf57 update for cocos reader 2014-12-05 19:43:40 +08:00
yusheng.lu 2f456a5668 ListViewReader completed and listview callback feature. 2014-12-05 19:31:10 +08:00
Liam be929dcde6 update for cocos reader 2014-12-05 19:19:53 +08:00
yangxiao 2a445ef1d9 correct unsuitable word 2014-12-05 16:44:49 +08:00
yangxiao 11d9f27c00 createAsync comment 2014-12-05 16:11:14 +08:00
yangxiao 5bc74e55df modify comment 2014-12-05 15:59:21 +08:00
yangxiao b665daf2f8 add comment 2014-12-05 15:55:01 +08:00
yangxiao 3439b7f68d refactor async load callback funtion 2014-12-05 15:48:46 +08:00
yangxiao 60e1b54b1a fix ~ThreadTasks() bug 2014-12-05 15:25:56 +08:00
yangxiao c99185b755 add async load test 2014-12-05 15:01:30 +08:00
kaile.yin 1db2bf89e0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-05 14:42:25 +08:00
youyou 04f870edb5 update head file 2014-12-05 10:08:48 +08:00
minggo 959f04cb20 Merge pull request #9378 from lite3/patch-1 
print more info
 2014-12-05 09:30:10 +08:00
minggo 68370ca229 Merge pull request #9381 from pipu/modify_bugs_for_flatbuffers 
Modify bugs for flatbuffers
 2014-12-05 09:28:19 +08:00
youyou 0235c4c377 change head file 2014-12-05 00:10:42 +08:00
Huabing.Xu 697e1fd75e Merge pull request #9377 from dabingnn/v3.3Perf 
performance improvement
 2014-12-04 21:08:24 +08:00
pipu 56f7895e27 Modify bugs for flatbuffers 2014-12-04 20:38:46 +08:00
lite3 8df8ee36db print more info 2014-12-04 19:18:54 +08:00
kaile.yin 9f9c4782f1 change file name 2014-12-04 18:51:32 +08:00
kaile.yin a6653c7d8d change name 2014-12-04 18:50:00 +08:00
Huabing.Xu 27ff06b1d2 performance improvement 2014-12-04 18:37:57 +08:00
yangxiao bc57e47ddb add async task callback dipatcher, call it in the main thread 2014-12-04 18:31:10 +08:00
minggo fcfd33947f [ci skip] 2014-12-04 15:36:09 +08:00
kaile.yin 3f1cb4338a Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-12-04 15:33:38 +08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +08:00
tangziwen 8605595a5b let billboard can rotate in the Z axis 2014-12-04 15:19:41 +08:00
minggo 0d89b9b742 Merge pull request #9368 from huangshiwu/v3_wincpu 
fix win32 high cpu occupancy rate
 2014-12-04 15:17:26 +08:00
minggo 0badda268a Merge pull request #9366 from Dhilan007/v3-33rc1 
Fixed label may show nothing when using system font on Mac
 2014-12-04 15:11:50 +08:00
minggo 8cd8a6d7b9 Merge pull request #9365 from andyque/updateExternalConfig 
update external config to v3-deps-28.zip
 2014-12-04 15:09:02 +08:00
huangshiwu 1212b4a6e9 fix win32 high cpu occupancy rate 2014-12-04 14:33:17 +08:00
andyque 8a5c78b213 update external config to v3-deps-28.zip and update cocos2d-x version to rc2 2014-12-04 14:23:44 +08:00
minggo 7fd037c416 Merge pull request #9359 from super626/v3 
Initialize variable when defined
 2014-12-04 13:40:21 +08:00
CocosRobot 0c54f8f7a0 [AUTO]: updating luabinding automatically 2014-12-04 02:11:58 +00:00
youyou 4af869fdeb update make file 2014-12-03 18:47:41 +08:00
yangxiao f17df4b0bc add createAsync 2014-12-03 17:40:27 +08:00
Wenhai Lin ed86f65270 Fixed label may show nothing when using system font on Mac 2014-12-03 17:07:51 +08:00
kaile.yin b4612447f3 change tab to 4 space 2014-12-03 16:12:44 +08:00
tangziwen da8dc13601 avoid the case that "hasAmbient" use before assign 2014-12-03 16:00:52 +08:00
kaile.yin 9d49f82eb9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-12-03 16:00:32 +08:00
pipu 6d764bc2c8 Merge branch 'v3' into v3_flatbuffers 
Conflicts:
	tools/cocos2d-console
 2014-12-03 15:47:03 +08:00
pipu 6a64b867df Modify bugs that parse resource path for ButtonReader, CheckBoxReader, ImageViewReader, LayoutReader, LoadingBarReader, PageViewReader, ScrollViewReader, SliderReader 2014-12-03 15:24:21 +08:00
kaile.yin fd69a5efc3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
minggo 0d1baf4037 Merge pull request #9327 from samuele3hu/v3_manual_bindings 
Add more useful trace back info when got invalid arguments by calling functions
 2014-12-03 14:17:16 +08:00
minggo 77b5c40283 Merge pull request #9224 from pjc0247/v3 
fix C4129 warning
 2014-12-03 14:15:38 +08:00
minggo 4bee194a0b Merge pull request #9285 from huangshiwu/v3_drawpolygon 
DrawNode::drawPolygon refactor
 2014-12-03 14:06:48 +08:00
minggo 2e45d7d0d6 Merge pull request #9302 from samuele3hu/v3_test 
Fix some errors about cpp-tests and lua-tests
 2014-12-03 14:05:50 +08:00
minggo f13f649a7b Merge pull request #9306 from super626/v3 
refactor bundle
 2014-12-03 14:04:59 +08:00
pipu ec978905d7 Modify that load .csb file serialized by flat buffers 2014-12-03 10:54:16 +08:00
pipu fc97a3d0c6 Modify serialize property "value" of VisibleFrame 2014-12-02 16:11:46 +08:00
minggo 4d2ea40db0 Merge pull request #9265 from shrimpz/fix_label_crashed_on_android 
Fix label crashed on android #9255
 2014-12-02 15:48:10 +08:00
Wenhai Lin 1bfdd757a2 Fixed fail to play background music again after invoking stopBackgroundMusic 2014-12-02 15:03:26 +08:00
pipu 26a6c9a724 Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters 2014-12-02 12:30:34 +08:00
pipu 915449f77a Modify UICheckBox 2014-12-02 12:23:15 +08:00
pipu 1cbc0120be Merge branch 'v3' into v3_flatbuffers 2014-12-01 22:56:18 +08:00
pipu 22b044805c Add callback parse 2014-12-01 21:50:05 +08:00
pipu 57dbb214ca Modify that serialize "percent" default property for SilderReader 2014-12-01 19:58:48 +08:00
pipu 69729bcd65 Add that parse "color" in NodeReader 2014-12-01 16:27:21 +08:00
samuele3hu 1da44b0897 Add more useful trace back info when got invalid arguments by calling functions 2014-12-01 15:53:41 +08:00
zhounan 7ffc6f9784 Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters 2014-12-01 13:18:57 +08:00
pipu 584c7dc7c6 Delete that use protocol buffers 2014-12-01 12:46:29 +08:00
pipu 1447919be1 Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers 2014-12-01 11:49:11 +08:00
pipu 27261ddcc0 Modify NodeReader, ButtonReader, WidgetReader, TextReader, TextFieldReader 2014-12-01 11:48:04 +08:00
Park June Chul 9b792d97c4 Merge pull request #2 from cocos2d/v3 
update project
 2014-11-28 22:52:13 +09:00
samuele3hu 802ba311d6 Fix the error that SpritePerformanceTest lua does’t work 2014-11-28 11:54:38 +08:00
minggo 9894c738c1 Merge pull request #9294 from starwing/check_settexture 
nullptr check when Sprite::setTexture with non-exists file
 2014-11-28 10:19:01 +08:00
Ricardo Quesada fe4b34fcc3 Merge pull request #9260 from ricardoquesada/sprite_perf_test_automated 
Sprite Performance Test automation works OK
 2014-11-27 10:06:10 -08:00
CocosRobot f0c31172b8 [AUTO]: updating luabinding automatically 2014-11-27 13:39:15 +00:00
Dale Stammen 117d7bd5e8 fixed universal app project files for flatbuffers 2014-11-27 05:34:36 -08:00
Dale Stammen 267edeafd3 fixed wp8 project files for flatbuffers 2014-11-27 05:22:07 -08:00
Dale Stammen 301e947c37 no initialization list for WP8 2014-11-27 05:21:04 -08:00
StarWing d5125ae179 nullptr check when Sprite::setTexture with non-exists file 2014-11-27 21:15:09 +08:00
minggo dcc517e8d4 Merge pull request #9267 from samuele3hu/v3_strip 
Adjust binding structure to decrease the package size of lua_empty_test
 2014-11-27 20:21:06 +08:00
pipu 1633b7f475 Reset libcocos2d_8_1.Windows.vcxproj, libcocos2d_8_1.Windows.vcxproj.filters, libcocos2d_8_1.WindowsPhone.vcxproj, libcocos2d_8_1.WindowsPhone.vcxproj.filters 2014-11-27 20:02:03 +08:00
samuele3hu ed573149dd Resolve the project setting error on the platforms 2014-11-27 19:42:32 +08:00
zhangcheng 12a5443834 Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers 2014-11-27 18:34:18 +08:00
zhangcheng 0c89db7675 Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp 2014-11-27 18:32:35 +08:00
huangshiwu b866a58fc4 DrawNode::drawPolygon refactor 2014-11-27 18:31:04 +08:00
pipu 48f280b478 Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1 2014-11-27 18:27:22 +08:00
andyque 1bb60ab4bb add null pointer check, make code more robust 2014-11-27 18:25:13 +08:00
lvlong 82241a74dd fix bug: if the material's content that version 0.1 is empty. 2014-11-27 17:31:22 +08:00
pipu 5d3d839886 Update Android.mk for cocostudio 2014-11-27 17:28:20 +08:00
pipu ce3ca169d7 Modify that calls createNodeFromProtocolBuffers() for CSLoader 2014-11-27 17:23:22 +08:00
pipu e38da9f9b6 Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
pipu e1c287d500 Modify that parse "actionTag" for WidgetReader 2014-11-27 12:12:29 +08:00
Ricardo Quesada bfb79b6a9e CCRANDOM_() uses std::rand() because it can be seeded with std::srand() 
plus other minor fixes in perf tests
 2014-11-26 20:07:42 -08:00
Shrimpz 38a6aa30a2 * fixed android crash that a Label instance add to an invisibility parent node. 2014-11-27 10:59:47 +08:00
CocosRobot 36a5a170d2 [AUTO]: updating luabinding automatically 2014-11-27 02:55:33 +00:00
samuele3hu dc00158d72 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip 2014-11-27 10:44:56 +08:00
CocosRobot 3ed78b820e [AUTO]: updating luabinding automatically 2014-11-27 02:02:29 +00:00
minggo e8cff91bd7 Merge pull request #9248 from andyque/fixTextIgnoreContentSizeIssue 
Fix text ignore content size issue
 2014-11-27 09:57:33 +08:00
Ricardo Quesada 96e089be76 Sprite Performance Test automation works OK 2014-11-26 16:55:39 -08:00
Ricardo Quesada 1361f2c619 Director users a low-pass filter to display the FPS 
FPS is more stable. Uses a 5% low-pass filter
 2014-11-26 13:31:44 -08:00
samuele3hu 9fbf87c6db Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip 2014-11-26 21:59:57 +08:00
samuele3hu 222f2cbd51 Decrease the package size of lua_empty_test 2014-11-26 21:54:18 +08:00
minggo 51b4736740 Merge pull request #9149 from samuele3hu/v3_compile_binary 
Resolve the bugs that XmlHttpRequest would truncate binary data
 2014-11-26 20:05:21 +08:00
andyque e118b085b8 add UIText bug fix tests 2014-11-26 15:05:20 +08:00
minggo e93ff4f5b7 Merge pull request #8979 from Gamevy/bugfix/release-eaglview-on-ios 
eaglview release leak in CCEAGLViewImpl-ios
 2014-11-26 13:54:49 +08:00
minggo 4e84b4d4f6 Merge pull request #9130 from samael65535/patch-1 
Add shader linking log
 2014-11-26 13:51:15 +08:00
minggo d7de8a48a3 Merge pull request #9241 from dumganhar/iss8988-left-ctrl 
issue #8988: Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHTALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
 2014-11-26 13:47:36 +08:00
andyque a2883aa097 fix UIText dimension error when set ignoreContentSize to false 2014-11-26 13:41:24 +08:00
pipu 889f84e540 newest v3 flatbuffers 2014-11-26 13:29:23 +08:00
pipu 6b999d53f3 Modify that declare and definition that function return value of createNodeWithFlatBuffers() for all kinds of "NodeReader" 2014-11-26 11:50:42 +08:00
minggo 5d58ffc5ab Merge pull request #9212 from Dhilan007/v3-fontfnt-crash 
Fix crash when missing image resource of FNT font.
 2014-11-26 11:48:53 +08:00
minggo dbb473fdcb Merge pull request #9203 from dumganhar/arm64-juno 
Some updates for neon64 instruction
 2014-11-26 11:46:19 +08:00
yangxiao 35020c7c71 async task pool 2014-11-26 11:28:14 +08:00
CocosRobot 39c2c8a2cb [AUTO]: updating luabinding automatically 2014-11-26 03:20:28 +00:00
minggo 14bbaab0ba Merge pull request #9210 from Dhilan007/v3-physics-scale 
Reducing unnecessary function call
 2014-11-26 10:57:59 +08:00
minggo d90d9a6184 Merge pull request #9240 from CocosRobot/update_lua_bindings_1416970436 
[AUTO]: updating luabinding automatically
 2014-11-26 10:57:29 +08:00
CocosRobot 0f14dee924 [AUTO]: updating luabinding automatically 2014-11-26 02:56:12 +00:00
minggo 797db8109c Merge pull request #9215 from 2youyouo2/v3_setCurrentFrame 
fixed setCurrentFrame
 2014-11-26 10:54:23 +08:00
minggo 7f4cabcd9f Merge pull request #9216 from Dhilan007/v3-debugfix 
fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW
 2014-11-26 10:53:36 +08:00
minggo 1443c28558 Merge pull request #9230 from volzhs/v3 
Unnecessary set dirty of ui widget
 2014-11-26 10:50:38 +08:00
minggo 3d7c3257b0 Merge pull request #9238 from ricardoquesada/guideline_fixes 
Code conforms with the cocos2d-x c++ guidelines
 2014-11-26 10:49:58 +08:00
James Chen cebfed108c issue #8988: Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode. 2014-11-26 10:41:14 +08:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
Dale Stammen 2c8cb4b3bd updated Application::getCurrentLanguage to work on WP8 and Universal App 2014-11-25 11:21:56 -08:00
Dale Stammen fac9d2880f added missing OpenURL support for universal app 2014-11-25 10:05:02 -08:00
Dale Stammen 8da06fb9cc Merge branch 'v3' into v3-win8.1-appstate 2014-11-25 08:07:29 -08:00
Vladimir Timofeev a562c70c73 Merge remote-tracking branch 'origin/v3' into cmake-linux-mac-fixes 
* origin/v3:
  Update CHANGELOG
  Update AUTHORS
  fixed typo
  Updates definition of Complete.
  [AUTO][ci skip]: updating cocos2dx_files.json
  Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
  Skip binding nodeWithFlatBuffers of CSLoader for lua
 2014-11-25 15:24:07 +03:00
Haneol Park a6e4b31b0d Additional unnecessary set dirty of ui widgets 2014-11-25 20:42:03 +09:00
Haneol Park d25fdca4af Unnecessary set dirty of ui widget 2014-11-25 17:50:46 +09:00
Shrimpz ac666d1e6d fixed typo 2014-11-25 15:51:25 +08:00
wangqm0513 a6128d7506 Update MathUtilNeon64.inl 
Rewrite  CrossVec3 function code
 2014-11-25 10:33:16 +08:00
James Chen 528f24010b Workaround for missing __ctype_get_mb_cur_max function in ndk-r10c 2014-11-25 10:33:16 +08:00
James Chen 126f9eaff1 The fix for recognizing android arm64 device and using NEON64 for android arm64 device. 2014-11-25 10:33:15 +08:00
Park June Chul be60a33d25 fix C4129 warning 2014-11-25 04:52:44 +09:00
Ricardo Quesada 9e10d2d32b Revert "Merge pull request #9193 from pipu/v3_flatbuffers" 
This reverts commit fa22b12628, reversing
changes made to 8dce62b94c.
 2014-11-24 10:19:53 -08:00
Vladimir Timofeev 782e3bcd01 cmake: Add correct _POSIX_C_SOURCE and _BSD_SOURCE (linux) defines when build luasocket, so all types and func properly defined 2014-11-24 17:24:45 +03:00
Vladimir Timofeev 3dadcf4aea As we have --std=c99 in CMAKE_C_FLAGS, to expose some macros and functions we should declare feature-check-marco... 
Define _DARWIN_C_SOURCE should enable all mac os non standard extensions.
 2014-11-24 17:24:11 +03:00
minggo 97df35f346 Merge pull request #9207 from dumganhar/iss8984-remove-unused 
#8984: Removes unused codes in CCStdC-linux.cpp
 2014-11-24 18:48:05 +08:00
minggo fa22b12628 Merge pull request #9193 from pipu/v3_flatbuffers 
V3 flatbuffers
 2014-11-24 17:53:16 +08:00
Wenhai Lin d63474436b fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW 2014-11-24 17:21:14 +08:00
LinWenhai fa90897e5b remove unnecessary keyword 2014-11-24 16:27:42 +08:00
Dhilan007 7119a5855d Fix crash when missing image resource of FNT font. 2014-11-24 15:57:00 +08:00
Dhilan007 4bc4f43b28 Reducing unnecessary function call 2014-11-24 15:27:20 +08:00
James Chen 13b1c91785 Merge pull request #9208 from CocosRobot/update_lua_bindings_1416813762 
[AUTO]: updating luabinding automatically
 2014-11-24 15:27:11 +08:00
CocosRobot 7dc623fcab [AUTO]: updating luabinding automatically 2014-11-24 07:24:39 +00:00
minggo 74e7aa6db9 Merge pull request #9205 from Dhilan007/v3-scriptfix 
replace tab with four spaces
 2014-11-24 15:22:00 +08:00
minggo b8bb61c7c6 Merge pull request #9028 from andyque/fixWidgetFlipIssue 
Fix widget flip issue
 2014-11-24 15:19:50 +08:00
minggo 88c3cc2ad9 Merge pull request #9105 from Dhilan007/v3-video-web-fix 
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
 2014-11-24 15:15:18 +08:00
James Chen cb6d81599b #8984: Removes unused codes in CCStdC-linux.cpp 2014-11-24 15:01:57 +08:00
Dhilan007 4e769d40b1 replace tab with four spaces 2014-11-24 11:26:34 +08:00
kaile.yin 2a86677619 fixed setCurrentFrame 2014-11-24 10:49:22 +08:00
youyou 966100a511 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-24 10:35:51 +08:00
minggo 87f70cfaec Merge pull request #9113 from Dhilan007/v3-scriptfix 
fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING
 2014-11-24 10:09:19 +08:00
Dale Stammen 4557b2ed8b Merge branch 'v3' into v3-win8.1-appstate 2014-11-23 14:10:49 -08:00
minggo c46f1182f6 Merge pull request #9089 from wangqm0513/v3 
Update MathUtilNeon64.inl
 2014-11-22 09:21:04 +08:00
Dale Stammen fc09fa8798 Merge branch 'v3' into v3-win8.1-appstate 2014-11-21 16:27:01 -08:00
Dale Stammen a607d41454 implemented lostDevice support when app loses the directx device 2014-11-21 16:24:51 -08:00
Dale Stammen 32fe5d07ae fixed compiler warning. Don't use _filePath to check tga if it's length is 0 2014-11-21 16:23:54 -08:00
Ricardo Quesada 9fedb14354 Fixes for FileUtils 
compiles after previous patch
 2014-11-21 14:52:13 -08:00
Ricardo Quesada 0f268e7aaa Merge pull request #9176 from MSOpenTech/v3-winrt-accelerometer-fix 
Fixed accelerometer for windows store apps device orientation
 2014-11-21 11:50:08 -08:00
Bartosz Duszel fbd27dff9c changed few loops for C++11 range-based for loop 2014-11-21 20:12:55 +01:00
Dale Stammen 2a86c77066 added foreground, background, lostdevice support 2014-11-21 10:31:57 -08:00
Dale Stammen a5b1faa379 added winrt and wp8 support for EVENT_RENDERER_RECREATED 2014-11-21 10:00:34 -08:00
Dale Stammen 9bf15d424f added CC_PLATFORM_WINRT to enable CC_ENABLE_CACHE_TEXTURE_DATA 2014-11-21 09:52:33 -08:00
pipu 5d50a8ef92 Modify that initialize Color4B for WidgetReader 2014-11-21 19:36:20 +08:00
zhangcheng 32ce3dca2e 1, Update windows project. 2014-11-21 18:12:46 +08:00
pipu 6be17520c7 Config android, linux, wp8 2014-11-21 18:08:09 +08:00
pipu f3cb80d8f6 Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
Vladimir Timofeev 9dfa26e0ec Quick and dirty fix after my error. This defines fix build on linux with fresh gcc, but broke on mac 2014-11-20 23:20:02 +03:00
Dale Stammen ff172e0057 fixed accelerometer for windows store apps device orientation 2014-11-20 09:00:22 -08:00
Vladimir Timofeev 012a152406 Fix build of luasocket on linux 2014-11-20 13:49:59 +03:00
Vladimir Timofeev a689fc4c7e sync with upstream 
Conflicts:
	CMakeLists.txt
 2014-11-20 12:19:00 +03:00
Vladimir Timofeev 499c670a9b Move prebuilt libraries config to distinct file. 
Now build system looks more maintanable.
I test with mac, going to test with other platforms.

* All prebuilt libs config moved to
   cmake/Modules/CocosUsePrebuiltLibs.cmake
* Wrap plain find_package to our cocos_find_package. It will not try to
   call find_package if USE_PREBUILT_LIBS and <pkg>_FOUND set to true.
* Other small fixes.
 2014-11-20 12:05:15 +03:00
CocosRobot e52ee603ac [AUTO]: updating luabinding automatically 2014-11-20 03:41:28 +00:00
samael f60b6bbd91 Update CCGLProgram.cpp 
add shader linking log
 2014-11-20 11:41:16 +08:00
minggo 02ba67e17f Merge pull request #9082 from Teivaz/v3 
- Optimization in CCClippingNode.
 2014-11-20 11:35:42 +08:00
minggo 9fdd85a1be Merge pull request #9133 from pyrosphere/fix-wp8-back-key 
Fix Back Key behaviour and Director::getInstance()->end() on WP8
 2014-11-20 11:11:31 +08:00
minggo 2b107be24c Merge pull request #9158 from zhongfq/v3 
set default priority to avoid warning
 2014-11-20 11:07:01 +08:00
minggo 340e21d57e Merge pull request #9050 from joewan/fix-armature-spriteframe 
fix sprite frame cache, and remove unnecessary headers dependencies.
 2014-11-20 10:54:30 +08:00
Dale Stammen 5d2857b3c4 updated angle to commit 4a980d2612 2014-11-19 15:55:18 -08:00
youyou 769b2cbc75 add file to mac project 2014-11-19 20:06:10 +08:00
youyou 867c708ab3 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-11-19 19:35:23 +08:00
XiaoYang e68199b8bb Merge pull request #163 from lvlonggame/v3 
fix bug: read animation number by different version.
 2014-11-19 18:03:27 +08:00
lvlong 3b8fcd21eb fix bug: read animation number by different version. 2014-11-19 17:59:35 +08:00
yangxiao 460bc2bf08 move aabb calculation to bundle 2014-11-19 17:58:40 +08:00
tangziwen 0d43a8f337 add macro CC_MODEL_VIEWER 2014-11-19 17:01:34 +08:00
tangziwen 63fcdcebdd use dummy texture even if in release mode 2014-11-19 16:16:59 +08:00
Vladimir Timofeev 98db27e929 cmake linux fixes: FindFontconfig, find appropriate threads libs 2014-11-19 10:57:18 +03:00
joewanchen 7c4355c60d rename functions. 2014-11-19 15:27:55 +08:00
andyque caf9107a72 fix linux linker error 2014-11-19 15:18:15 +08:00
kaile.yin eb9646ee3d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-19 10:58:19 +08:00
kaile.yin d764c18271 update Android.mk 2014-11-19 10:57:22 +08:00
yangxiao fb638bdf94 Merge branch 'newcode' into v3 2014-11-19 10:12:05 +08:00
yangxiao eccfbe5c59 merge bundle modification 2014-11-19 10:09:30 +08:00
Vladimir Timofeev 2bf77c10e8 Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code. 2014-11-19 03:28:41 +03:00
Vladimir Timofeev fe25c860cb Fixes for freetype, protobuf and more unifications. Also it case of static library in some find* modules we try to use pkg-config first, it is chance to get dependency info 2014-11-19 00:27:25 +03:00
Vladimir Timofeev b0a6cf1182 Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS 2014-11-18 17:48:54 +03:00
Vladimir Timofeev ba2f74e76c Fix OpenAL include paths, cmake search include paths for case, when openal includes as "#include <al.h>" 2014-11-18 17:27:43 +03:00
Eric Zhong 36e44dbaf9 set default priority to avoid warning 
when call 'scheduleUpdate' and 'unscheuleUpdate' several times in one frame, it will get warning "warning: you CANNOT change update priority in scheduled function"
 2014-11-18 22:05:56 +08:00
lvlong a33bad7482 modify read animation. 2014-11-18 16:10:33 +08:00
samuele3hu 78ef234e8f Resolve the bugs that XmlHttpRequest would truncate binary data 2014-11-18 16:02:38 +08:00
Vladimir Timofeev d200bdcca0 fix Winmm linking 2014-11-18 10:07:11 +03:00
Vladimir Timofeev 28d7279cb0 remove unnneded includes and declarations 2014-11-18 10:06:45 +03:00
samuele3hu 02f46b46e3 Merge branch 'v3' of https://github.com/dantezhu/cocos2d-x into v3_compile_binary 2014-11-18 13:58:14 +08:00
Ricardo Quesada 71fec06a11 fixes indentation 2014-11-17 18:11:17 -08:00
Vladimir Timofeev 95e005d785 Find vorbis, mpg123 and OpenAL libs in unified way. 
Test another way to customize our prebuilt paths...
Cleanups.
 2014-11-18 01:46:41 +03:00
Vladimir Timofeev 731e982b2e Find OpenGL, GLEW and winmm library, improve finding of curl (use pkg-config first, this teoretically can find also dependant libs). 2014-11-17 23:44:16 +03:00
kaile.yin bbd971d910 create ActionTimelineNode 2014-11-17 21:05:20 +08:00
Vladimir Timofeev b5266e95bf mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still) 2014-11-17 01:42:04 +03:00
Vladimir Timofeev 1e8aeb7fd2 Minizip 
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
 2014-11-16 22:41:37 +03:00
Ricardo Quesada dcc4c46d5b Using std::swap instead of CC_SWAP 
CC_SWAP is deprecated. Use `std::swap` instead.
 2014-11-16 09:29:05 -08:00
Vladimir Timofeev e3a0e089ba Add FindFMODEX.cmake and use it on linux to find FMOD Ex library 2014-11-16 19:10:45 +03:00
Vladimir Timofeev 039005ef13 Unify protobuf finding and usage. 
But disable finding until bug with protobuf versions will be resolved.
 2014-11-16 15:29:24 +03:00
Vladimir Timofeev 33786678eb Add finding curl. Fix some leftovers from websockets. 2014-11-16 13:55:42 +03:00
Vladimir Timofeev c7bff5ea9e Find libwebsockets in unified way 2014-11-16 13:22:54 +03:00
Filipe Lemos 0898af21ab Fix Back Key behaviour and Director::getInstance()->end() on WP8 2014-11-16 10:16:16 +00:00
Vladimir Timofeev 1d629dfe7d Find libtiff 2014-11-16 12:47:59 +03:00
Vladimir Timofeev d9337cdbd3 Find libpng and zlib unified way. 2014-11-16 00:21:11 +03:00
Vladimir Timofeev 9334f0b569 Add custom FindJPEG.cmake module. 2014-11-15 21:16:39 +03:00
Vladimir Timofeev 673fdc461d Unify Box2D usage and finding (not compilable, may be fix that later...) 2014-11-15 17:46:13 +03:00
Vladimir Timofeev 27ef26270c Unify TinyXML2 usage. 
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
 2014-11-15 14:43:50 +03:00
Vladimir Timofeev eb0159b2b7 Unify usage of chipmunk library 
* cmake/Modules/FindChipmunk.cmake now can find prebuilt chipmunk libs
* follow USE_CHIPMUNK variable (although at the moment cocos can't build without chipmunk)
* come cleanups and formatting
 2014-11-15 13:17:23 +03:00
Vladimir Timofeev aaff42d6a9 Fix WebP usage. 
* Introduce config variable USE_WEBP (ON by default, but disabled for unsupported archs WINRT and WP8)
* Set CC_USE_WEBP define according to USE_WEBP variable
* add WebP include directories to search patch only for libcocos compilation (it not used in public headers)
 2014-11-15 11:31:10 +03:00
Vladimir Timofeev 53d23ce5f3 Unify WebP usage. 2014-11-15 10:27:56 +03:00
Vladimir Timofeev ddce662ec3 Unify usage of prebuilt libraries in cmake builds. 
* introduce config variable USE_PREBUILT_LIBS (default: ON). When OFF, cmake will not use prebuilt libs, only try find system installed libraries.
* FindGLFW3.cmake now search our prebuilt library (if USE_PREBULT_LIBS)
* FindFreetype.cmake also

This and next changes should simplify our CMakeLists.txt files and USE_PREBUILT_LIBS config allow external package developers to integrate cocos to their packaging system.
 2014-11-15 10:27:56 +03:00
samael 26b95d3dae add shader linking log 
add shader linking log
 2014-11-15 12:15:56 +08:00
Ricardo Quesada bc0c3d5a3f Merge pull request #9085 from jicheol-ryu/v3 
fix bug - potential memory leak.
 2014-11-14 14:17:13 -08:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00
Ricardo Quesada 9f8ed96681 Merge pull request #9121 from vovkasm/cmake-fix-glfw3-find 
This should fix and unify finding GLFW3 for all desktop archs.
 2014-11-14 11:29:33 -08:00
Ricardo Quesada 1b44f4b605 Merge pull request #9115 from vovkasm/win32-audioengine-mingw-fix 
Fix compile errors with recent mingw.
 2014-11-14 11:22:35 -08:00
minggo 6d08b33a68 Merge pull request #9107 from Dhilan007/v3-audio-includefix 
Remove unneeded include in AudioEngine.h
 2014-11-14 20:09:33 +08:00
Vladimir Timofeev 48108e548a Fix compile errors with recent mingw. 
Constify arguments to copy constuctors. Without this gcc fail to compile if classes used inside containers.
Error message is rather cryptic: " error: 'constexpr std::pair<_T1, _T2>::pair(const std::pair<_T1, _T2>&) [with _T1 = const int; _T2 = cocos2d::experimental::AudioPlayer]' declared to take const reference, but implicit declaration would take non-const"
 2014-11-14 10:52:17 +03:00
Vladimir Timofeev 5a833a1792 This should fix and unify finding GLFW3 for all desktop archs. 
Instead of using glfw3 on each required configuration, use it centralized way.
Add our prebuilt location to search paths, so FindGLFW3.cmake can find it also.
 2014-11-14 10:43:49 +03:00
Dhilan007 ac0fb68989 fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING 2014-11-14 15:04:32 +08:00
Ricardo Quesada 3bd466ce49 Merge pull request #9110 from martell/cmake 
Cmake fixes and build fixes
 2014-11-13 16:08:00 -08:00
Ricardo Quesada 2e3b2d9f28 Merge pull request #9080 from vovkasm/cmake-refactoring 
Cmake refactorings and fixes
 2014-11-13 15:42:47 -08:00
martell 3de4906797 Make use of options for cc builder, cc studio and spine 2014-11-13 23:25:21 +00:00
Dhilan007 f52c3e5a83 Remove unneeded include in AudioEngine.h 2014-11-13 22:02:28 +08:00
minggo 156be2e633 Merge pull request #9077 from super626/fixscene 
fix Scene::setScale does not work #9031
 2014-11-13 18:59:49 +08:00
minggo 906316df62 Merge pull request #8985 from samuele3hu/v3_new_spine 
Fix error that the type judgment of lua value would parse string —> int or int —> string
 2014-11-13 18:59:19 +08:00
minggo f753368246 Merge pull request #9017 from cpascal/fix_error_refleakdetection 
Fixed compile error with CC_REF_LEAK_DETECTION
 2014-11-13 18:56:46 +08:00
minggo 133d51cad1 Merge pull request #9026 from cpascal/fix_error_scriptbinding_off 
Fixed compile error with CC_ENABLE_SCRIPT_BINDING=0
 2014-11-13 18:53:40 +08:00
minggo 306518cebf Merge pull request #9035 from samuele3hu/v3_fix 
Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES in the Android.mk
 2014-11-13 18:49:44 +08:00
minggo d6eea4dc3c Merge pull request #9037 from G17hao/patch-8 
Update CCBone.cpp
 2014-11-13 18:46:48 +08:00
teivaz 2d75ceafb7 - set const modifier to ClippingNode::hasContent() 2014-11-13 12:43:05 +02:00
minggo d965062866 Merge pull request #9066 from cpascal/fix_bundlereader 
Fixed "warning: bundle reader out of range"
 2014-11-13 18:38:06 +08:00
Dhilan007 5a8ac8f151 Fix WebView and VideoPlayer in wrong place on Android 2.3.x 2014-11-13 18:15:41 +08:00
minggo 63f2f8da76 Merge pull request #9092 from zawasp/touch-callbakcs 
define touch callback types
 2014-11-13 18:07:39 +08:00
minggo 222adb22dd Merge pull request #9104 from super626/camera 
add comments to camera and scene
 2014-11-13 18:04:44 +08:00
yangxiao d50670af4b add comment to camera and scene 2014-11-13 17:30:49 +08:00
minggo ee31273fa5 Merge pull request #9088 from Dhilan007/v3-audio-Lollipop 
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() freeze on Lollipop
 2014-11-13 16:02:40 +08:00
LinWenhai 48f1bd62d7 remove unrelated modification 2014-11-13 15:43:39 +08:00
minggo c64ee1b4b8 Merge pull request #9090 from wangqm0513/patch-1 
Update TouchesJni.cpp
 2014-11-13 15:22:35 +08:00
minggo 68cb1d6c6a Merge pull request #9096 from Dhilan007/v3-label-i9095 
Fix Label may display incomplete for multiline text with outline feature enabled.
 2014-11-13 15:12:20 +08:00
samuele3hu a3dbd010db Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-11-13 13:42:46 +08:00
Dhilan007 249d34b707 fix AudioEngine can't looping audio on Android 2.3.x 2014-11-13 11:28:08 +08:00
LinWenhai a37549d7bc Update Cocos2dxMusic.java 2014-11-13 11:00:29 +08:00
samuele3hu 1d1d004c3a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-11-12 17:46:13 +08:00
Dhilan007 e071e5c896 Fix Label may display incomplete for multiline text with outline feature enabled. 2014-11-12 17:24:35 +08:00
wangqm0513 9415b2b930 Update TouchesJni.cpp 
fixed gamelist can't pull by mouse.
 2014-11-12 14:21:48 +08:00
wangqm0513 e8d24cb49b Update MathUtilNeon64.inl 
add arm64bit  neon support
 2014-11-12 14:15:29 +08:00
Dhilan007 76c9accec9 Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop 2014-11-12 13:01:47 +08:00
jicheol-ryu c94a9ea01a fix bugs - potential memory leak. 
const std::string text = std::string((char*)ch,0,len); is using next
string constructor.
string (const string& str, size_t pos, size_t len = npos);
memory leak can occur while type converting char to string.

So we have to use next string constructor.
string (const char* s, size_t n);

http://www.cplusplus.com/reference/string/string/string/
 2014-11-12 00:06:30 +01:00
teivaz 7c355a087b - Optimization in CCClippingNode. 
Disable visiting when no objects has to be drawn under stencil.
 2014-11-11 21:09:58 +02:00
Mircea Rila a643f05330 add touch callback types 2014-11-11 18:00:34 +02:00
Vladimir Timofeev 8910b962a0 cmake: 
- fix Audio engine build on Mac
- remove duplicated defintions of _EXPORT_DLL_
 2014-11-11 10:30:48 +03:00
Vladimir Timofeev dba8ef33bd cmake: connect mac specific UIEditBox implementation to build 2014-11-11 10:30:48 +03:00
Vladimir Timofeev 0059c93757 cmake: protobuf should be linked with cocos2d.a in every platform (not only on linux) 2014-11-11 10:30:48 +03:00
minggo 6c67c6921d Merge pull request #8977 from pipu/v3_Modify_TextReader 
Modify that parsing attribute "fontName" of TextReader
 2014-11-11 12:05:49 +08:00
dantezhu e8d234a32a fix lua http download binary data's bug 2014-11-10 17:11:30 +08:00
yangxiao 6ecb9a7b04 fix #9031 2014-11-10 12:48:42 +08:00
CocosRobot a908c391b0 [AUTO]: updating luabinding automatically 2014-11-09 15:33:08 +00:00
minggo 8476956ef9 Merge pull request #9057 from andyque/fixScale9FlipIssueNew 
fix scale9sprite flip issue
 2014-11-09 23:27:40 +08:00
minggo e7d5e79e88 Merge pull request #8998 from aeonmine/v3 
fix memory leak cocos studiov2.0 engine v3.3
 2014-11-09 23:24:16 +08:00
cpascal 74ba46f225 Fixed "warning: bundle reader out of range" 
This warning was displayed even if it's valid c3b file..
Changed "validLength <= needLength" to "validLength < needLength".
 2014-11-09 07:38:44 +09:00
Xavier Arias Botargues dd25ff7a39 Fixed retina/contentScale position errors for iPhone 6+ devices in EditBox. 
Problem is that factor was 1.0 or 2.0 until iOS 8 introduced 3.0.
 2014-11-07 12:08:31 +01:00
joewanchen c4b1aeb0ec fix momery leak (partly fix, memory leak still exist). 2014-11-07 11:43:55 +08:00
andyque 9c3c693a21 refactor Widget flip logic 2014-11-07 11:11:51 +08:00
andyque 5483bc834d fix scale9sprite flip issue 2014-11-07 11:09:22 +08:00
CocosRobot aae2fd9e2a [AUTO]: updating luabinding automatically 2014-11-07 02:38:01 +00:00
minggo db659107d3 Merge pull request #9052 from huangshiwu/v3_fixbug 
fix ui crash bug caused by DrawNode
 2014-11-07 10:33:08 +08:00
minggo 3b8ddf1b54 Merge pull request #9005 from joshuastray/add-resource-folder-def 
Update CCFileUtils-linux.cpp
 2014-11-07 10:25:14 +08:00
joewanchen b05f558214 fix compile error. 2014-11-07 10:14:07 +08:00
huangshiwu ace9933d72 fix ui crash bug caused by DrawNode 2014-11-07 10:05:29 +08:00
joewanchen b682438b68 revert some modifications. 2014-11-07 09:17:32 +08:00
joewanchen c2b97a3b13 fix sprite frame cache, and remove unnecessary headers dependencies. 
we should add private headers for ccs, do not expose privae headers to users.
 2014-11-07 09:13:59 +08:00
Ricardo Quesada 3d448e86ef fixes some compiler warnings 
don't call deprecated functions
 2014-11-06 12:25:55 -08:00
G17hao c7f5c3052d Update CCBone.cpp 
fix the bone disorderly flying
http://www.cocoachina.com/bbs/read.php?tid-220321-keyword-%C2%D2%B7%C9.html
 2014-11-06 17:51:19 +08:00
samuele3hu 76ab86674e Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android 2014-11-06 14:32:03 +08:00
XiaoYang 5deaccda29 Merge pull request #153 from songchengjiang/new_v3 
Read AABB Info From Model File(obj/c3t/c3b)
 2014-11-06 12:47:37 +07:00
songchengjiang ce46773dd7 optimization 2014-11-06 10:37:32 +08:00
songchengjiang e9c0249f9d change include path 2014-11-06 09:38:16 +08:00
cpascal 3dcce59e84 Fix error with CC_ENABLE_SCRIPT_BINDING=0 
There are too much compile error if I set EE_ENABLE_SCRIPT_BINDING=0.

CCEventTouch and CCTouch related things...
This is temporary fix... Many source/header files must be patched for
the right way..
 2014-11-06 07:20:41 +09:00