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

4591 Commits

Author SHA1 Message Date
Dale Stammen 6fcf43e64d #undef NEAR reserved word for WP8 and WinRT 2014-06-17 09:27:19 -07:00
CocosRobot 22e1d69f9f [AUTO]: updating luabinding automatically 2014-06-17 13:24:08 +00:00
minggo 26cca348cb Merge pull request #7085 from super626/v3 
Sprite3D animation
 2014-06-17 21:05:58 +08:00
yangxiao 1ba59fba94 code adjustment according to minggo 2014-06-17 19:18:56 +08:00
minggo 552c3cbb2f [ci skip] 2014-06-17 18:42:10 +08:00
minggo 4da24dfade issue #4693: correct comment 2014-06-17 16:21:24 +08:00
kyokomi b6ed783b0b fix use raw char* to represent string. 2014-06-17 17:05:44 +09:00
2youyou2 806d74b6f9 add change play section test 2014-06-17 15:57:30 +08:00
2youyou2 c221a59954 fixed frame's value not right when enter frame 2014-06-17 15:57:06 +08:00
kyokomi 3f7cecaf8b fix move this enum class to private part and change `Type` to `FontType`. 2014-06-17 16:34:54 +09:00
yangxiao e1fb8c82f0 missing include 2014-06-17 15:31:45 +08:00
yangxiao 6c39dc0e18 adjust includes 2014-06-17 15:28:14 +08:00
lvlong c1fd9adebf Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-17 13:59:25 +08:00
lvlong ef32bffceb modify bundle3D load() 2014-06-17 13:59:03 +08:00
CocosRobot 657b90422d [AUTO]: updating luabinding automatically 2014-06-17 05:53:04 +00:00
yangxiao fd02a914f4 remove unused code 2014-06-17 13:50:58 +08:00
yangxiao 17854cd922 change speed 2014-06-17 13:45:58 +08:00
yangxiao b9824e1778 remove external from include path 2014-06-17 21:16:32 +08:00
2youyou2 d2a6782a9e fixed start frame not right 2014-06-17 11:45:57 +08:00
minggo 53963a2441 issue #4693:enumerateChildren() support regular expression 2014-06-17 11:43:03 +08:00
yangxiao ae180d8326 merge 2014-06-17 11:02:05 +08:00
lvlong 020d6da43c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-17 10:53:47 +08:00
lvlong ae5965f05f test new version and modify vs2012 project 2014-06-17 10:52:55 +08:00
yangxiao 189fbb7071 resolve conflict 2014-06-17 10:52:48 +08:00
yangxiao fb7fc23ee9 refactor code 2014-06-17 10:49:52 +08:00
Huabing.Xu 07ec5970fb 1. using external/json folder for rapidjson 
2. linux works now
 2014-06-16 19:18:02 -07:00
andyque 9ab45744bb Merge branch 'v3' into cleanupBinaryLoader 2014-06-17 09:45:16 +08:00
Dale Stammen 753167b5f2 updated xaml resources 2014-06-16 09:25:35 -07:00
Dale Stammen b66269d85d Merge branch 'v3' into wp8-v3-template 2014-06-16 09:11:27 -07:00
yangxiao 10a49523b9 fix cache, android work 2014-06-16 23:43:07 +08:00
yangxiao 452fdc047a Merge branch 'newcode' into v3 2014-06-16 22:36:01 +08:00
yangxiao 7ae06d44a6 cache work 2014-06-16 20:58:13 +08:00
lvlong d587971c09 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-16 19:35:35 +08:00
lvlong 32cc5b12d6 ready 2014-06-16 19:30:45 +08:00
yangxiao 36808abb72 simplify shader 2014-06-16 19:23:51 +08:00
yangxiao 531f8998a1 skincache 2014-06-16 19:17:07 +08:00
lvlong 4b7f6a6185 static Sprite3D is ok 2014-06-16 19:08:43 +08:00
yangxiao 2c6f7b63d1 avoid reopen file 2014-06-16 18:46:58 +08:00
yangxiao 0c07b05e1d remove unused code 2014-06-16 18:36:30 +08:00
yangxiao c00cdd0ae3 use bone dirtyflag 2014-06-16 18:22:32 +08:00
yangxiao 927d29f334 bug on Repeat when diff bigger than duration 2014-06-16 18:21:47 +08:00
2youyou2 02363c2ae4 read visible property 2014-06-16 17:20:59 +08:00
yangxiao bc31d6b082 merge lv 2014-06-16 16:45:43 +08:00
yangxiao 58a6adca02 construct BoneBlendState 2014-06-16 15:45:58 +08:00
lvlong a4ee8b8dc2 Merge branch 'lv' of https://github.com/super626/cocos2d-x into v3 2014-06-16 15:39:05 +08:00
lvlong 2282c98f2e do some test 2014-06-16 15:38:03 +08:00
Huabing.Xu a0ba6775c6 adjust animation logic 2014-06-16 15:22:00 +08:00
2youyou2 f9a817a2bf read flip property 2014-06-16 15:19:58 +08:00
2youyou2 7bb188f15a fixed not read zorder 2014-06-16 15:03:53 +08:00
lvlong 2840409933 for tony test 2014-06-16 14:09:41 +08:00
pandamicro d00c9fe70a Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary) 2014-06-16 12:50:35 +08:00
CocosRobot 30c91729eb [AUTO]: updating luabinding automatically 2014-06-16 02:49:38 +00:00
minggo 111e08062f Merge pull request #7056 from visiblelight/render_texture 
Use RGBA when saving a file from render texture
 2014-06-16 10:44:30 +08:00
