Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
History
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 		2014-09-01 15:26:25 +08:00
..
2d Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
3d remove unneeded includes 2014-08-29 15:39:52 +08:00
audio Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
base Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
deprecated Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
editor-support Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
math Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
network remove unneeded includes 2014-08-29 15:39:52 +08:00
physics fix chipmunk 2014-08-30 21:09:28 +08:00
platform Merge branch 'v3' into mergeExtensionEditBox 2014-09-01 15:26:25 +08:00
renderer Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
scripting/lua-bindings Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
storage/local-storage Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
ui Merge branch 'v3' into mergeExtensionEditBox 2014-09-01 15:26:25 +08:00
Android.mk Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
CMakeLists.txt fix linux 2014-08-29 11:53:39 +08:00
cocos2d-prefix.pch add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08:00
cocos2d.cpp update version 2014-08-22 11:48:14 +08:00
cocos2d.h Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00