axmol/extensions
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
..
AssetsManager getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCArmature closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
CCBReader closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
Components getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
GUI closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
LocalStorage Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
network getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
physics_nodes closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
proj.blackberry [BB] Updating project configuration after adding CocoStudio runtime. 2013-06-09 15:29:51 +08:00
proj.emscripten issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.ios issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
proj.linux Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
proj.mac cocos2d-x in Mac: 2013-06-28 19:02:10 -07:00
proj.marmalade fixed #2270: Adding Armature(CocoStudio runtime) support. Enabling exceptions for marmalade. 2013-06-09 10:54:55 +08:00
proj.nacl [NaCl] Fix NaCl build which had been disabled. 2013-06-20 12:56:12 -07:00
proj.tizen Support Tizen 2.2 SDK. 2013-07-10 13:04:08 +09:00
proj.win32 closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
spine closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
Android.mk issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
ExtensionMacros.h issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
cocos-ext.h Merge branch 'master' into develop 2013-06-18 10:46:25 +08:00