2youyou2 c5fe56ef21 update CMakeLists.txt 2014-06-16 09:44:14 +08:00
yangxiao 7b621c5c93 aa 2014-06-16 00:26:31 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
andyque 1d01fe8bbc refactor 2014-06-15 16:12:24 +08:00
kyokomi 7d710f6aed Fix UIButton.cpp added TTFFont. 2014-06-15 16:58:05 +09:00
kyokomi d7199204bd Fix bug for TextReader #setFontName. 2014-06-14 23:56:12 +09:00
2youyou2 d9f34a1412 change texture to textureName 2014-06-13 19:52:53 +08:00
lvlong 4ae01d148f 11 2014-06-13 19:26:46 +08:00
yangxiao ff6ef1140d two animate3d the same time 2014-06-13 19:20:19 +08:00
2youyou2 5bce6b87ea change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00
2youyou2 c60e424ef2 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-06-13 18:01:17 +08:00
2youyou2 57fe37f9f1 add const word 2014-06-13 18:00:46 +08:00
2youyou2 369ed3e6d3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-13 18:00:01 +08:00
pandamicro d524ba1013 Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB 2014-06-13 17:59:23 +08:00
pipu cb213183bc adjust project.pbxproj and files associated with ActionTimeLine 2014-06-13 16:33:07 +08:00
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00
vision 0b8e6a6a83 The filename should be converted to lower case before comparing. 2014-06-13 15:32:49 +08:00
vision 33fb1dd050 Make the API more extendable 2014-06-13 15:27:59 +08:00
minggo 7c789e6a36 Merge pull request #7049 from dabingnn/v3_fixDeleteTexture 
fix bug for deleteTexture
 2014-06-13 15:26:16 +08:00
minggo 405186a415 Merge pull request #7055 from pandamicro/origin_v3 
Fixed #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage
 2014-06-13 15:21:20 +08:00
2youyou2 b181eaf802 modify mk file 2014-06-13 14:43:53 +08:00
samuele3hu 9b3b6c0e53 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-13 14:39:11 +08:00
samuele3hu 5b6330d59b Add more conversion functions and manual binding functions 2014-06-13 14:10:08 +08:00
minggo 19fa4733c5 Merge pull request #7029 from samuele3hu/v3_lua_ui_fix 
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
 2014-06-13 13:41:52 +08:00
2youyou2 e0f6ae9db4 change TimelineAction to cocos/2d folder 2014-06-13 13:36:01 +08:00
vision 7e99121af7 Change the default pixel format from RGB to RGBA for render texture when saving as PNG. 2014-06-13 13:35:18 +08:00
yangxiao 247734e2e0 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-13 12:25:04 +08:00
Huabing.Xu 4e94eaabed Merge branch 'v3' into v3Animation 2014-06-13 12:06:11 +08:00
Huabing.Xu f7b8acd6fd change pointer to std::vector for mesh 2014-06-13 11:59:13 +08:00
boyu0 ee919b673f issue #4437: config for android and linux. 2014-06-13 11:07:21 +08:00
pipu 65c2a5e3e1 add parse actionTag in loadWidget method of CCNodeReader 2014-06-13 10:49:57 +08:00
pandamicro 7ccff325b6 Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage 2014-06-13 10:29:40 +08:00
yangxiao 09fe7e13b7 blendstate 2014-06-13 09:12:29 +08:00
Dale Stammen 2d913470a0 updated fast resume code for app 2014-06-12 16:36:53 -07:00
Dale Stammen 29b9da34ea updated to latest version of Angle to fix memory leak when switching apps 2014-06-12 16:35:24 -07:00
Dale Stammen b0bc971523 fixed reloading of cocos2d-x after app switch 2014-06-12 16:34:21 -07:00
Dale Stammen 70f3f0f913 release glTextures before reloading cached textures 2014-06-12 16:31:46 -07:00
Dale Stammen 48404a8fb5 fixed reloading of textures from VolatileTexture cache 2014-06-12 16:31:07 -07:00
Dale Stammen 49a94a20ef added releaseGLTexture to release only the glTexture but leave the rest of the texture object intact. Needed to reload cached textures 2014-06-12 16:28:38 -07:00
Dale Stammen 2c5b449c9c updated app name to App 2014-06-12 16:27:09 -07:00
2youyou2 f09b1863a9 fixed read sprite 2014-06-12 20:16:39 +08:00
pipu c0170d23c7 fixed warnings 2014-06-12 19:56:15 +08:00
2youyou2 b2c5334de1 change NodeCache to NodeReader 2014-06-12 19:24:27 +08:00
2youyou2 eb2e973e07 change read name 2014-06-12 19:12:05 +08:00
2youyou2 ea7e24ba24 add TimelineActionData 2014-06-12 18:50:37 +08:00
lvlong dbadabb6e9 skin: getPosition() 2014-06-12 18:46:45 +08:00
yangxiao ae0b850d89 boneblendstate 30% 2014-06-12 18:32:47 +08:00
lvlong 14f4b6430f modify 3dloader, you can run animation. 2014-06-12 18:26:42 +08:00
2youyou2 e4f1ac6126 add hd resource 2014-06-12 17:38:26 +08:00
2youyou2 7eda0ae999 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-12 16:43:04 +08:00
lvlong 1ca69d2689 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2014-06-12 16:28:36 +08:00
2youyou2 db992b6d0f modify cocostudio Android.mk 2014-06-12 16:26:18 +08:00
2youyou2 f536020d26 remove unused files 2014-06-12 16:21:41 +08:00
minggo eb21bf1ad1 Merge pull request #7030 from Rumist/v3 
#5506 bug fix
 2014-06-12 16:16:13 +08:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 2014-06-12 15:53:41 +08:00
