| .. |
|
.settings
|
add files include test and cocosDenshion
|
2011-08-19 14:43:19 +08:00 |
|
actions
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
base_nodes
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
cocoa
|
* fix merge error 1
|
2011-11-21 17:00:56 +08:00 |
|
effects
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
include
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
keypad_dispatcher
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
label_nodes
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
layers_scenes_transitions_nodes
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
menu_nodes
|
* fix merge error 2
|
2011-11-21 17:07:16 +08:00 |
|
misc_nodes
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
particle_nodes
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
platform
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +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
|
issue #223: merge bada branch and fix some error
|
2011-11-18 18:45:05 +08:00 |
|
proj.linux
|
bundle 64 bit linux static libs
|
2011-10-28 12:19:26 +08:00 |
|
proj.win32
|
issue #854: pthread work ok on iOS
|
2011-11-18 09:55:47 +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 cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
support
|
* fix merge error 3
|
2011-11-21 17:09:23 +08:00 |
|
text_input_node
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
textures
|
* fix merge error 3
|
2011-11-21 17:09:23 +08:00 |
|
tileMap_parallax_nodes
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
touch_dispatcher
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
Android.mk
|
[android] fixed #623: refactor Cocos2dJni.cpp
|
2011-07-25 14:12:30 +08:00 |
|
CCCamera.cpp
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +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
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
CCDrawingPrimitives.cpp
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
CCLuaSupport.cpp
|
* remove needless warning
|
2011-11-20 21:12:24 +08:00 |
|
CCScheduler.cpp
|
* fix merge error 1
|
2011-11-21 17:00:56 +08:00 |
|
CCTimer.cpp
|
* add CCLuaSupport.cpp/.h, CCSchedulerFuncEntry class
|
2011-11-20 16:38:27 +08:00 |
|
cocos2d.cpp
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
611e09fe2f