samuelhu
|
faf3b30e9b
|
issue #3069:Add LuaObjectCBridge and related test sample
|
2013-10-31 15:20:53 +08:00 |
samuelhu
|
53b0bfc27b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTouchEvent
|
2013-10-31 09:52:01 +08:00 |
samuelhu
|
1f07a659a6
|
issue #3069:Modify layer lua register and add some compatible lua binding functions
|
2013-10-31 09:49:04 +08:00 |
minggo
|
9e5420c954
|
Merge pull request #4029 from minggo/iss2905-adjust_folder
use build/android-build to build android samples, and update readme
|
2013-10-30 03:30:03 -07:00 |
minggo
|
da9f7c912b
|
use build/android-build to build android samples, and update readme
|
2013-10-30 18:27:56 +08:00 |
James Chen
|
ca598f29eb
|
Merge pull request #4008 from dumganhar/touchevent-refactor
issue #3069: Refactor and Improve EventDispatcher
|
2013-10-29 00:46:56 -07:00 |
James Chen
|
cb7a762584
|
issue #3069: Updating EventDispatcherTest.
|
2013-10-29 14:59:05 +08:00 |
Michael Contento
|
fe180078f0
|
Android: add xlargeScreens="true" to supports-screens
|
2013-10-28 23:12:51 +01:00 |
James Chen
|
a829325240
|
issue #3069: Updating EventDispatcherTest.
|
2013-10-28 16:00:19 +08:00 |
James Chen
|
e6b0134080
|
issue #3069: Updating Custom event test.
|
2013-10-28 10:49:43 +08:00 |
James Chen
|
48ce5e39fe
|
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
|
2013-10-26 15:04:01 +08:00 |
James Chen
|
9bf44a6c83
|
issue #3069: Renaming 'removeListeners' to 'removeEventListeners'.
|
2013-10-25 16:34:26 +08:00 |
James Chen
|
27b71ba73c
|
Use integer as event type and listener type.
|
2013-10-25 10:53:47 +08:00 |
James Chen
|
b5cac51f97
|
PhysicsTest update.
|
2013-10-25 10:53:47 +08:00 |
James Chen
|
9c4bc9e8ed
|
Update physicsTest.
|
2013-10-25 10:53:47 +08:00 |
James Chen
|
7854a13278
|
Small fix for Bug-422.cpp and MenuTest.cpp.
|
2013-10-25 10:53:47 +08:00 |
James Chen
|
b131e8c509
|
Update menu test.
|
2013-10-25 10:53:46 +08:00 |
James Chen
|
9ed263056c
|
Use eventDispatcher to dispatch event. Remove controller codes in Layer.
|
2013-10-25 10:53:46 +08:00 |
James Chen
|
1f3863e787
|
Event Dispatcher refactor commit. TestCpp could run.
|
2013-10-25 10:53:45 +08:00 |
James Chen
|
cfaef2a01a
|
Adding onEnterHook, onXXXHook for Node.
|
2013-10-25 10:53:45 +08:00 |
Dhilan007
|
08960f1510
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2893
|
2013-10-24 18:16:44 +08:00 |
Dhilan007
|
fd993e2fa2
|
issues #2905:split jsbinding module
|
2013-10-24 17:54:57 +08:00 |
James Chen
|
10329de46c
|
Merge pull request #4002 from boyu0/iss2771_physical
issue #2771 physical
|
2013-10-24 02:31:40 -07:00 |
boyu0
|
a8ddca81bd
|
issue #2771: fix some compile error in win32
|
2013-10-23 18:52:09 +08:00 |
minggo
|
d07d054a01
|
issue #2905:ndk-r8e build ok now
|
2013-10-23 17:44:20 +08:00 |
boyu0
|
912a9a2887
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-10-23 17:41:52 +08:00 |
boyu0
|
899f720efa
|
issue #2771: implement getShapeAtPoint and getShapesAtPoint
|
2013-10-23 17:28:23 +08:00 |
minggo
|
e81efb24c9
|
issue #2905: android samples run ok
|
2013-10-23 16:49:50 +08:00 |
minggo
|
4952df576b
|
Merge pull request #3996 from boyu0/iss2771_physical
issue #2771: physical
|
2013-10-22 20:45:55 -07:00 |
boyu0
|
17422c3123
|
issue #2771: fix some compile error in win32
|
2013-10-23 11:08:21 +08:00 |
boyu0
|
51801d9218
|
issue #2771: fix some compile error in android and win32
|
2013-10-23 10:11:08 +08:00 |
minggo
|
0169189f6a
|
Merge pull request #3992 from Dhilan007/di2905
issues #2905:add SimpleGame vs-project
|
2013-10-22 18:41:26 -07:00 |
minggo
|
abcf8f268d
|
fix conflicts
|
2013-10-22 18:36:13 +08:00 |
Dhilan007
|
3252a89791
|
issues #2905:add SimpleGame vs-project
|
2013-10-22 18:11:07 +08:00 |
minggo
|
6a664d480a
|
issue #2905:samples build ok on linux
|
2013-10-22 18:01:56 +08:00 |
boyu0
|
24561860f0
|
issue #2771: add ray cast test
|
2013-10-22 18:00:24 +08:00 |
minggo
|
d07fbb8903
|
Merge pull request #3974 from boyu0/iss2771_physical
issue 2771: physical
|
2013-10-21 22:44:22 -07:00 |
Dhilan007
|
f11dba586a
|
issue #2905:modification vs-project for folder structure change
|
2013-10-21 22:09:21 +08:00 |
boyu0
|
6e2c4801f8
|
Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-10-18 16:05:29 +08:00 |
boyu0
|
6aef4476d9
|
issue #2771: edit some mistake when merge
|
2013-10-18 15:55:47 +08:00 |
boyu0
|
d12ee5f120
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-10-18 15:34:13 +08:00 |
Dhilan007
|
8fb0327597
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-18 14:57:33 +08:00 |
minggo
|
63c13d8eaa
|
issue #2905:simplify Android.mk dependence
|
2013-10-18 14:18:36 +08:00 |
Dhilan007
|
66c2fe26ef
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-17 22:34:09 +08:00 |
minggo
|
9c3cac759c
|
issue #2905:simple game and assets manager build ok on android
|
2013-10-17 18:39:37 +08:00 |
Dhilan007
|
6f39f903e3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-17 16:23:19 +08:00 |
minggo
|
e50f9fc43b
|
issue #2905: jsbinding samples and lua binding samples build ok on android
|
2013-10-17 15:04:30 +08:00 |
Dhilan007
|
546bc3aa32
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-17 11:33:10 +08:00 |
minggo
|
8f9756f030
|
issue #2905:TestJavascript build ok on Android
|
2013-10-17 11:28:57 +08:00 |
boyu0
|
89448135ad
|
issue #2771: implement some joint definition.
|
2013-10-17 10:57:48 +08:00 |