gin0606 80c5349d75 Fix crash when videoView to remove in android 2014-06-12 16:47:08 +09:00
yangxiao ee5aa0f648 android work 2014-06-12 15:42:53 +08:00
samuele3hu c6b913145c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-12 15:41:52 +08:00
samuele3hu 27a3a46d62 Modify the implemetation of `LuaStack::executeScriptFile` 2014-06-12 15:39:59 +08:00
Huabing.Xu 9acf8e6253 fix bug for deleteTexture 2014-06-12 15:22:41 +08:00
minggo 5a28ba68b4 Merge pull request #7031 from sachingarg05/GLProgramNoAbort 
GLProgram should not abort() if shader compilation fails, returning false is better.
 2014-06-12 15:03:29 +08:00
boyu0 acb87f414e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx 2014-06-12 14:44:28 +08:00
minggo ed14108ab1 Merge pull request #7042 from Dhilan007/v3-systemfont-ios 
LinWenhai	fixed calculating height of multi-line string was incorrect on IOS.
 2014-06-12 14:44:26 +08:00
Dhilan007 b2d8e4fc93 add assert. 2014-06-12 14:41:01 +08:00
samuele3hu 5bdecadd70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-12 14:09:00 +08:00
Huabing.Xu e70918e325 extract Animation3DData 2014-06-12 14:03:33 +08:00
samuele3hu c2288936db Remove `handleStudioEventListener` of LuaEngine 2014-06-12 13:50:52 +08:00
samuele3hu f687f63bfd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-12 13:44:15 +08:00
samuele3hu 6c7b538ee1 Add deprecated support for the related UI addEventListener functions 2014-06-12 12:02:22 +08:00
Dhilan007 3511d1e87e 1.Support setting up the line height and additional kerning of label. 
2.Add more annotation
 2014-06-12 12:01:15 +08:00
minggo 5c718e27da Merge pull request #7044 from Dhilan007/v3-label-improve 
Ensuring release cache texture in timely.
 2014-06-12 11:39:36 +08:00
minggo c5a8ba3a2c Merge pull request #7043 from Dhilan007/v3-texturecachefix 
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
 2014-06-12 11:35:34 +08:00
samuele3hu 379db53673 Reconstruct the _sendRequest function of LuaMinXmlHttpRequest 2014-06-12 11:24:46 +08:00
Dhilan007 d755b7ffcb issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file. 2014-06-12 11:21:42 +08:00
minggo 05a65a68bb issue #4693: added enumerateChildren() 2014-06-12 10:41:08 +08:00
samuele3hu 5349125ad0 Reconstruct the addEventListener for cocostudio ui control 2014-06-12 10:10:37 +08:00
samuele3hu 108c0d0da9 Modify ini files for bindings-generator to fix the compile warning 2014-06-12 10:08:58 +08:00
lvlong 9fe7c1a9da loader 2014-06-12 10:01:54 +08:00
LinWenhai b268536385 fixed typo. 2014-06-12 09:46:18 +08:00
2youyou2 4d1bf0c1a2 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
 2014-06-12 09:42:20 +08:00
Dale Stammen 775832a710 added missing files 2014-06-11 13:18:10 -07:00
youyou 28ae57c5fc add AsyncReader 2014-06-12 00:38:23 +08:00
Dhilan007 7cc3879257 Ensuring release cache texture in timely. 2014-06-11 22:03:10 +08:00
Dhilan007 63a68632a5 fixed calculating height of multi-line string was incorrect on IOS. 2014-06-11 21:49:08 +08:00
2youyou2 aa06fab776 support relative path for reading json 2014-06-11 21:11:22 +08:00
Huabing.Xu f1bc0971aa extract mesh data, material data, skin data into a header file for reuse in converter and engine 2014-06-11 18:24:14 +08:00
Huabing.Xu 65acec013b Merge branch 'v3' into v3Animation 2014-06-11 17:45:31 +08:00
minggo 8a5bfb9840 issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +08:00
andyque 5515c43bb2 improve lasers 2014-06-11 15:16:08 +08:00
Huabing.Xu 18663609b4 add interface for speed and playback in animate 2014-06-11 15:07:37 +08:00
andyque f50263402a improve parser 2014-06-11 14:56:12 +08:00
minggo ccb24abf52 Merge pull request #7028 from heliclei/cocos-version 
[ccconsole]Add version command.
 2014-06-11 14:49:47 +08:00
andyque 2f6f1b7151 improve binary format 2014-06-11 14:45:35 +08:00
yangxiao d76525ced1 use my data temp 2014-06-11 14:20:14 +08:00
andyque 7a8f27ee0b remove unused parser code 2014-06-11 14:15:34 +08:00
yangxiao 5b05ab6353 fix rendering bug 2014-06-11 14:05:35 +08:00
Huabing.Xu 9ee6f1f3e0 adjust shader uniform settings 
use a new fake data for testing
 2014-06-11 12:07:25 +08:00
