dingpinglv
|
ee44f024f1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
Conflicts:
cocos/2d/CCActionGrid.h
cocos/2d/CCAnimation.h
cocos/2d/CCAnimationCache.h
cocos/base/CCRef.h
|
2015-03-18 21:58:07 +08:00 |
dingpinglv
|
a99c2c7893
|
Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h
|
2015-03-18 21:45:58 +08:00 |
SuYaohui
|
31944da08c
|
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
|
2015-03-18 20:26:16 +08:00 |
SuYaohui
|
ee8776f041
|
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
|
2015-03-18 20:07:00 +08:00 |
Ricardo Quesada
|
6f3ca63f00
|
Moved base/CCPlatform* -> platform/CCPlatform*
|
2014-09-09 17:17:07 -07:00 |
minggo
|
7baf873bf6
|
remove unneeded includes
|
2014-08-28 17:03:29 +08:00 |
James Chen
|
1ced31a2d3
|
issue #5160: Don't use static variables, use member variables
|
2014-05-13 17:29:05 +08:00 |
James Chen
|
0cd2196b88
|
closed #5160: Dispatch a custom event after an animation frame is displayed
|
2014-05-13 17:08:30 +08:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
Ricardo Quesada
|
81c2d92355
|
yeah... love in includes
<3
|
2014-04-26 10:35:57 -07:00 |
Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
James Chen
|
9d8d256bee
|
issue #4729: Android build works ok.
|
2014-04-10 00:36:42 +08:00 |
pandamicro
|
e5bf6c438f
|
Fixed #4638: Add loop parameter to Animation::createWithSpriteFrames
|
2014-04-02 18:06:17 +08:00 |
pandamicro
|
05899d5f6a
|
Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames function
|
2014-04-02 11:48:49 +08:00 |
James Chen
|
f51c39c034
|
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
Thank @pandamicro.
|
2014-03-21 13:44:29 +08:00 |
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +08:00 |
James Chen
|
54289276de
|
issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
|
2013-12-04 17:46:57 +08:00 |
James Chen
|
4212e33aee
|
issue #2790: Removes unused comments in CCAnimation.h
|
2013-12-04 17:27:53 +08:00 |
James Chen
|
4ec6e50cc4
|
issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
|
2013-12-04 16:02:52 +08:00 |
James Chen
|
90062b656d
|
issue #2790: Node::_children is Vector<Node*> now.
|
2013-12-04 16:00:17 +08:00 |
Ricardo Quesada
|
a583ad461f
|
CCControlButton has protected constructor
|
2013-11-14 17:19:16 -08:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |