| .. |
|
.settings
|
add files include test and cocosDenshion
|
2011-08-19 14:43:19 +08:00 |
|
actions
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
base_nodes
|
merge luafix-0.9.2
|
2011-12-01 22:02:16 +08:00 |
|
cocoa
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
effects
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
include
|
* add CCNode:getPositionLua(), return CCPoint
|
2011-12-04 11:35:55 +08:00 |
|
keypad_dispatcher
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
label_nodes
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
layers_scenes_transitions_nodes
|
* merge luafix-0.9.2
|
2011-11-30 21:42:18 +08:00 |
|
menu_nodes
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
misc_nodes
|
* fix merge error 1
|
2011-11-30 21:47:23 +08:00 |
|
particle_nodes
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
platform
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
proj.airplay
|
fixed #582, use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.
|
2011-07-07 14:45:59 +08:00 |
|
proj.bada
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
|
2011-11-28 23:13:02 +08:00 |
|
proj.linux
|
fixed #850: update Box2d for linux
|
2011-11-29 17:12:21 +08:00 |
|
proj.win32
|
save the codes for testing
|
2011-11-21 12:04:21 +08:00 |
|
proj.wophone
|
Merge branch 'master' of https://github.com/jbyu/cocos2d-x
|
2011-11-15 14:00:52 +08:00 |
|
sprite_nodes
|
* fix merge error 2
|
2011-11-30 21:50:00 +08:00 |
|
support
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
text_input_node
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
textures
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2011-12-01 22:00:21 +08:00 |
|
tileMap_parallax_nodes
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
touch_dispatcher
|
issue #879: replase assert with CCAssert
|
2011-11-28 17:28:43 +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
|
* fix merge error 2
|
2011-11-30 21:50:00 +08:00 |
|
CCDrawingPrimitives.cpp
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
|
CCScheduler.cpp
|
* fix merge error 1
|
2011-11-30 21:47:23 +08:00 |
|
CCTimer.cpp
|
* rename LuaEngine to CCLuaEngine
|
2011-11-29 15:42:12 +08:00 |
|
cocos2d.cpp
|
* merge upstream/master to master
|
2011-11-30 21:38:20 +08:00 |
442e06e62e