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

5517 Commits

Author SHA1 Message Date
huangshiwu 77bc3a0e60 GLView modefy additional 2014-08-11 16:55:23 +08:00
minggo e0ef4d16d3 Merge pull request #7724 from cpascal/fix_ime 
Fix a correct onGLFWCharCallback
 2014-08-11 16:18:59 +08:00
minggo ec1864cb7a Merge pull request #7731 from dabingnn/v3_add_CC_DLL_For_cocos2dVersion 
add missed CC_DLL for cocos2dVersion function
 2014-08-11 16:18:31 +08:00
huangshiwu 1177b0d545 CCGLView modefy 2014-08-11 16:15:02 +08:00
andyque 3e1f7119f9 add virtual destructor 2014-08-11 15:54:40 +08:00
Huabing.Xu 5086758063 add missed CC_DLL for cocos2dVersion function 2014-08-11 15:50:48 +08:00
minggo b34e97cfd6 Merge pull request #7729 from andyque/fixCascadedColor 
fixed Widget's Children reload textures change RGBA issue
 2014-08-11 15:33:36 +08:00
andyque cdb2b9f59f fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
minggo 43a3603a8b Merge pull request #7720 from samuele3hu/v3_module 
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
 2014-08-11 15:01:28 +08:00
minggo 3704800fa5 Merge pull request #7728 from super626/v3_merge 
Fix Camera
 2014-08-11 14:59:31 +08:00
Huabing.Xu c1a71453d5 Merge branch 'v3_renderPrimitive' into v3 2014-08-11 14:39:16 +08:00
Huabing.Xu 031efaf242 Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3 2014-08-11 14:37:43 +08:00
Huabing.Xu 6aff707eab windows work now for renderPrimitive 2014-08-11 14:18:07 +08:00
yangxiao fd314261b7 Merge branch 'newcode' into obb 2014-08-11 13:21:44 +08:00
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
Huabing.Xu 2a28744dc5 Merge branch 'v3' into v3_renderPrimitive 2014-08-11 12:48:23 +08:00
yangxiao 6d15c26a61 move create default camera to Scene::initWithSize 2014-08-11 10:55:14 +08:00
lvlong c592ac4248 for pull request modify!! 2014-08-11 10:40:34 +08:00
minggo 0f942d3417 Merge pull request #7719 from boyu0/physics_bitmask_fix 
fix PhysicsBody bitmask bug.
 2014-08-11 10:35:06 +08:00
samuele3hu 47c034af5d Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure 2014-08-11 10:25:40 +08:00
yangxiao 2576622778 move create camera to Scene::initWithSize 2014-08-11 10:07:23 +08:00
minggo 437257e7e6 Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity 
Let Widget class don't support cascaded opacity and cascaded color on default.
 2014-08-11 09:37:51 +08:00
CocosRobot 3d222ab73a [AUTO]: updating luabinding automatically 2014-08-11 01:31:04 +00:00
cpascal 5e1570e36e Fix a correct onGLFWCharCallback 2014-08-10 01:42:21 +09:00
jimmystar 63c9780c49 Update CCScene.cpp 
in line 157, here need to create  and add camera, if not ,in the function createWithPhysics, will show black screen.
 2014-08-09 17:37:18 +08:00
yangxiao 53c143c679 remove normalize 2014-08-09 00:02:40 +08:00
yangxiao 73a0b7701d remove normalize 2014-08-09 00:02:19 +08:00
lvlong 8101e2ff1a 1. move drawnode3d to Sprite3DTest 
2. add getAABB to sprite3D and mesh
 2014-08-08 17:54:39 +08:00