Huabing.Xu a8c321fe64 add use glprogram before setting uniform data for meshcommand 2014-06-11 11:34:04 +08:00
2youyou2 09a2ceb7df add TimelineAction 2014-06-11 11:10:07 +08:00
CocosRobot 818c478224 [AUTO]: updating luabinding automatically 2014-06-11 02:30:38 +00:00
samuele3hu 4ce2d7f193 Update values of KeyCode used in the Lua to fix related error 2014-06-11 10:10:11 +08:00
yangxiao cddad40ec0 make it rotate 2014-06-11 10:01:52 +08:00
andyque b895018765 update parser 2014-06-11 09:35:24 +08:00
Sachin Garg 8ba4c7a083 GLProgram should not abort() if shader compilation fails, returning false will allow app to show custom error message to user (or use other simple shaders if a complicated shader fails to compile on some device). 2014-06-10 17:59:15 +05:30
yangxiao 6d09b50699 animation bug 2014-06-10 19:53:06 +08:00
elsanide 2e73f63156 #5506 bug fix 
when Director->convertToUI() called, returned wrong value.

kazmath code (under 3.0 version.)
//********************************************************
kmVec3* kmVec3TransformCoord(kmVec3* pOut, const kmVec3* pV, const kmMat4* pM)
{
 /*
        a = (Vx, Vy, Vz, 1)
        b = (a×M)T
        Out = 1 ⁄ bw(bx, by, bz)
 */

    kmVec4 v;
    kmVec4 inV;
    kmVec4Fill(&inV, pV->x, pV->y, pV->z, 1.0);

    kmVec4Transform(&v, &inV,pM);

 pOut->x = v.x / v.w;
 pOut->y = v.y / v.w;
 pOut->z = v.z / v.w;

 return pOut;
}
//********************************************************

Mat4.h & MathUtil version (3.1 or later)
//********************************************************
inline void MathUtil::transformVec4(const float* m, const float* v, float* dst)
{
    // Handle case where v == dst.
    float x = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + v[3] * m[12];
    float y = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + v[3] * m[13];
    float z = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + v[3] * m[14];
    float w = v[0] * m[3] + v[1] * m[7] + v[2] * m[11] + v[3] * m[15];

    dst[0] = x;
    dst[1] = y;
    dst[2] = z;
    dst[3] = w;
}

//****************************************************

Transforms 3-D vector or an array of 3-D vectors using a given matrix, projecting the result back into w = 1.
but, it is not apply w = 1.
 2014-06-10 18:15:07 +09:00
samuele3hu 46e5b72827 Add a log 2014-06-10 16:56:07 +08:00
samuele3hu 90907f451e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-10 16:50:26 +08:00
samuele3hu 5aec5d4a83 Update `LuaStack::executeScriptFile` to support template project loading lua or luac files 2014-06-10 16:47:32 +08:00
heliclei d4a9640a5e [ccconsole]Add version command. 2014-06-10 16:29:06 +08:00
2youyou2 24990b37bf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-10 15:25:15 +08:00
andyque 48f7743daa Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-10 15:08:10 +08:00
minggo d7af5eccd4 Merge pull request #7024 from pandamicro/SpriteFrame_Ctor 
Issue #5533: Add SpriteFrame's constructor
 2014-06-10 13:38:27 +08:00
pandamicro 8bc531a0fb Fixed #5533: Fix usage of new SpriteFrame in engine 2014-06-10 12:04:20 +08:00
pandamicro 92a33225ff Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues 2014-06-10 11:39:48 +08:00
samuele3hu aa877f2b50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-10 11:31:08 +08:00
samuele3hu 5a80b4da2e Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget 2014-06-10 11:30:39 +08:00
pandamicro bb7cf801e6 Fixed #5533: Add SpriteFrame's constructor and make constructor & init functions protected 2014-06-10 11:28:34 +08:00
minggo 0ca9a98f4a Merge pull request #6920 from minggo/orrderOfArrival 
don't have to set _orderOfArrival to 0 after visit
 2014-06-10 10:28:38 +08:00
2youyou2 0c7cbda144 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-10 09:09:53 +08:00
yangxiao a991940268 debug Sprite3D with .c3t 2014-06-09 18:37:58 +08:00
minggo 9517f9b852 Merge pull request #6996 from newnon/v3_setparent_fix 
move node from one parent to another fix
 2014-06-09 17:13:59 +08:00
minggo 66c7b85134 fix issue on Xcode 6 2014-06-09 17:06:40 +08:00
CocosRobot e2630f915d [AUTO]: updating luabinding automatically 2014-06-09 07:30:49 +00:00
boyu0 3975f55de7 issue #4437: fix crash when doesn't support VAO, and make calculation more precisely. 2014-06-09 15:28:49 +08:00
minggo 8a3e64918d Merge pull request #7014 from andyque/ImproveUIText 
improve UIText
 2014-06-09 15:27:04 +08:00
CocosRobot e1a43d8ac4 [AUTO]: updating luabinding automatically 2014-06-09 07:20:59 +00:00
minggo ecf32bcbf7 Merge pull request #7015 from andyque/improveUITextField 
add getStringLength to UITextField
 2014-06-09 15:16:47 +08:00
andyque d46025af64 Merge branch 'improvement/COC-3' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into improveUITextField 
Conflicts:
	cocos/ui/UITextField.h
 2014-06-09 14:46:04 +08:00
andyque b7c8759f3b modify outline size parameter 2014-06-09 14:37:56 +08:00
andyque a52532c3c5 Merge branch 'feature/COC-5' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into ImproveUIText 
Conflicts:
	cocos/ui/UIText.cpp
 2014-06-09 14:17:57 +08:00
