Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/Res
History
dumganhar 3c795073e0 Merge branch 'master' into bada 
Conflicts:
	HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/CCamera.cpp
	cocos2dx/cocoa/NSData.cpp
	cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
	cocos2dx/platform/CCFileUtils_platform.h
	cocos2dx/platform/CCXApplication_platform.h
	cocos2dx/platform/CCXCocos2dDefine_platform.h
	cocos2dx/platform/CCXEGLView_platform.h
	cocos2dx/platform/CCXMath.h
	cocos2dx/platform/CCXUIAccelerometer_platform.h
	cocos2dx/platform/CCXUIImage_platform.h
	cocos2dx/platform/ccxCommon_platform.h
	cocos2dx/platform/config_platform.h
	cocos2dx/platform/platform.h
	cocos2dx/support/base64.cpp
	cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
	tests/AppDelegate.cpp
	tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
 		2011-09-19 13:42:08 +08:00
..
Images fixed #574, Add bugs test case. 2011-07-08 11:22:35 +08:00
TileMaps issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them 2010-11-12 09:24:12 +00:00
animations issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them 2010-11-12 09:24:12 +00:00
fonts [iOS] fixed #668: CCLabelBMFont looks ok in retina mode 2011-08-10 15:07:34 +08:00
app.config.txt [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
app.icf [airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator.... 2011-07-09 13:05:22 -07:00
background.mp3.REMOVED.git-id issue #307: add music resource 2011-01-21 15:17:23 +08:00
gbk_uni_tb.dat.REMOVED.git-id merge bada platform 2010-12-15 18:05:02 +08:00