samuele3hu 2dacbf6f26 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-08 16:59:33 +08:00
bo yu 517b26e343 fix typo 2014-08-08 16:56:48 +08:00
boyu0 ee3a8da13c fix PhysicsBody bitmask bug. 2014-08-08 16:38:20 +08:00
yangxiao ceb6549ec8 merge cocos2d 2014-08-08 16:25:52 +08:00
samuele3hu 8919ebc011 Add build all lualibs target for iOS and Mac 2014-08-08 16:08:24 +08:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
yangxiao1 61eaa082a2 fix windows 2014-08-08 15:33:30 +08:00
samuele3hu 6aa667c912 Add CC_DLL for FontFNT 2014-08-08 15:22:43 +08:00
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
lvlong fe58c43b2d add abb and obb to vc2012-project 2014-08-08 14:06:54 +08:00
minggo c5851f988b fix conflict 2014-08-08 14:04:38 +08:00
Huabing.Xu be4bcf7c36 add init value for flag 2014-08-08 13:47:50 +08:00
minggo 29888b9d74 Merge pull request #7705 from zii/patch-1 
让replaceScene更安全
 2014-08-08 12:03:48 +08:00
minggo 3ccce066b0 Merge pull request #7712 from andyque/testLoadingBar 
fixed loadingBar change direction affect position issue
 2014-08-08 11:57:28 +08:00
yangxiao 911144b720 wrong parameter for visit 2014-08-08 11:52:40 +08:00
yangxiao 4dce59582b visiting camera 2014-08-08 11:49:59 +08:00
minggo 800ab18457 Merge pull request #7700 from GavinThornton/patch-1 
Update CCSpriteBatchNode.cpp
 2014-08-08 11:49:39 +08:00
minggo 2a7e3dced8 Merge pull request #7711 from CocosRobot/update_lua_bindings_1407466030 
[AUTO]: updating luabinding automatically
 2014-08-08 11:49:14 +08:00
minggo b9e84370f6 Merge pull request #7699 from huangshiwu/v3_wp8fix 
V3 wp8fix
 2014-08-08 11:49:02 +08:00
andyque d00e3349a3 fixed loadingBar change direction affect position issue 2014-08-08 11:17:17 +08:00
lvlong 28769c9b15 add obb sample 2014-08-08 11:16:33 +08:00
CocosRobot aa68a63757 [AUTO]: updating luabinding automatically 2014-08-08 02:49:17 +00:00
huangshiwu 6ce16546b5 winrt compile fix -addtional 2014-08-08 10:47:14 +08:00
minggo 2f638c67fd Merge pull request #7598 from AppleJDay/master 
Add Feature :EventMouse should support getDelta, getDeltaX, getDelt...
 2014-08-08 10:43:32 +08:00
samuele3hu 201b33b465 Set intermediate directory for related lua bindings projects on win32 platform 2014-08-08 09:40:13 +08:00
yangxiao 9471b572f7 add to cocos2d.h 2014-08-08 00:05:02 +08:00
yangxiao 813e954f4e aabb, obb 2014-08-08 00:00:58 +08:00
gin0606 2ca881287f CCRANDOM macro use ccRandom 2014-08-07 21:17:41 +09:00
gin0606 5349aa7efb Add ccRandom.h 2014-08-07 21:17:36 +09:00
huangshiwu 8ee4340db3 fix winrt complie error 2014-08-07 18:38:11 +08:00
zii 212e059917 让replaceScene更安全 
如果可以这样的话 就不用担心用runWithScene还是replaceScene了. 可以省略getRunningScene判断.
 2014-08-07 18:34:21 +08:00
Huabing.Xu e7e94ffe70 add const constrain for getVertexData() and getIndexData() 2014-08-07 17:59:36 +08:00
Huabing.Xu 274140fbf8 linux work now 2014-08-07 02:35:04 -07:00
yangxiao 1e15131b2b simplify code 2014-08-07 16:24:44 +08:00
samuele3hu 53eb0345a5 Remove useless library for cocos2d_lua_bindings 2014-08-07 16:15:42 +08:00
yangxiao 34f6368ff7 change function to const 2014-08-07 15:57:15 +08:00
Huabing.Xu 9891f438ba change copyright 2014-08-07 15:53:20 +08:00
Huabing.Xu ba2ae6826c Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive 2014-08-07 15:36:41 +08:00
yangxiao 579ae882e3 add to cocos2d.h 2014-08-07 15:33:23 +08:00
GavinThornton 8cc5e66e73 Update CCSpriteBatchNode.cpp 
Setting opacity of a sprite (via setOpacity or FadeOut/In action) has the sprite turning black, it should simply be opaque.  

