Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
History
Ricardo Quesada d35cc3b0fa Merge branch 'develop' into clone_reverse_fixes 
Conflicts:
	cocos2dx/actions/CCAction.cpp
	cocos2dx/actions/CCActionEase.cpp
	cocos2dx/actions/CCActionGrid.cpp
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/actions/CCActionInterval.cpp
	scripting/javascript/bindings/generated
 		2013-06-18 09:59:34 -07:00
..
AssetsManager issue #1859:fix compiling error of AssetsManager.cpp 2013-05-17 09:47:31 +08:00
CCArmature fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
CCBReader Merge branch 'develop' into clone_reverse_fixes 2013-06-18 09:59:34 -07:00
Components fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
GUI fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
LocalStorage fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
network fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
physics_nodes fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +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.linux issue #2284: add some files into extensions linux project 2013-06-14 14:55:46 +08:00
proj.marmalade fixed #2270: Adding Armature(CocoStudio runtime) support. Enabling exceptions for marmalade. 2013-06-09 10:54:55 +08:00
proj.nacl Change CCAnimation to CCArmatureAnimation 2013-06-08 11:16:17 +08:00
proj.tizen issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.win32 Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
spine issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +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