axmol/cocos2dx
minggo 51eb56075b Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread 2011-11-21 09:36:55 +08:00
..
.settings add files include test and cocosDenshion 2011-08-19 14:43:19 +08:00
actions fix some warning 2011-10-19 15:24:19 +08:00
base_nodes fix some warning 2011-10-19 15:24:19 +08:00
cocoa issue #223: merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
effects Non-trivial arguments passed by reference now. 2011-08-17 17:26:26 +04:00
include Merge pull request #571 from jbyu/master 2011-11-17 18:53:14 -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 According to this thread, http://www.cocos2d-x.org/boards/6/topics/5075?r=5177, we must prevent yOffset to become a negative value. I use the laziest approach. 2011-11-09 22:11:36 +08:00
layers_scenes_transitions_nodes fixed #703: refactor Accelerometer 2011-08-31 17:14:29 +08:00
menu_nodes Merge remote-tracking branch 'remotes/upstream/master' 2011-11-15 14:43:55 +08:00
misc_nodes revert to normal version 2011-11-01 23:02:26 +08:00
particle_nodes offer a thread safe function to read contents of xml file, and the engine use it internal 2011-11-15 10:41:18 +08:00
platform Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread 2011-11-21 09:36:55 +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
script_support [win32] fixed #620: change the output of lua to a lib 2011-07-20 15:21:51 +08:00
sprite_nodes offer a thread safe function to read contents of xml file, and the engine use it internal 2011-11-15 10:41:18 +08:00
support issue #223: merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
text_input_node Non-trivial arguments passed by reference now. 2011-08-17 17:26:26 +04:00
textures synchrolize to master 2011-11-18 18:53:53 +08:00
tileMap_parallax_nodes fix compile error on 64 bit Linux 2011-10-19 15:12:38 +08:00
touch_dispatcher getLastValidIterator() may return a invalid iterator m_array.end(). 2011-11-16 11:08:26 +08:00
Android.mk [android] fixed #623: refactor Cocos2dJni.cpp 2011-07-25 14:12:30 +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 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 2011-09-29 16:03:37 +08:00
CCConfiguration.h modified: cocos2dx/.cproject 2011-08-23 11:28:04 +08:00
CCDirector.cpp Merge remote-tracking branch 'remotes/upstream/master' 2011-11-15 14:43:55 +08:00
CCDrawingPrimitives.cpp Merge https://github.com/reflog/cocos2d-x into reflog 2011-10-08 11:28:16 +08:00
CCScheduler.cpp Merge remote-tracking branch 'remotes/upstream/master' 2011-11-15 14:43:55 +08:00
cocos2d.cpp issue #645: update to v1.0.1 2011-08-02 15:45:27 +08:00