Cause is in bool SpriteBatchNode::initWithTexture, third line, "if(tex->hasPremultipliedAlpha())" 
Fix is making it "!if(!tex->hasPremultipliedAlpha())"
 2014-08-07 00:31:33 -07:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
Huabing.Xu 9978065d00 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive 2014-08-07 15:13:47 +08:00
samuele3hu 3c31af4523 Update CMakeLists.txt for storage 2014-08-07 15:07:29 +08:00
Huabing.Xu 16842b4a69 android work now, add shadowBuffer to recreate VBO 2014-08-07 14:15:49 +08:00
huangshiwu b7aa046cd2 wp8 compile fix -additional 2014-08-07 14:09:22 +08:00
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
 2014-08-07 14:02:50 +08:00
samuele3hu aa4f407851 extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +08:00
huangshiwu 0016c7af70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix 2014-08-07 11:58:01 +08:00
huangshiwu 24d68305e1 WP8 compile fix 2014-08-07 11:56:28 +08:00
minggo 1ece703945 Merge pull request #7694 from CocosRobot/update_lua_bindings_1407379142 
[AUTO]: updating luabinding automatically
 2014-08-07 10:56:04 +08:00
minggo a7d5b7af56 Merge pull request #7691 from Dhilan007/v3 
fixed can's set outline color for system font correctly on IOS.
 2014-08-07 10:52:59 +08:00
CocosRobot 91b297b085 [AUTO]: updating luabinding automatically 2014-08-07 02:40:46 +00:00
minggo 7b11c6a74e Merge pull request #7237 from martell/v3 
Cmake update and remove old scripts from build folder
 2014-08-07 10:36:10 +08:00
minggo 4542b1882d Merge pull request #7617 from rny/SpriteFrameCache 
SpriteFrameCache load from plist file content data
 2014-08-07 10:20:36 +08:00
Dhilan007 9da4ba14f5 fixed can's set outline color for system font correctly on IOS. 2014-08-07 10:04:29 +08:00
martell b71e0cde3a Fix libaudio.a outpur directory 2014-08-06 15:45:27 +01:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
CocosRobot f47d11cce0 [AUTO]: updating luabinding automatically 2014-08-06 09:14:13 +00:00
minggo 7a833d66d1 Merge pull request #7676 from samuele3hu/v3_module 
Split luabindings into serval modules and adjust project settings of test cases
 2014-08-06 17:09:12 +08:00
andyque ab33e6f9a2 Let Widget class don't support cascaded opacity and cascaded color on default. 2014-08-06 16:21:00 +08:00
Huabing.Xu 64c2ede765 IOS work now 
reset binding buffer to 0 after drawing
 2014-08-06 15:46:35 +08:00
samuele3hu 497847f7e8 Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files. 2014-08-06 14:46:30 +08:00
minggo 6ee0c4171f Merge pull request #7622 from rny/LabelTTF 
fix LabelTTF::getBoundingBox() position error
 2014-08-06 14:33:28 +08:00
minggo f786190349 Merge pull request #7652 from zhiqiangxu/labelbmfont_getboundingbox 
bug fix for LabelBMFont::getBoundingBox()
 2014-08-06 14:28:52 +08:00
minggo 187dc29f6d Merge pull request #7679 from andyque/fixComponentContainerRemoveIssue 
add safe guard when remove component from node componentContainer
 2014-08-06 14:21:49 +08:00
samuele3hu 9912b596f8 Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake 2014-08-06 13:51:46 +08:00
andyque e2e8325f58 add safe guard when remove component from node componentContainer 2014-08-06 13:51:16 +08:00
Kenichi Hamada 771996f9f3 Added a function getAssetManager() on CCFileUtilsAndroid 2014-08-06 13:36:04 +09:00
minggo 9f51adfafa Merge pull request #7461 from joshuastray/fix_constructor_access 
fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS
 2014-08-06 10:15:02 +08:00
samuele3hu 63b3f838b6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 09:56:07 +08:00
minggo e43b05955f Merge pull request #7674 from darkdukey/patch-12 
Fix opacity for Slider
 2014-08-06 09:50:47 +08:00
