| .. |
|
.settings
|
add files include test and cocosDenshion
|
2011-08-19 14:43:19 +08:00 |
|
actions
|
merge upstream/master to master
|
2011-12-17 12:02:24 +08:00 |
|
base_nodes
|
* add CCNode::getChildrenCount()
|
2012-01-21 01:29:41 +08:00 |
|
cocoa
|
merge upstream/master to master
|
2011-12-17 12:02:24 +08:00 |
|
effects
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
include
|
* add CCNode::getChildrenCount()
|
2012-01-21 01:29:41 +08:00 |
|
keypad_dispatcher
|
merge upstream/master to master
|
2011-12-17 12:02:24 +08:00 |
|
label_nodes
|
* merge upstream/master to master
|
2012-01-20 19:08:21 +08:00 |
|
layers_scenes_transitions_nodes
|
* merge lua fix
|
2012-01-21 00:47:51 +08:00 |
|
menu_nodes
|
* merge upstream/master to master
|
2012-01-20 19:08:21 +08:00 |
|
misc_nodes
|
* fix merge error 1
|
2011-11-30 21:47:23 +08:00 |
|
particle_nodes
|
merge upstream/master to master
|
2011-12-17 12:02:24 +08:00 |
|
platform
|
* merge upstream/master to master
|
2012-01-20 19:08:21 +08:00 |
|
proj.bada
|
fixed #918: modify filter of airplay to marmalade.
|
2011-12-16 11:08:37 +08:00 |
|
proj.linux
|
modify eclipse project setting for linux port
|
2012-01-12 19:15:23 +08:00 |
|
proj.marmalade
|
Added Marmalade support to TextInputTest and HelloLua samples
|
2012-01-15 15:57:10 +01:00 |
|
proj.qnx
|
Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619
|
2011-12-15 11:36:42 +08:00 |
|
proj.win32
|
issue #892: use RTTI to simplify codes, work ok on win32
|
2011-12-07 14:28:22 +08:00 |
|
proj.wophone
|
Merge branch 'master' of https://github.com/jbyu/cocos2d-x
|
2011-11-15 14:00:52 +08:00 |
|
sprite_nodes
|
* merge upstream/master to master
|
2012-01-20 19:08:21 +08:00 |
|
support
|
merge upstream/master to master
|
2011-12-17 12:02:24 +08:00 |
|
text_input_node
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
textures
|
* merge upstream/master to master
|
2012-01-20 19:08:21 +08:00 |
|
tileMap_parallax_nodes
|
merge upstream/master to master
|
2011-12-17 12:02:24 +08:00 |
|
touch_dispatcher
|
fixed #927: 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 |
|
Android.mk
|
fixed #838: tests and HelloLua support x86
|
2011-11-23 15:51:30 +08:00 |
|
CCCamera.cpp
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
CCConfiguration.cpp
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCConfiguration.h
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
CCDirector.cpp
|
Added Marmalade support to TextInputTest and HelloLua samples
|
2012-01-15 15:57:10 +01:00 |
|
CCDrawingPrimitives.cpp
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
CCScheduler.cpp
|
merge upstream/master to master
|
2011-12-17 12:02:24 +08:00 |
|
CCTimer.cpp
|
* rename LuaEngine to CCLuaEngine
|
2011-11-29 15:42:12 +08:00 |
|
cocos2d.cpp
|
* merge upstream/master to master
|
2012-01-20 19:08:21 +08:00 |
f8dafe6712