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

157 Commits

Author SHA1 Message Date
Rohan Kuruvilla 50fbf86180 Uncommenting accelerometer callback in CCLayer 2012-11-16 15:56:28 +08:00
James Chen 21e4f80fbd Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
James Chen 0abcd694c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test-js-device-crash 2012-11-01 22:19:20 +08:00
James Chen 0ace12fc52 issue #1526: Moved implementations of static functions in CCParticleExample.h, CCLayer.h to CCParticleExample.cpp, CCLayer.cpp. 2012-11-01 22:17:12 +08:00
minggo d16a6bbe2f issue #1526:move implementation of static methond into .cpp file 2012-11-01 22:12:13 +08:00
James Chen e8bf21e6a6 fixed #1543: The CCLayerGradient background of CocosBuilderTest can't be shown. 2012-10-31 18:00:51 +08:00
James Chen 2cfad104fa issue #1530: Corrected the logic of CClayer::registerWithTouchDispatcher function. 2012-10-29 15:38:44 +08:00
Rohan Kuruvilla a2ee6c3761 Changing Touch API in cocos2d-x. Also change ScriptEngine callbacks for targetted Touches 2012-10-29 15:01:30 +08: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
dualface e36c4abb65 [Lua] remove Lua script handler on CCNode destroy 2012-09-21 00:21:24 +08:00
minggo e84606aa47 Update cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp 2012-09-20 16:15:00 +08:00
dualface 2e900da66d add comment 2012-09-20 11:48:34 +08:00
dualface 1a162a09ad restore CCLayer:onExit() 2012-09-20 11:32:02 +08:00
dualface 36908396d2 [Lua] disable CCLayer remove script touch handler on exit 2012-09-20 09:29:20 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
James Chen 7d8b261ced fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions. 2012-09-11 14:02:33 +08:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
James Chen 0f213beae2 issue #1454: Fixed a bug in CCMenuItem::activate. 2012-08-31 22:33:14 +08:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
minggo 860d3eff4b issue #1454: make js binding work together with lua binding and native codes 2012-08-31 17:55:45 +08:00
YuLei 02e77faf51 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-08-28 12:22:57 +08:00
YuLei 2c518e43b2 [Lua] fix CCLayer:registerScriptTouchHandler() 
[Lua] make CCNotificationCenter script support
 2012-08-28 12:08:15 +08:00
Rolando Abarca c6db10772c fixes default arguments for the generator 2012-08-27 08:43:38 -07:00
Rohan Kuruvilla 0cf880d620 Fixing touch handling to remove the need to registerTouchHandler 2012-08-27 08:43:38 -07:00
Rohan Kuruvilla c47d9d4e7c Adding Touch callbacks and capability to pass this around 2012-08-27 08:43:38 -07:00
Rolando Abarca a114502929 removes OBJECT_TYPE thing 2012-08-27 08:43:38 -07:00
Rohan Kuruvilla 0e9ba1173a Callbacks 2012-08-27 08:43:37 -07:00
Rolando Abarca 4e640ecb35 uses new ADD_OBJECT_TYPE macro 2012-08-27 08:43:37 -07:00
folecr 487b252a82 Remove macros 2012-08-27 08:43:34 -07:00
Rolando Abarca e757d55a29 updates cocos2d-x API to support getObjectType() 2012-08-27 05:45:11 -07:00
minggo 0e81fd0568 fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC 2012-08-27 16:11:07 +08:00
mustime 1a55b7c5ba Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381 2012-07-27 18:29:57 +08:00
mustime 9949a34669 issue 1381: change setContentSize(CCSize size) to setContentSize(const 
CCsize & size) in CCNode
 2012-07-27 16:57:56 +08:00
minggo 16c469fa4e Merge pull request #1127 from mustime/bug1381 
issue #1381: change the setContentSize interface in the subclasses of CCNode
 2012-07-25 21:39:44 -07:00
mustime 9ad241c8f8 issue #1381: change the setContentSize interface in the subclasses of 
CCNode
 2012-07-26 12:03:37 +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
mustime 50289655a5 fixed #1381: fixed different declaration on CCLayerColor::setContentSize 2012-07-10 09:13:49 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
James Chen 5274fc378d fixed a typo in CCScene.h. 2012-06-21 13:48:57 +08:00
Ngoc Dao 28cc77008d "node" -> "create" 2012-06-21 14:33:27 +09: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 d3d3288e09 fixed #1336: Updated CCScene.h. 2012-06-20 12:03:50 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +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 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 595a402c83 fixed #1292:make some function names more readable. 2012-06-15 16:47:30 +08:00
minggo 266a5e5e66 Merge pull request #1028 from minggo/iss1292_moidify_function_name 
issue #1292:make some function names more readable
 2012-06-15 00:14:13 -07:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 4c1ca36aa8 fixed #1326: The compilation of Hellolua and testjs project was broken after synchronizing to rc2. 2012-06-15 10:51:53 +08:00