minggo 16653bf24e Merge pull request #7675 from darkdukey/chore/reuse-file-utils-for-video-path 
Chore/reuse file utils for video path
 2014-08-06 09:41:28 +08:00
Nite Luo 0a2afe983c Fix spacing 2014-08-05 17:56:55 -07:00
Nite Luo 9f34a5c0f2 Fix build for ios 2014-08-05 17:53:15 -07:00
Nite Luo ac20f51f7b Fix formatting 2014-08-05 16:53:00 -07:00
Nite Luo e0855d64df Merge branch 'v3' into patch-12 
Conflicts:
	cocos/ui/UISlider.cpp
 2014-08-05 16:51:02 -07:00
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 2014-08-06 00:37:19 +08:00
samuele3hu 6f763917a7 Delte liblua project for win32 and adjust cocos2d-win32 project 2014-08-06 00:26:02 +08:00
samuele3hu 4d4d5374df Delete Android.mk for cocos_lua_static 2014-08-06 00:18:56 +08:00
samuele3hu 99c52f0102 Split module for Linux on Lua and adjust related test cases 2014-08-06 00:15:44 +08:00
David Partouche 118d4d39f0 Fixed the video player not showing on iOS if it's not in FullScreen mode 2014-08-05 16:07:28 +02:00
samuele3hu d86a37110d Split module for win32 and adjust related test cases 2014-08-05 19:46:13 +08:00
Huabing.Xu b1954ef516 clean up primitive code 2014-08-05 17:49:35 +08:00
Huabing.Xu 01b69c9e4f Merge branch 'v3' into v3_migrateFastTMX 2014-08-05 17:30:11 +08:00
Huabing.Xu 7353f036db Merge branch 'v3' into v3_addNewAttribFlag 2014-08-05 15:23:14 +08:00
Huabing.Xu 7fbd81aeca add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib 2014-08-05 15:15:17 +08:00
Huabing.Xu 56551e6787 fast_tmx migrate to primitive command 2014-08-05 15:08:01 +08:00
minggo 1bad9ddbc2 Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr 
V3 wp8glviewhookpr
 2014-08-05 13:51:15 +08:00
CocosRobot 24da61e443 [AUTO]: updating luabinding automatically 2014-08-05 05:35:12 +00:00
minggo cd98034f16 Merge pull request #7631 from maltium/v3 
added 3D rotation support to the RotateTo action
 2014-08-05 13:30:43 +08:00
samuele3hu da18657f4f Add module Android.mk config and adjust related test cases 2014-08-05 13:29:54 +08:00
CocosRobot f3e2ebf215 [AUTO]: updating luabinding automatically 2014-08-05 03:57:51 +00:00
CocosRobot 8dd1be5172 [AUTO]: updating luabinding automatically 2014-08-05 02:05:02 +00:00
minggo cc75a8e860 Merge pull request #7632 from super626/v3 
SubMesh and AttachMement
 2014-08-05 09:59:38 +08:00
minggo 6d09b00e1d Merge pull request #7649 from andyque/fixPotentialCarshWhenRemoveSelfInCallback 
fix potential crash when user remove self in widgets callback
 2014-08-05 09:46:00 +08:00
minggo 34a0603a52 Merge pull request #7658 from andyque/fixButtonOpacityIssue 
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled
 2014-08-05 09:39:13 +08:00
minggo 007e42faa0 Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak 
Fix iOS VideoPlayer memory leak.
 2014-08-05 09:30:52 +08:00
andyque f44906d56c fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property 2014-08-05 08:11:37 +08:00
Huabing.Xu f7ad98b15b using primitve->draw in Fast_tmx on draw 2014-08-04 17:57:31 +08:00
Huabing.Xu 95a8b23d64 fix draw bug in primitive when using indices 2014-08-04 17:56:56 +08:00
huangshiwu 9c87522199 little more modefy 2014-08-04 17:34:50 +08:00
Huabing.Xu a0d1b0dad8 allow null index buffer when create primitive 2014-08-04 17:21:23 +08:00
samuele3hu cd0c82f8b7 Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates 2014-08-04 17:11:57 +08:00
Huabing.Xu 2dca0a4809 remove IndexData class 2014-08-04 17:00:08 +08:00
huangshiwu 9a3f231771 merge v3 into v3_wp8glviewhookpr 2014-08-04 16:49:42 +08:00
Huabing.Xu 414d67851f add _vertexBuffer back in Fast_tmx 2014-08-04 16:36:20 +08:00
minggo 93ee009366 Merge pull request #7656 from zii/v3 
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
 2014-08-04 16:30:41 +08:00
Huabing.Xu bbf11f5d06 refactor vertex data 
using vertex data in fast_tmx
 2014-08-04 16:08:54 +08:00
yangxiao 8ffd0fe16e spelling error 2014-08-04 16:07:16 +08:00
yangxiao 4084fdc461 add new file to cmake 2014-08-04 15:49:12 +08:00
yangxiao 11a13ce9e2 Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
minggo 5deb273486 Merge pull request #7644 from 2youyouo2/v3 
update ActionTimeline
 2014-08-04 15:35:35 +08:00
samuele3hu e5f9c1b488 Adjust common script and related test cases 2014-08-04 15:22:07 +08:00
zii 20c43e5684 Update ccUtils.h 2014-08-04 15:21:10 +08:00
zii 7659a1623f Update ccUtils.h 2014-08-04 15:20:45 +08:00
zii e151795c43 Update ccUtils.cpp 2014-08-04 15:18:01 +08:00
yangxiao 47838ce945 reset 2014-08-04 14:37:26 +08:00
yangxiao 01e0192a2d reset 2014-08-04 14:29:55 +08:00
huangshiwu efcb8b9962 wp8 glview hook solution 1 2014-08-04 14:17:14 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
zii 825209dd04 Update ccUtils.cpp 2014-08-04 11:48:23 +08:00
zii 97f06306e3 Update ccUtils.cpp 
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
 2014-08-04 11:45:50 +08:00
Huabing.Xu a44f4c95e1 using indexBuffer instead of raw VBO 2014-08-04 10:40:07 +08:00
samuele3hu 6f4cafcc1b Add module register functions and adjust iOS and Mac test cases 2014-08-04 09:39:42 +08:00
huangshiwu 372479d812 wp8 GLView Hook 2014-08-02 16:31:16 +08:00
xuzhiqiang 85dd898319 bug fix 2014-08-02 08:04:29 +08:00
andyque d7b17c598d fix potential crash when user remove self in widgets callback 2014-08-01 20:58:42 +08:00
Huabing.Xu 3d4bfe7780 using VertexBuffer instead of raw buffer 2014-08-01 17:50:22 +08:00
AppleJDay b736202a55 replace tab to spaces. Fix compile error of UIRichTextTest.cpp in windows visual studio vs2013. 2014-08-01 17:37:30 +08:00
AppleJDay 2239fafade Merge branch 'v3' of github.com:AppleJDay/cocos2d-x 2014-08-01 17:22:43 +08:00
CocosRobot fda11428bf [AUTO]: updating luabinding automatically 2014-08-01 07:53:19 +00:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
Huabing.Xu f269d7345e original version of PrimitiveCommand 2014-08-01 14:46:35 +08:00
kaile.yin 3dcdb1cde4 remove some update condition of Frame::apply function 2014-08-01 14:40:42 +08:00
CocosRobot 26c76f5cf1 [AUTO]: updating luabinding automatically 2014-08-01 04:02:13 +00:00
minggo 0b6254d095 Merge pull request #7587 from dzl-ian/fixTextWidgetColor 
Add getter and setter for TextColor to Text Widget
 2014-08-01 11:57:10 +08:00
