minggo
|
3679d66c8e
|
remove unneeded includes
|
2014-08-29 15:39:52 +08:00 |
pandamicro
|
34b93a24ff
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
|
2014-08-21 16:07:19 +08:00 |
pandamicro
|
909dd0d397
|
Update #3897: Refactor missed protected constructors
|
2014-08-21 15:11:33 +08:00 |
Huabing.Xu
|
190264c090
|
add CC_DLL in Event systems
|
2014-07-14 16:43:28 +08:00 |
Dhilan007
|
7cd7b9e054
|
issue #4892:Implement logical codes of game controller
|
2014-06-30 00:28:21 +08:00 |
andyque
|
47acbc24e0
|
issue #4861, add CCEventFocus and CCEventListener
|
2014-05-05 11:37:38 +08:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |