Commit Graph

14 Commits

Author SHA1 Message Date
James Chen 0d90fea7b3 Merge branch 'myFeature' of https://github.com/tks2shimizu/cocos2d-x into iss1602-rand-ccdictionary
Conflicts:
	cocos2dx/cocoa/CCDictionary.cpp
	cocos2dx/cocoa/CCDictionary.h
2012-12-07 10:40:32 +08:00
Tomoaki Shimizu e680e5f0f2 Add randomObject to CCDictionary
Although CCArray has randomObject(), CCDictionary does not have it.
So CCDictionary should have randomObject().
2012-12-06 23:56:49 +09:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
Byung Choi 2ed9119d4f fixed pointer to int casting warnings and errors, based on stdint 2012-09-22 03:02:29 +09:00
Walzer a77a4eac03 add more details in doxygen comments. 2012-08-10 13:58:34 +08:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
James Chen 24e3ec7499 fixed #1336: Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
James Chen 7fe3f7357e issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen edfb8c1f9c issue #1190: used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg. 2012-04-26 11:39:49 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00