kaile.yin d1407ca929 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-01 11:42:18 +08:00
AppleJDay bcecf09b6c Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git 2014-08-01 09:18:22 +08:00
maltium baba808391 RotateBy action now uses just Vec3() to keep track of the state 2014-07-31 23:28:33 +02:00
maltium 98354e9f8e RotateTo action now uses Vec3() to keep track of the state 2014-07-31 23:05:58 +02:00
yangxiao 52d3c4461f adjust 2014-07-31 20:20:29 +08:00
yangxiao 7562214c63 adjust 2014-07-31 20:19:43 +08:00
yangxiao 342dc05890 adjust 2014-07-31 20:17:51 +08:00
yangxiao 4aec1d37c8 code adjust 2014-07-31 20:14:43 +08:00
yangxiao e03d284e26 merge cocos2d 2014-07-31 18:55:41 +08:00
yangxiao 49052ab28d code adjust 2014-07-31 18:42:58 +08:00
yangxiao ca0afcfa92 add Quaternion::ZERO 2014-07-31 18:36:30 +08:00
yangxiao 17304b4775 add comment 2014-07-31 18:28:52 +08:00
yangxiao 780914687e code style adjust according minggo 2014-07-31 18:14:01 +08:00
kaile.yin 2fc082cac1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-31 17:52:49 +08:00
samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini
 2014-07-31 17:52:22 +08:00
zhangbin d224c77bd4 Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. 2014-07-31 17:51:06 +08:00
kaile.yin 170e1a5d7b init widget properties 2014-07-31 17:48:45 +08:00
minggo d44a359a1f Merge pull request #7635 from samuele3hu/v3_new_module 
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
 2014-07-31 17:39:01 +08:00
samuele3hu 2b562ace1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-07-31 17:22:33 +08:00
minggo 2851bd9193 Merge pull request #7627 from andyque/fixScale9Sprite 
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
 2014-07-31 16:58:56 +08:00
samuele3hu ee4e479ce1 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-07-31 15:22:46 +08:00
samuele3hu 9666f1ad7f Split luabindings module to some independent modules 2014-07-31 15:20:23 +08:00
Huabing.Xu a5add07fb5 Merge branch 'v3' into v3_renderPrimitive 2014-07-31 14:31:24 +08:00
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget 
add target to build All target
 2014-07-31 14:25:37 +08:00
songmiao 58c32e52c7 windows works 2014-07-31 14:08:05 +08:00
Huabing.Xu dfee337db1 original version of Primitive 2014-07-31 13:52:39 +08:00
CocosRobot 095d4ed3c5 [AUTO]: updating luabinding automatically 2014-07-31 05:49:25 +00:00
minggo a77b8e7320 Merge pull request #7608 from andyque/fixTextFieldUtf8Issue 
add utf8 support for TextField widget
 2014-07-31 13:41:57 +08:00
