axmol/cocos2dx
natural-law 1bdce00740 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
	cocos2dx/include/ccConfig.h
2011-07-08 17:08:57 +08:00
..
actions fixed #589 2011-07-08 15:28:13 +08:00
base_nodes fixed #579: change zorder to int 2011-07-06 20:48:56 +08:00
cocoa fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference 2011-07-07 08:23:31 +08:00
effects fixed #568 2011-07-05 14:51:17 +08:00
include Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-08 17:08:57 +08:00
keypad_dispatcher fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
label_nodes fixed #590 2011-07-08 14:32:09 +08:00
layers_scenes_transitions_nodes fix #592 2011-07-08 15:38:32 +08:00
menu_nodes fixed #591 2011-07-08 15:02:46 +08:00
misc_nodes fix a bug of CCProgressTimer when upgrade to rc3 2011-07-06 16:29:56 +08:00
particle_nodes fix some compiling warnings 2011-07-07 11:27:45 +08:00
platform [airplay] fix : incorrect calculation of the bit depth 2011-07-07 08:40:29 -07: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.win32 fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
proj.wophone fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
script_support issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object. 2011-06-21 17:02:08 +08:00
sprite_nodes fixed #591 2011-07-08 15:02:46 +08:00
support fixed #588. 2011-07-08 14:16:10 +08:00
text_input_node fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
textures fix #592 2011-07-08 15:38:32 +08:00
tileMap_parallax_nodes fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
touch_dispatcher fixed #586 2011-07-08 15:01:51 +08:00
Android.mk fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
CCCamera.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCConfiguration.cpp fixed #502 modify CCConfiguration to singleton mode 2011-06-15 11:48:00 +08:00
CCConfiguration.h fixed #568 2011-07-05 14:51:17 +08:00
CCDirector.cpp fixed #568 2011-07-05 14:51:17 +08:00
CCDrawingPrimitives.cpp fixed #568 2011-07-05 14:51:17 +08:00
CCScheduler.cpp fixed #591 2011-07-08 15:02:46 +08:00
cocos2d.cpp fixed #568 2011-07-05 14:51:17 +08:00