minggo 59c7b7e9a0 Merge pull request #7004 from Dhilan007/v3-labelfix 
close issue#5158:Label's display may go bonkers if using outline feature.
 2014-06-09 14:17:46 +08:00
minggo 48443b8d52 Merge pull request #7008 from visiblelight/ProgramState 
Fix issue 5393
 2014-06-09 11:47:57 +08:00
boyu0 dff0fada28 issue #4437: fix some bugs. 2014-06-09 11:36:44 +08:00
CocosRobot 638f7f12c5 [AUTO]: updating luabinding automatically 2014-06-09 03:15:50 +00:00
vision ae16c88538 Save the bound texture unit so that the sampler can be updated dynamiclly. 2014-06-09 10:58:28 +08:00
andyque 6bc82ef5ab restore UIScrollView constructor and destructor to public 2014-06-09 10:47:02 +08:00
andyque c4f5e71bbd restore Widget's constructor and destructor to public 2014-06-09 10:41:17 +08:00
andyque 1a933807b5 remove UIInterface.h header file 2014-06-09 10:35:54 +08:00
andyque 7a25fbfe29 refactor touch event 2014-06-09 10:23:11 +08:00
Dhilan007 4e0759533b close issue#5158:Label's display may go bonkers if using outline feature. 2014-06-09 10:12:22 +08:00
andyque 38f28d4bd5 fix KeyCode back compatible 2014-06-09 09:50:13 +08:00
minggo 46ed99f611 Merge pull request #7001 from CocosRobot/update_lua_bindings_1402278332 
[AUTO]: updating luabinding automatically
 2014-06-09 09:47:10 +08:00
CocosRobot c604c09069 [AUTO]: updating luabinding automatically 2014-06-09 01:46:34 +00:00
minggo fa74de8511 Merge pull request #6993 from Teivaz/v3 
* Set COCOS2D_VERSION to 3.2.0
 2014-06-09 09:43:50 +08:00
Sergey 904f157c2c move node from one parent to another fix 2014-06-07 12:25:20 +04:00
yangxiao 0c95fe1fbd animation test 2014-06-06 19:12:08 +08:00
boyu0 fc5e58b521 issue #4437: add dirty tag. 2014-06-06 18:03:44 +08:00
oleksandr.kuznietsov 2640938c68 * Set COCOS2D_VERSION to 3.2.0 2014-06-06 12:58:32 +03:00
boyu0 560053d23c issue #4437: add test and fix transform. 2014-06-06 17:33:27 +08:00
Frank.Xu d7f808934d Add const for getStringLength() function 2014-06-06 17:06:55 +08:00
zhouxiaoxiaoxujian e0cc5153fa Remove misleading comment, add new comment 
Remove misleading comment, add new comment for enableOutline
 2014-06-06 16:54:51 +08:00
zhouxiaoxiaoxujian fabc4d03ee Update UIText.cpp 2014-06-06 16:50:25 +08:00
zhouxiaoxiaoxujian 03eeb2cade Remove unnecessary Type::TTF Check 
Remove unnecessary TTF type check on enableOutline or enableGlow function。
 2014-06-06 16:41:45 +08:00
boyu0 a8a5f6b230 issue #4437: add new tmx. 2014-06-06 16:15:46 +08:00
andyque 4f22b03d7f refactor Widget setColor & setOpacity 2014-06-06 16:14:35 +08:00
andyque 282264575b refactor TextField setColor & setOpacity 2014-06-06 16:10:33 +08:00
andyque 5ae97da030 refactor TextBMFont setColor & setOpacity 2014-06-06 16:09:59 +08:00
andyque d615de8299 refactor TextAtlas setColor & setOpacity 2014-06-06 16:09:13 +08:00
andyque a37a6737ca refactor Text setColor & setOpacity 2014-06-06 16:08:31 +08:00
andyque f0f4d41813 refactor Slider setColor & setOpacity 2014-06-06 16:07:47 +08:00
andyque 3c80fe53d3 refactor LoadingBar setColor & setOpacity 2014-06-06 16:03:59 +08:00
andyque 6193893b2b refactor ImageView setColor & setOpacity 2014-06-06 16:02:44 +08:00
andyque 0805c215b3 refactor UICheckBox setColor & setOpacity 2014-06-06 16:01:55 +08:00
andyque 46ad4edab3 refactor UIButton setColor & setOpacity 2014-06-06 16:00:28 +08:00
minggo 76d9916864 Merge pull request #6990 from Dhilan007/v3-wp8fix 
fixed WP8 project:compile error,missing files,wrong file path.
 2014-06-06 15:43:43 +08:00
Dhilan007 fd4e233432 fixed WP8 project:compile error,missing files,wrong file path. 2014-06-06 15:41:17 +08:00
minggo 716769241a Merge pull request #6938 from CaryZheng/v3 
Simplify BlendFunc operator< judgement
 2014-06-06 15:29:33 +08:00
minggo bbff18c96f add some comment 2014-06-06 12:09:39 +08:00
minggo 49f7b2aec1 Merge pull request #6986 from iSevenDays/patch-11 
Fix CCImage to be compatible with UNIX2003
 2014-06-06 12:05:58 +08:00
minggo 6cee3fe830 Merge pull request #6979 from visiblelight/TextureOptimize 
Texture Optimize
 2014-06-06 11:38:49 +08:00