yangxiao f6ad1df092 android work 2014-07-31 11:47:47 +08:00
andyque 1de2b78d61 refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
yangxiao 38c86f7697 skeleton retain 2014-07-31 10:57:19 +08:00
yangxiao 2c29560514 add CC_DLL 2014-07-31 10:28:39 +08:00
yangxiao 44c501ca2a merge cocos2d 2014-07-31 09:56:23 +08:00
maltium 3d44439e2a added 3D rotation support to the RotateTo action 2014-07-30 21:42:47 +02:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
yangxiao 9f1cfbfca5 add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
andyque 03368d42f2 refactor, improve imageView stability 2014-07-30 17:29:22 +08:00
andyque e6b85fbd77 fix minor bugs of UISlider and remove unused header include in ListView 2014-07-30 16:55:16 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
andyque 83298171d9 refactor Layout 2014-07-30 16:33:37 +08:00
Ningyu d53cdc39df tab to spaces 2014-07-30 16:20:58 +08:00
Ningyu 52ca596b3d code tidy 2014-07-30 16:19:05 +08:00
andyque 7bcb31f225 refactor loadingBar 2014-07-30 16:08:29 +08:00
andyque c5d2585049 refactor Slider control 2014-07-30 15:52:27 +08:00
Huabing.Xu 99eed6a0be finish index data 2014-07-30 15:51:41 +08:00
andyque 6492167974 refactor ImageView 2014-07-30 15:27:18 +08:00
andyque a6e376f93c refactor UIButton 2014-07-30 15:19:39 +08:00
Huabing.Xu 23406c6463 Merge branch 'v3' into v3_renderPrimitive 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-07-30 15:09:25 +08:00
Huabing.Xu 428e9b1b1a Merge branch 'v3' into v3_buildAllTarget 2014-07-30 14:12:28 +08:00
Ningyu 61a87e7e8b fix LabelTTF::getBoundingBox() position error 2014-07-30 14:00:01 +08:00
andyque f2b0528cc9 refactor 2014-07-30 10:45:35 +08:00
andyque e7da7b3e42 change unsigned long to size_type 2014-07-30 10:34:37 +08:00
andyque 7abea5dc58 add utf8 support for UITextField 2014-07-30 10:34:37 +08:00
andyque 955da5d3cc move utf8_substr to ui::helper class. 2014-07-30 10:34:37 +08:00
andyque 4a40604955 refactor getScale9Enabled to isScale9Enabled 2014-07-30 10:31:40 +08:00
Huabing.Xu d86cc0a811 decouple libcocos2d and cocosdenshion 2014-07-29 18:08:40 +08:00
andyque 5a22636441 fix windows compile error 2014-07-29 17:51:34 +08:00
Ningyu aebe8317bd spaces 2014-07-29 17:22:13 +08:00
Ningyu d5242ef4fa add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 17:06:43 +08:00
Ningyu 23e0ed3767 add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 16:58:33 +08:00
gin0606 ef4852b7ec Fix iOS VideoPlayer memory leak. 2014-07-29 17:56:03 +09:00
andyque c5ca0dbf10 fix android and linux compile error 2014-07-29 16:24:27 +08:00
andyque 1daaea1410 remove extension::Scale9Sprite dependency 2014-07-29 16:24:27 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
andyque 717f20571b add UIScale9Sprite implementation 2014-07-29 16:24:27 +08:00
andyque 32ed796657 add UIScale9Sprite 2014-07-29 16:24:27 +08:00
minggo 4c2fd90286 Merge pull request #7614 from andyque/fixBindingGenerate 
fix binding generator can nott regonize unsigned long arguments
 2014-07-29 16:13:26 +08:00
andyque 98ef180ca8 add default value to luaval_to_ulong 2014-07-29 15:59:49 +08:00
andyque cfe7e57561 fix binding generator can nott regonize unsigned long arguments 2014-07-29 15:48:12 +08:00
Huabing.Xu bca92772dd remove unused windows localstorage project file 2014-07-29 15:23:07 +08:00
Huabing.Xu ea802580a2 add script to copy sqllite3.dll to output dir on windows 2014-07-29 15:02:34 +08:00
minggo 5d63ce17ad Merge pull request #7610 from dabingnn/v3_windowChangeModule 
V3 window change module
 2014-07-29 14:29:01 +08:00
minggo 52dfb7224e Merge pull request #7609 from boyu0/bug5762_setTotalParticles 
Closed #5762: ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
 2014-07-29 13:55:33 +08:00
dzl-ian b8248a165b Correct some typos/mistakes in declarations 2014-07-29 13:47:21 +09:00
Huabing.Xu c722c0fcd0 libcocostudio for windows 2014-07-29 11:31:37 +08:00
Huabing.Xu e91fa0e9fc libcocosbuilder rename for windows 2014-07-29 11:09:02 +08:00
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +08:00
boyu0 c63d64e385 set emission rate when setTotalParticles() 2014-07-29 10:48:20 +08:00
Huabing.Xu aaa65dcae4 Merge branch 'v3' into v3_windowChangeModule 2014-07-29 10:20:23 +08:00
Huabing.Xu eacf003eed change libExtensions for windows 2014-07-29 10:07:46 +08:00
Huabing.Xu bf287252df change libnetwork and libSpine 2014-07-29 09:31:52 +08:00
AppleJDay 0bd4b608b7 Merge pull request #1 from cocos2d/v3 
Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
 2014-07-29 08:34:15 +08:00
Unai Orbe 406a718a4c reuse file utils when resolving video path (ios) 2014-07-28 15:24:17 +01:00
Huabing.Xu d6bc2f4998 liuGUI->libui for windows 2014-07-28 22:12:07 +08:00
Huabing.Xu c6956504bf change CocosDenshion to libcocosdenshion 2014-07-28 21:35:16 +08:00