akira_cn
|
e1f9e1a300
|
update keypad support
|
2013-04-17 10:40:46 +08:00 |
Sam Clegg
|
38878b084b
|
Fix all compiler warnings produced by gcc.
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
|
2013-03-05 17:01:00 -08:00 |
James Chen
|
65f19f5c53
|
Removing some deprecated functions.
|
2013-03-01 10:57:52 +08:00 |
minggo
|
63e4091bfa
|
fixed #1686:finish updating
|
2013-02-28 11:55:36 +08:00 |
minggo
|
cd4f18c48f
|
issue #1686:synchronize CCLayer.cpp
|
2013-02-27 18:21:35 +08:00 |
James Chen
|
7dc64fc9a6
|
issue #1686: sync to CCLayer
|
2013-02-27 09:38:30 +08:00 |
James Chen
|
6565fa92cc
|
fixed #1649: Changed return type to const reference for member variable access.
|
2013-01-14 15:51:53 +08:00 |
minggo
|
a75f8b7e7a
|
fixed #1593:remove all deprecated methods expect CCBAnimationManager
|
2012-12-06 18:51:33 +08:00 |
minggo
|
bbcbfa71ef
|
Merge pull request #1704 from minggo/cclayer_script_support
Cclayer script support
|
2012-12-03 18:55:11 -08:00 |
James Chen
|
609fce7e2f
|
fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204).
|
2012-12-04 10:36:13 +08:00 |
dualface
|
e0ee27cb17
|
[luabinding] fix CCLayer:getScriptTOuchHandlerEntry()
[luabinding] add CCLayer keypad, accelerometer support
|
2012-12-02 15:17:34 +08:00 |
James Chen
|
98045f667f
|
issue #1583: Added CCMenu::alignItemsInColumnsWithArray, CCMenu::alignItemsInRowsWithArray, CCLayer::CCLayerMultiplex and CCLayer::initWithArray.
|
2012-11-30 21:13:25 +08:00 |
James Chen
|
ebd522e3fa
|
issue #1564: Return a new object instead of 'const reference' for some get methods.
|
2012-11-20 16:34:55 +08:00 |
James Chen
|
c5b5b978fa
|
issue #1555: Made win32 works ok.
|
2012-11-16 17:08:34 +08:00 |
James Chen
|
7601cc7e27
|
Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update
Conflicts:
cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
|
2012-11-16 16:21:16 +08:00 |
Rohan Kuruvilla
|
50fbf86180
|
Uncommenting accelerometer callback in CCLayer
|
2012-11-16 15:56:28 +08:00 |
minggo
|
b497143f93
|
issue #1555:menu can receive touch event now
|
2012-11-16 14:51:48 +08:00 |
minggo
|
a701eaecce
|
issue #1555:update to v2.1 beta3
|
2012-11-14 18:05:15 +08:00 |
minggo
|
d2a5723973
|
issue #1555:add CCDrawNode
|
2012-11-09 12:08:18 +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
|
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 |
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 |
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
|
2c518e43b2
|
[Lua] fix CCLayer:registerScriptTouchHandler()
[Lua] make CCNotificationCenter script support
|
2012-08-28 12:08:15 +08: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 |
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 |
minggo
|
90448ec7d0
|
issue #1269:fix some compiling error because of including error header files
|
2012-06-19 16:20:46 +08:00 |
James Chen
|
595a402c83
|
fixed #1292:make some function names more readable.
|
2012-06-15 16:47:30 +08:00 |