andyque 6bbf5a1459 tests 2014-06-06 10:12:23 +08:00
Anton Sokolchenko 770d5e91b7 Update CCImage.cpp 2014-06-05 18:02:45 +03:00
Anton Sokolchenko 5f74b8568d Fix CCImage to be compatible with UNIX2003 
Without this wrapper I get errors below.
Mac Os X 10.9.3 Xcode 6 beta(the same problem also exists in Xcode 5)
I found a solution at http://stackoverflow.com/questions/8732393/code-coverage-with-xcode-4-2-missing-files and added one more wrapping function.

Undefined symbols for architecture i386:
  "_fwrite$UNIX2003", referenced from:
      _unixErrorHandler in libcocos2dx iOS.a(tif_unix.o)
      _unixWarningHandler in libcocos2dx iOS.a(tif_unix.o)
      _empty_output_buffer in libcocos2dx iOS.a(jdatadst.o)
      _term_destination in libcocos2dx iOS.a(jdatadst.o)
      _Fax3PrintDir in libcocos2dx iOS.a(tif_fax3.o)
      _PredictorPrintDir in libcocos2dx iOS.a(tif_predict.o)
  "_strerror$UNIX2003", referenced from:
      _TIFFOpen in libcocos2dx iOS.a(tif_unix.o)
ld: symbol(s) not found for architecture i386
clang: error: linker command failed with exit code 1 (use -v to see invocation)
 2014-06-05 16:54:00 +03:00
Frank.Xu 7ece807a63 Add shadow, outline, glow filter support for UITextField 2014-06-05 19:21:06 +08:00
yangxiao 87c7e2b0e9 worldmat cache in bone 2014-06-05 18:21:25 +08:00
Frank.Xu b74040a2ac Add getStringLength() support for UITextField 2014-06-05 17:59:54 +08:00
yangxiao 32ba5f2873 change comment 2014-06-05 16:47:03 +08:00
yangxiao ed8f8a9cad sprite3d with skin render&bundle 2014-06-05 16:36:01 +08:00
CocosRobot b749d0b5ca [AUTO]: updating luabinding automatically 2014-06-05 07:06:07 +00:00
samuele3hu 373d4dfb1a Replace `log` with `CCLOG` 2014-06-05 14:49:02 +08:00
minggo 366beedbb2 Merge pull request #6955 from samuele3hu/v3_fix 
Add xxtea encrypt support for lua and update the console submodule
 2014-06-05 11:49:40 +08:00
andyque c96a6086c3 improve parsing code 2014-06-05 11:43:43 +08:00
CocosRobot 0010ed2e44 [AUTO]: updating luabinding automatically 2014-06-05 03:01:43 +00:00
vision 860057c307 Use the image format instead of RGBA8888 when initializing a texture, this would remove the redudant conversion and save memories. 2014-06-05 10:58:27 +08:00
andyque 8690122c96 add version 300 parsing code in widget reader 2014-06-05 10:25:08 +08:00
andyque b570487bf3 add cocostudio binary file parser 2014-06-05 10:24:12 +08:00
vision c90f2b3251 remove unused codes in CCTexture2D 2014-06-05 10:09:36 +08:00
Ricardo Quesada 59b966731e Compiles on Windows and Android 2014-06-04 09:48:35 -07:00
Ricardo Quesada 0c2f8ed401 Lua compiles and runs 2014-06-04 09:26:39 -07:00
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 2014-06-04 09:19:22 -07:00
yangxiao 54caf26a57 animation3d 2014-06-04 18:17:09 +08:00
andyque d1e664fd44 fix win7 compile error 2014-06-04 15:43:53 +08:00
andyque d089b251db fix other platform compile error 2014-06-04 14:56:34 +08:00
andyque 54e93f6c41 fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
andyque f0d38290a1 refactor ObjectFactor and move it to base 2014-06-04 14:56:34 +08:00
andyque 38e274de73 refact ui header file include 2014-06-04 14:56:33 +08:00
minggo 7bf2be6033 Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager 
Bugfix autorelease pool manager
 2014-06-04 14:31:30 +08:00
minggo 700b0f7320 Merge pull request #6966 from kicktheken/v3 
fix layout constant syntax error
 2014-06-04 14:12:52 +08:00
minggo b174481645 Merge pull request #6967 from ntotani/fix-lua-binding-release-build 
fix lua-binding release build
 2014-06-04 14:06:29 +08:00
CocosRobot a70d6628a7 [AUTO]: updating luabinding automatically 2014-06-04 05:58:29 +00:00
minggo 5432698674 Merge pull request #6969 from boyu0/bug5482_setPhysicsBody 
closed #5482: Node::setPhysicsBody() doesn't work after node added to another node.
 2014-06-04 13:52:43 +08:00
minggo 56d931aa71 Merge pull request #6963 from andyque/refactorLayout 
refactor Layout, remove sortChildren and unify doLayout
 2014-06-04 12:01:07 +08:00
boyu0 dd0eecb905 closed #5482: fix issue: Node::setPhysicsBody() doesn't work after node added to other node. 2014-06-04 11:58:04 +08:00
samuele3hu c785d64ba1 Adjust the xxtea directory structure and modify configs files for platforms 2014-06-04 11:50:04 +08:00
Kenneth Chan d7fcf39386 fix layout constant syntax error 2014-06-03 20:26:59 -07:00
Naoyuki Totani c7597e5396 surround tolua_isnumber with debug flug 2014-06-04 12:17:43 +09:00
andyque c6cb3a56fb refactor ListView, add do Layout 2014-06-04 10:51:32 +08:00
andyque 652c214374 remove sortChildren of Layout 2014-06-04 10:10:50 +08:00
minggo 2c9c94c4a9 Merge pull request #6954 from visiblelight/AlphaIssues 
Make PNG files premultiplied alpha when loading
 2014-06-04 10:04:20 +08:00
