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

52 Commits

Author SHA1 Message Date
patriciog 097eebdb50 Testcase for CCS 1.6 animations with only one frame (#15714) 
* Testcase for CCS 1.6 animations with only one frame

* Removed extra comma

* Removed conflict garbage

* Removed old code

* Create new Test section Cocos Studio > Issues

* update ccs-res submodule

* Fixed Back button visibility
 2016-06-06 09:32:33 +08:00
zilongshanren b317588e6e fix include path 2016-05-26 17:25:03 +08:00
zilongshanren 3e941be0ce fix actionNode studio 1.6 parser error 2016-05-26 17:20:51 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
James Chen 462796d2dd Bug fix for ActionNode in CocosStudio, please don't use weak reference. 2015-12-07 15:06:50 +08:00
XiaoFeng 1f0c498bcb Fixed actionNode position error bug 2015-11-09 19:45:17 +08:00
XiaoFeng f6083f3490 Fix issue 10258 & 10408 2015-06-09 14:38:48 +08:00
andyque a1edd4a819 remove dead code 2014-09-04 11:00:48 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 1533374bd1 add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
Ricardo Quesada dc711643cd Squashed commit of the following: 
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 14 10:03:44 2014 -0700

    math renames

    `Vector2` -> `Vec2`
    `Vector3` -> `Vec3`
    `Vector4` -> `Vec4`
    `Matrix` -> `Mat4`

commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:24:28 2014 -0700

    raw version of rename Vector3

commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:07:14 2014 -0700

    rename Vector2 after merge

commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 2014-05-14 10:07:09 -07:00
Huabing.Xu 63b52dd287 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
andyque f5795c25b6 remove warnings under win32 2014-03-24 10:12:40 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00
CaiWenzhi 26b3013f77 Format codes 2014-03-10 15:08:42 +08:00
CaiWenzhi 80d97bb107 Modify action 2014-03-07 21:49:24 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Denis deb4666e27 -fixed formating and small optimizations 2014-02-13 11:39:53 +03:00
zhangcheng bf8187fee2 fixed UIAction play error. 2014-01-07 19:04:18 +08:00
edwardzhou e1c21aa9cb rename UIHelper to Helper for consistency 2014-01-07 16:22:18 +08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
chengstory 76f96d0b41 fixed ActionNode memoryleak. 2014-01-06 10:42:17 +08:00
chengstory faaf6d3f2b fixed #3457 fixes some bug. 2013-12-27 17:21:13 +08:00
chengstory 4cb227ae0d fixed #3457 ui action can not play. 2013-12-27 12:45:05 +08:00
Liam 0cdf2d15fe merge from develop branch 2013-12-27 10:50:50 +08:00
Liam 2a6c24f8bf update coco action with correct coding rule 2013-12-27 10:43:49 +08:00
chengstory 774e3d8536 issue #3457 
1. replace UIAction NULL to nullptr.
2. modify  class variable  name.
 2013-12-26 23:40:50 +08:00
chengstory cfbbb7889b Merge branch 'develop' into #3457 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-12-26 23:01:34 +08:00
CaiWenzhi 3206727b9c Modify actionnode 2013-12-26 17:01:31 +08:00
Liam a158e25767 modify coco action with new coding rule 2013-12-26 16:36:21 +08:00
Liam bc54707893 modify coco action with new coding rule 2013-12-26 16:29:59 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
yinkaile 5eb961b165 fixed warning 2013-12-25 19:46:09 +08:00
chengstory 64f0987fea issue #3456 ios test rapidjson. 2013-12-24 21:23:24 +08:00
zhangcheng 2c6f95ecea issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
CaiWenzhi 0dac69523c Remove "_renderer" from widget 2013-12-24 20:22:14 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
Ricardo Quesada 99ae4d86d3 fixes compiler warnings 
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
 2013-12-19 12:23:42 -08:00
minggo b67d567a79 replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
James Chen 499a0404d4 issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector. 2013-12-05 10:35:10 +08:00
James Chen c152652c5b issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr). 2013-12-04 15:56:08 +08:00
Liam 2aaa21255f fixed cocostudio action can not looping 2013-11-08 14:34:24 +08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00