Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/emscripten
History
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 		2013-09-13 19:06:09 +08:00
..
CCAccelerometer.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCApplication.cpp Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk. 2013-07-26 18:17:30 +08:00
CCApplication.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCCommon.cpp More CCLog --> log. 2013-07-24 10:46:13 +08:00
CCDevice.cpp [dispatcher] Other platforms update. 2013-09-12 20:56:57 +08:00
CCEGLView.cpp [dispatcher] Other platforms update. 2013-09-12 20:56:57 +08:00
CCEGLView.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCFileUtilsEmscripten.cpp Adds const in FileUtils 2013-09-06 22:52:55 -07:00
CCFileUtilsEmscripten.h Adds const in FileUtils 2013-09-06 22:52:55 -07:00
CCGL.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImage.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
CCPlatformDefine.h Add platform files for Emscripten. 2013-05-06 20:58:46 -07:00
CCStdC.h Add platform files for Emscripten. 2013-05-06 20:58:46 -07:00
CCTextureCacheEmscripten.cpp issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
CCTextureCacheEmscripten.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTextureCacheEmscripten.js Get async image loading building with -O2 and asm.js 2013-06-17 17:10:41 -07:00