samuele3hu 3fddb798ea Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-04 10:00:52 +08:00
samuele3hu e1310e2660 Adjust the xxtea directory structure and modify some grammar expressions 2014-06-04 09:59:29 +08:00
Kezhu Wang eb8e08ccdd prefer std::vector to other containers 2014-06-03 19:09:48 +08:00
Kezhu Wang f1ce9e032d remove unnecessary cache-variable 2014-06-03 19:08:28 +08:00
Kezhu Wang 1eb991df59 bugfix related to AutoreleasePool's PoolManager 
* duplicated AutoreleasePool added to PoolManager in
  PoolManager::getInstance()
* redundant pop_back() in PoolManager::~PoolManager()
 2014-06-03 18:57:52 +08:00
Dhilan007 9e6304d84c fixed EVENT_COME_TO_BACKGROUND has not been sent on android. 2014-06-03 18:10:22 +08:00
samuele3hu 404db49538 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-03 17:17:11 +08:00
samuele3hu 55bb9a7d09 Update setting for different platform 2014-06-03 17:15:28 +08:00
vision 1c4838e7f0 we are only udpating PNG now. 2014-06-03 16:22:50 +08:00
vision 0149fd81b5 no need for handling RAW_DATA 2014-06-03 15:19:01 +08:00
vision 8af737739b premultiplied alpha for PNG,TGA,WEBP,RAW_DATA 2014-06-03 15:06:15 +08:00
minggo 691a77b148 Merge pull request #6928 from boyu0/bug5392_scheduleUpdate 
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
 2014-06-03 14:38:07 +08:00
minggo 7b4ae98098 Merge pull request #6944 from minggo/treat-warning-as-error 
Treat warning as error on iOS and Mac
 2014-06-03 14:31:18 +08:00
minggo 26a4eaaac7 Merge pull request #6939 from dabingnn/v3FixAndroid 
V3 fix android
 2014-06-03 10:26:01 +08:00
samuele3hu 691e606b34 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 
Conflicts:
	tools/cocos2d-console
 2014-06-03 09:58:57 +08:00
samuele3hu b91d8255bd Add xxtea encrypt support for lua and update the console submodule 2014-06-03 09:55:57 +08:00
Ricardo Quesada 449b588400 Compiles on iOS 2014-06-02 16:02:54 -07:00
Ricardo Quesada b24c674d25 Little fixes for setNormalized 2014-05-30 21:50:39 -07:00
Ricardo Quesada 1b8d0d88df Adds setNormalizedPosition() 
Changes in `visit()` were done in order to do it
in a robust and fast way.
 2014-05-30 16:42:05 -07:00
Hanju Kim 05b992c628 Bug fix 2014-05-31 00:13:08 +02:00
Hanju Kim 28b95bd54a * Skip UTF8 BOM if it exists 
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
 2014-05-31 00:06:56 +02:00
John_He 3bf4c5e985 fix mingw32/64 build: 
MinGW uses system installed libcurl, rather than libcurl_imp.
 2014-05-30 19:54:59 +08:00
CaryZheng 3b99c5ea42 Modify BlendFunc operator< judgement 2014-05-30 17:57:27 +08:00
boyu0 56590f09eb change comment. 2014-05-30 17:40:35 +08:00
boyu0 dd0771852f change comment. 2014-05-30 17:36:54 +08:00
minggo 4b979d67db issue #5429: treat warning as error on Mac 2014-05-30 16:46:01 +08:00
minggo e76feceada fix coding style 2014-05-30 15:13:59 +08:00
minggo 402dc9f9ce fix memory leak 2014-05-30 15:10:57 +08:00
Huabing.Xu 41d19007eb Merge branch 'v3.1hotfix' into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
 2014-05-30 10:19:56 +08:00
CaryZheng 28954fddd0 Simplify BlendFunc operator< judgement 2014-05-30 00:23:58 +08:00
Nick Barrios 7bac05a497 CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation). 2014-05-29 10:36:15 -04:00
lite3 ae7c93dd4e Merge remote-tracking branch 'upstream/v3' into v3 2014-05-29 20:41:00 +08:00
minggo 05df2a4db1 Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32 
Fixing cmake project for win32
 2014-05-29 15:25:58 +08:00
minggo b68525ac1f Merge pull request #6916 from John-He-928/mingw-build 
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
 2014-05-29 15:17:07 +08:00
boyu0 5e62c4e069 closed #5392: add comment for unscheduleUpdate() at schedulePerFrame() 2014-05-29 15:16:11 +08:00
minggo e5cbe5439b Merge pull request #6922 from zawasp/android_flicker 
prevent flickering when opening another activity
 2014-05-29 15:15:15 +08:00
