Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/3d
History
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 		2014-06-04 09:19:22 -07:00
..
CCMesh.cpp Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCMesh.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCObjLoader.cpp issue #5429: treat warning as error on Mac 2014-05-30 16:46:01 +08:00
CCObjLoader.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCSprite3D.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCSprite3D.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCSprite3DDataCache.cpp Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCSprite3DDataCache.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CMakeLists.txt Squashed commit of the following: 2014-05-18 14:49:16 -07:00