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

1389 Commits

Author SHA1 Message Date
minggo 36cb90aaa0 Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport 2011-02-23 14:13:48 +08:00
minggo 3dde0ebcf5 [android] fixed #353: support jpg on android 2011-02-23 13:43:45 +08:00
Macarse b52eed0782 blah 2011-02-22 22:32:24 -03:00
yangws c43d1371a6 WVGA keep w/h rate scale test on uphone device ok. 2011-02-21 16:14:13 +08:00
yangws 4d47babf9e add ; after NS_CC_BEGIN 2011-02-19 18:16:45 +08:00
natural-law 4362a5f381 [uphone]issue #316,Resolution auto adjustment. 2011-02-19 17:44:43 +08:00
natural-law 60e9ae873c Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 
Conflicts:
	HelloWorld/AppDelegate.cpp
	tests/AppDelegate.cpp
 2011-02-19 10:19:14 +08:00
yangws 85b9c9ae21 Retina display support and scale with keep w/h rate ok on win32. 2011-02-18 18:30:22 +08:00
natural-law 811d476848 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into uphonePlatform 2011-02-18 10:45:31 +08:00
natural-law 245155e66a [uphone]issue #340,Refactor platform_support on uphone,and run tests successful on both simulator and device. 2011-02-18 10:44:49 +08:00
Macarse c6f4eab602 typo 2011-02-17 23:44:14 -03:00
Macarse 43a437a978 fixed small error 2011-02-17 23:28:17 -03:00
Macarse 4267593bf9 Used an array approach 2011-02-17 23:23:36 -03:00
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
natural-law 0f52839efb [uphone]support wrap when the dimensions is specified in CCLabelTTF. 2011-02-16 11:03:32 +08:00
walzer 693a8f049b [iphone] test alignment in labels, ref to the post http://www.cocos2d-x.org/boards/6/topics/588?r=589#message-589 Thanks to Slaz 2011-02-14 11:51:56 +08:00
walzer 626a3f8b74 [uphone] fixed #348, text drawing blur if color=white and fontSize<24 2011-02-12 22:42:42 +08:00
natural-law 0a2ceee2c5 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into dev 2011-02-12 17:24:41 +08:00
minggo 043d771f1a Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev 2011-02-12 17:23:50 +08:00
natural-law 20409e7a58 delete the code for debug in cocos2d-android. 2011-02-12 17:20:13 +08:00
natural-law 8fcb9d017c delete the code for debug in cocos2d-android. 2011-02-12 17:18:25 +08:00
yangws 8458476597 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	.gitignore
 2011-02-12 16:42:47 +08:00
minggo 81848f19e6 Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345 2011-02-12 11:29:27 +08:00
walzer 7e039fbaa1 [win32] add CCX_DLL to CCLayerGradient & CCTimer 2011-02-11 17:30:11 +08:00
minggo eef0bd4578 [iphone] fixed bug #345: remove init invoking 2011-02-11 16:06:09 +08:00
walzer b92fac0561 Merge branch 'issue344' of https://github.com/Macarse/cocos2d-x into Macarse-issue344 2011-02-11 15:26:49 +08:00
walzer 5dd44ada64 Merge branch 'gitignore' of https://github.com/Macarse/cocos2d-x into Macarse-gitignore 2011-02-11 15:20:20 +08:00
Macarse 24c4a477e3 Fixed issue for tests 2011-02-11 00:48:46 -03:00
yangws 36d68eeb41 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-02-11 09:34:12 +08:00
Macarse e1dfb21dd4 Added logic for POINTER_UP and POINTER_DOWN 2011-02-06 19:02:03 -03:00
Macarse 8d5995d5a6 First approach 2011-02-06 17:05:56 -03:00
Macarse ab44dafc6c Use SENSOR_DELAY_GAME for the SensorManager 2011-02-06 09:11:24 -03:00
Macarse 10d1844cfb Added .cproject to the .gitignore file 2011-02-05 20:49:12 -03:00
Macarse 66038230eb Added logic to disable sensors from the c++ code 2011-02-05 20:17:24 -03:00
Macarse 284c330569 Added code from walzer's comment 2011-02-01 00:11:42 -03:00
Macarse fce540989d First approach 2011-01-30 20:05:30 -03:00
natural-law d0b27c4222 fix bug,MenuTest crash. 2011-01-28 16:05:21 +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
yangws 76ea63da7f Change prefix CCX to ccx. 2011-01-27 17:07:36 +08:00
yangws 41a0ad335c Add ccxString header file. 2011-01-27 16:39:46 +08:00
natural-law e73e291a71 [uphone & win32]Fix the bug of new project wizard. 2011-01-27 15:01:38 +08:00
minggo d68d33b029 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-27 09:56:45 +08:00
minggo 31f9969674 fixed #333: fix compiling issue under linux 2011-01-27 09:49:06 +08:00
Macarse 89f012023e Fix display issue with Samsung Galaxy Tab 2011-01-26 19:03:14 -03:00
yangws b43a24fd5e ccxString add trim compareIgnoreCase toLower toUpper replaceText functions. 2011-01-26 18:00:19 +08:00
walzer e92ae19482 changelog for 0.99.5-x-0.7.2 2011-01-26 17:56:06 +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 a0ecaed1ef [android] define s_bPopupNotify 2011-01-26 16:45:27 +08:00