Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,324 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

204 Commits

Author SHA1 Message Date
natural-law 8035fc366c [uphone]Support read image file from zip file. 2011-02-17 16:16:50 +08:00
natural-law e4063fd190 [uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device. 2011-02-17 14:31:52 +08:00
yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXUIImage_win32.cpp
	cocos2dx/platform/win32/CCXUIImage_win32.h
	tests/test.win32/test.win32.vcproj
 2011-01-28 14:33:47 +08:00
walzer 3260eddd75 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-26 17:11:39 +08:00
walzer ead71525e2 [uphone] don't block when zip resources loading failed 2011-01-26 17:08:19 +08:00
minggo 31d287a77d [uphone]change the declaration of s_bPopupNotify from public to private 2011-01-26 16:42:48 +08:00
natural-law 3746af1d63 fixed #328.Modify the function and parameter name. 2011-01-26 15:43:12 +08:00
natural-law 7015e85918 fixed #328.By default,pop up a err dialog when loading textures failed. 2011-01-26 11:50:13 +08:00
natural-law d56575dd5a [uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath. 2011-01-25 14:26:26 +08:00
yangws 1a17f3ea55 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXApplication_win32.cpp
	tests/test.win32/test.win32.vcproj
 2011-01-22 17:52:06 +08:00
natural-law 31fc6c0039 [uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground(). 2011-01-20 13:55:45 +08:00
natural-law f7107fb015 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 
Conflicts:
	cocos2dx/platform/uphone/CCXApplication_uphone.h
 2011-01-20 13:47:01 +08:00
natural-law 3d225465c0 [uphone]fixed #308,BGM is paused when press power key to make uphone sleep. 2011-01-20 13:41:58 +08:00
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 2011-01-20 11:18:35 +08:00
yangws ee50078b3e implement FPS limitation on UPhone. 2011-01-20 10:49:30 +08:00
walzer b7e109f6e6 fixed iphone/android/uphone compilation errors brought by the prevous commit of #322 2011-01-19 22:29:57 +08:00
yangws 804dc4ef7c Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/win32/CCXBitmapDC.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
 2011-01-19 15:29:08 +08:00
natural-law f992838f96 [uphone]fixed #293,Modify the absolute path method in CCFileUtils. 2011-01-18 18:21:06 +08:00
natural-law c682dd7084 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-18 10:16:35 +08:00
natural-law acb4a6a369 [uphone]fixed #293,modify the absolute path method in CCFileUtils. 2011-01-18 10:14:44 +08:00
walzer ad5ee3c9f6 Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +08:00
yangws 67c0ad6332 add platform support project on win32. 
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
 2011-01-15 18:05:35 +08:00
natural-law acff950860 [uphone]fixed #315,remove the way which use resource in ResourceMap. 2011-01-14 17:42:37 +08:00
minggo 7e30615d02 issue #304 Remove codes for controlling frame rate. 2011-01-10 15:13:30 +08:00
Walzer 653cb2d76d [uphone] fixed #308, BGM can be paused after power key pressed to make uphone sleep. 2011-01-10 11:03:58 +08:00
minggo a391c8ef99 fixed some errors for iphone platform 2011-01-07 10:25:32 +08:00
natural-law 25e9721678 fix bugs. 2011-01-04 17:46:23 +08:00
Walzer 4a6989b6ff [uphone] add keyMenuBack to CCKeypadDelegate 2010-12-31 18:15:30 +08:00
Walzer 56f8bf3c40 [uphone] use a shared TWindow to draw bitmaps and texts, this optimization promotes the performance on uphone about 5%~6% 2010-12-31 16:07:52 +08:00
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
Walzer eac572b2c9 [uphone] remove CfgGetScreenStatus call from EVENT_WinPaint, this api is out-of-process & inefficient 2010-12-30 15:42:11 +08:00
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
minggo b2b8591b26 fixed #279 2010-12-28 10:23:14 +08:00
yangws c142070c2c misc_node upto-0.99.5. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-25 15:09:42 +08:00
natural-law 792781f5d6 fixed #266 fix a bug of message box in cocos2d-uphone pop-up at the wrong time. 2010-12-18 14:44:24 +08:00
Walzer c8989c7941 fix a memory leak when invoking png_destroy_read_struct, for uphone & andorid platform 2010-12-17 10:14:56 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
natural-law 6c1eb5d5c0 fixed #227 integrate multi-touch support on uphone 2010-12-09 18:28:16 +08:00
minggo f3126de646 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-09 13:59:02 +08:00
yangws 1151cea7dd fixed 233 keep the backlight on when the cocos2d-game at foreground. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-09 11:41:32 +08:00
unknown 9c06a69ed9 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-08 18:05:17 +08:00
yangws 5b51bd049b issue #233 prevent KeyLock when playgame on uphone. 2010-12-04 18:16:09 +08:00
natural-law 8891b894d6 fixed #239 Clear memory leak in cocos2d-uphone 2010-12-03 16:42:31 +08:00
yangws 96115bc26e fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device. 
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.

Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-03 15:27:55 +08:00
yangws 687fb199fc issue #233 stop main loop when application enter background. test ok on emulator 2010-12-02 18:44:13 +08:00
natural-law b1d3e66e68 1. Check the return value of FileData::getFileData() 
2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile()
3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.
 2010-11-29 14:21:33 +08:00
natural-law 4d98faabc5 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00