Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
History
zifter d875f27c67 Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 
Conflicts:
	cocos/ui/UIListView.h
	cocos/ui/UIPageView.h
 		2014-05-17 10:40:36 +03:00
..
2d Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 2014-05-17 10:40:36 +03:00
audio Squashed commit of the following: 2014-05-16 14:36:00 -07:00
base Squashed commit of the following: 2014-05-16 14:36:00 -07:00
deprecated Squashed commit of the following: 2014-05-16 14:36:00 -07:00
editor-support Merge pull request #6734 from 2youyouo2/v3 2014-05-17 12:17:34 +08:00
math Squashed commit of the following: 2014-05-16 14:36:00 -07:00
network Squashed commit of the following: 2014-05-16 14:36:00 -07:00
physics Squashed commit of the following: 2014-05-14 10:07:09 -07:00
platform Fixes android build issues 2014-05-16 18:16:20 -07:00
renderer Squashed commit of the following: 2014-05-16 14:36:00 -07:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-05-17 03:20:49 +00:00
storage upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 2014-05-07 17:41:04 +03:00
ui Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 2014-05-17 10:40:36 +03:00
Android.mk Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CMakeLists.txt Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d-prefix.pch Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d.cpp Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
cocos2d.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00