Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
History
James Chen 976d4ad11e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 
Conflicts:
	cocos2dx/actions/CCActionInterval.cpp
	cocos2dx/cocoa/CCDictionary.cpp
	samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
 		2013-07-09 09:48:41 +08:00
..
AssetsManager issue #2305:remove unneeded comment 2013-06-24 14:11:30 +08:00
CCArmature From C++ best practices 2013-07-08 14:38:14 -07:00
CCBReader issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
Components issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
GUI issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
LocalStorage Fix compile error. 2013-06-20 19:20:27 +09:00
network issue #2305: Sleep(50) on Win32, usleep(50000) on unix --> std::this_thread::sleep_for(std::chrono::milliseconds(50)); 2013-06-26 11:34:04 +08:00
physics_nodes issue #2129: Windows doesn't support 'initializer list', using constructor instead. 2013-07-07 21:08:14 +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 Added CocosDenshion dependency to libextension project 2013-06-30 21:38:06 +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 Fix compile error. 2013-06-20 19:20:27 +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 issue #2129:fix conflicts 2013-07-05 17:32:50 +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