boyu0 91db87a2f6 closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test. 2014-05-29 13:51:43 +08:00
Dhilan007 e1bb1c62c0 [hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font. 2014-05-29 10:26:07 +08:00
John_He 299e93bca7 Merge branch 'mingw-build' of github.com:John-He-928/cocos2d-x into mingw-build 2014-05-29 01:33:44 +08:00
Mircea Rila 23b7d76797 prevent flickering when opening another activity 2014-05-28 16:33:35 +03:00
minggo 2e7865a4f6 coding style fix 2014-05-28 17:41:34 +08:00
Huabing.Xu 99d1ccf41e remove foreground event listener when GLProgramState is deleted 2014-05-28 16:51:33 +08:00
minggo 1618d2a4e2 don't have to set _orderOfArrival to 0 after visit 2014-05-28 15:50:42 +08:00
Huabing.Xu 2084fc4ddc using lambda function instead of member function 2014-05-28 15:50:37 +08:00
minggo 8f274e5a99 Merge pull request #6918 from minggo/fix-object-leak 
Fix NSNotificationCenter and NSTimer leaks
 2014-05-28 15:23:37 +08:00
minggo 2e70380dd9 invalidate NSTimer instance in destroy to prevent memory leak 2014-05-28 15:19:07 +08:00
minggo 013b3a328f remove keyboard notifications from NSNotificationCenter 2014-05-28 15:17:26 +08:00
Huabing.Xu 30f4f256d8 fix background/forground of Sprite3D on android platform 2014-05-28 15:16:00 +08:00
minggo 3d3fb6ad7e Merge pull request #6914 from andyque/refactorLayoutExecutant 
refactor:  rename UILayoutExecutant to UILayoutManager
 2014-05-28 13:47:54 +08:00
John_He 2aa4b9936c Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-bit platform. 2014-05-28 12:37:35 +08:00
andyque 769300d25e rename UILayout 
Executant.h to UILayoutManager.h
 2014-05-28 10:17:34 +08:00
andyque c5a118ee1b refactor UILayoutExecutant to LayoutManager 2014-05-28 10:11:49 +08:00
John_He 8233b5bf93 fix mingw32/mingw64 compiling 2014-05-28 00:17:09 +08:00
minggo 99290b83c7 Merge pull request #6871 from asuuma/v3_Repeat_fix 
Fix Repeat will run one more over in rare situations
 2014-05-27 16:22:42 +08:00
minggo 0b661d8192 Merge pull request #6907 from visiblelight/screenshot_refactor 
adding comments for the new utility
 2014-05-27 14:52:09 +08:00
minggo f3de239647 Merge pull request #6616 from xhcnb/fix_callback 
Fix crash: use cocostudio gui editor, create a action in editor, when yo...
 2014-05-27 14:51:36 +08:00
vision d392fad70f udpate the comments 2014-05-27 14:51:13 +08:00
vision 5764677bba update the comments 2014-05-27 14:40:55 +08:00
CocosRobot e1ab346e70 [AUTO]: updating luabinding automatically 2014-05-27 06:31:18 +00:00
vision e81db73b0a adding comments for the new utility. 2014-05-27 14:29:52 +08:00
minggo 9d2c765fc0 Merge pull request #6862 from favorcode/v3 
Update UILoadingBar.h doxygen comments
 2014-05-27 13:54:52 +08:00
andyque df13d4033c refactor Layout and Widget 2014-05-27 13:49:00 +08:00
andyque 30582ffa6f add constness to UIPageView's removeAllPages method 2014-05-27 11:30:37 +08:00
andyque 070abfdb44 add constness to UIVideoPlayer 2014-05-27 11:30:36 +08:00
andyque 3cda4e76a0 add constness to UIImageView 2014-05-27 11:30:36 +08:00
andyque eb91aed3f2 add constness to UICheckBox 2014-05-27 11:30:36 +08:00
andyque f87e4243ee add constness to UIButton 2014-05-27 11:30:36 +08:00
andyque 884d4c5d1f add constness to UITextField 2014-05-27 11:30:36 +08:00
andyque 5da1f1f78c add constness to UIText 2014-05-27 11:30:36 +08:00
andyque 5acd2ed89d add constness to UISlider 2014-05-27 11:30:36 +08:00
andyque 36e7c9cdfc add constness to UIScrollView 2014-05-27 11:30:36 +08:00
andyque e1f9ff7eaa add constness to UIPageView 2014-05-27 11:30:36 +08:00
andyque 78ac4b4d86 add constness to UILoadingBar 2014-05-27 11:30:35 +08:00
andyque 0518e494b1 add constness to UIListView 2014-05-27 11:30:35 +08:00
andyque b17de0cdcb add const to UILayout 2014-05-27 11:30:35 +08:00
andyque e32a637bf5 add const to ui framework methods 2014-05-27 11:30:35 +08:00
minggo a01315e2f5 Merge pull request #6726 from visiblelight/screenshot 
Add a new utility function to snap the screen
 2014-05-27 11:18:25 +08:00
vision bfd945c592 remove unused variables 2014-05-27 10:47:25 +08:00
vision 363fd8dc2a move the capturen screen interface from Director to ccUtils 2014-05-27 10:44:23 +08:00
minggo 626e0acb9d Merge pull request #6848 from newnon/v3_android_jni_improvements 
android jni error clear & more readable log
 2014-05-27 10:40:59 +08:00
minggo f7450730fb Merge pull request #6901 from andyque/fixDpadNavigation 
issue #5176, refactor FocusNavigationController
 2014-05-27 10:40:00 +08:00
CocosRobot 9e9cab9e53 [AUTO]: updating luabinding automatically 2014-05-27 02:21:22 +00:00
andyque 9cef55d62c issue #5176, refactor FocusNavigationController 2014-05-27 10:20:37 +08:00
minggo 94a1013f75 Merge pull request #6898 from andyque/5176 
add FocusManager, refactor UI framework
 2014-05-27 10:09:43 +08:00
andyque d8d5139aaf closed #5176, refactor UILayout and focus 2014-05-26 23:04:44 +08:00
vision c72ae9e3c5 merge from the latest v3 2014-05-26 20:18:11 +08:00