Commit Graph

92 Commits

Author SHA1 Message Date
shinriyo 1569550528 getDelta() is delta function
I'm sorry, I mistook the pull request.
2012-10-14 21:20:31 +09:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
Walzer 0431cb455b fixed , add CCTouch::getLocation(), getDelta() method
return OpenGL coordinates directly, to make the usage more convenient.
2012-07-31 17:41:53 +08:00
Walzer 685b70e6fb fixed , 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
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 2666df9472 issue #1269:mrege latest code and fix conflict 2012-06-19 13:57:33 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 579e6a1100 issue : export CCTouch class. 2012-06-18 18:32:17 +08:00
James Chen 23574172ff issue : Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen f466b081c9 fixed : Used std::sort to sort the touchHandler array. 2012-06-07 11:38:59 +08:00
James Chen c64c4a74bf fixed : Strange TouchDispatcher behavior. 2012-06-06 22:49:28 +08:00
minggo a698f9bf69 fix some bug 2012-05-30 18:31:20 +08:00
Walzer 1e732930b7 fixed , testjs and spidermonkey-ios is merged. But only test_actions.js works. 2012-05-24 17:48:05 +08:00
James Chen 0f36a89c7e issue : Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen 230b8a386b issue : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen 7d7baf81a2 refactor updated... 2012-04-18 18:43:45 +08:00
James Chen f529bcd659 issue : Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
James Chen b5fca2f5f3 issue : Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks. 2012-03-20 21:04:29 +08:00
James Chen 6ce06bd906 issue : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
minggo 153d2b8192 issue : build cocos2dx as static lib and remove some unneeded codes 2012-02-09 15:49:14 +08:00
dumganhar ca94a11190 fixed : removed definition of NSMutableSet. 2012-02-07 15:35:10 +08:00
dumganhar 4010733c20 fixed : To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value. 2011-12-31 17:44:45 +08:00
minggo 53fae04ba8 fixed : make add/remove touch delegate in menu callback function correctly 2011-12-30 15:43:36 +08:00
minggo fcb2294e20 fixed : subclass should retain/release when dynamic_cast fail. 2011-12-28 14:47:54 +08:00
minggo cdc842051f issue : use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
minggo f0d22ae504 issue : replase assert with CCAssert 2011-11-28 17:28:43 +08:00
moadib 807ae36d6a CCMutableArray optimization 2011-08-20 01:30:33 +04:00
minggo e39d551294 fixed : fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed 2011-08-17 15:00:32 +08:00
reflog ae945f4880 changes to support CCScrollLayer 2011-07-28 17:09:06 +03:00
minggo a64783d4d2 fix the usage of sort() 2011-07-11 10:12:29 +08:00
minggo f0ea58651b fixed 2011-07-08 15:01:51 +08:00
minggo 022e2b9998 issue : refactor ok on win32 2011-06-20 17:31:38 +08:00
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
liswei 1591c7edc8 fixed fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
Walzer f7b294fe24 fixed CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time, which makes an error logic if adding standard touch delegate when CCTouchDispatcher::m_tLock = ture 2011-04-24 15:38:03 +08:00
minggo 7d52161804 fixed : Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
walzer 81fa070125 fixed , add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
minggo 7c52a521fa fixed : change UIEvent to CCEvent 2011-03-18 09:39:34 +08:00
minggo b5a99f90df issue : rename file names and object names 2011-03-07 17:11:57 +08:00
yangws 67c0ad6332 add platform support project on win32.
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
Walzer 820c2f0714 issue cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 416a319344 fixed 2010-11-13 03:34:49 +00:00
natural-law c165ad36a7 debug 2010-11-05 09:29:24 +00:00
Ming a05f9d0dc5 2010-10-09 01:57:24 +00:00