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

35594 Commits

Author SHA1 Message Date
minggo 22fa2967e3 Merge branch 'issue_388' of https://github.com/minggo/cocos2d-x into minggo-issue_388 2011-03-10 16:29:25 +08:00
natural-law 93aebbc469 [wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone. 2011-03-10 14:24:13 +08:00
yangws 3fc701f1d2 fixed #300 Cocos2d-win32 application wizard for vs ok. 2011-03-10 12:00:29 +08:00
minggo 06f014604a [iOS] fixed #388 2011-03-10 11:59:17 +08:00
minggo cb24e03466 Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377 2011-03-10 09:37:26 +08:00
minggo cf66691da6 Merge branch 'issue300' of https://github.com/yangws/cocos2d-x into yangws-issue300 2011-03-09 17:43:52 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
minggo 12981fac89 fixed #375 2011-03-09 16:19:20 +08:00
yangws fa7f15982f issue 300 Modify CCAppWiz to adapt 0.8. Add Install wizard scripts for VS2010 VC2010Express VC2008Express. 2011-03-09 15:35:06 +08:00
minggo 19470fda34 Merge branch 'iss383' of https://github.com/natural-law/cocos2d-x into natural-law-iss383 2011-03-09 14:55:45 +08:00
minggo 15368e6169 Merge branch 'issue373' of https://github.com/yangws/cocos2d-x into yangws-issue373 2011-03-09 14:53:51 +08:00
minggo 75e2ecc16d issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
minggo 63d283d3e8 delete ccxString.h 2011-03-09 12:00:04 +08:00
minggo 7aaf4be85f move platform_support into cocos2dx/platform 2011-03-09 11:38:36 +08:00
natural-law 4c0ace849a [wophone]fixed #383 
1. Modify the approach of handle left soft-key clicked.
2. Fix some compile error.
 2011-03-09 11:26:13 +08:00
yangws 151a0096fa fixed #373 Hide PVRFrame window on win32. 
Modify the PVR registry "hide_gui" false in CCApplication_win32.cpp.
 2011-03-09 10:39:08 +08:00
minggo 1aafd4fc56 issue #375: fix some compile error 2011-03-09 10:21:29 +08:00
minggo f1d13ca2e1 issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
minggo 837b8c04bf issue #375: rename some macros 2011-03-08 09:29:41 +08:00
minggo 7a331e1e14 issue #375: wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
minggo 632cf39a8a fix a bug when merging master into dev 2011-03-07 10:34:42 +08:00
minggo d3f93b658d rename libs to libraries and modify cocos2dx/Android.mk 2011-03-07 10:00:33 +08:00
minggo aaf898cb72 merge master into dev 2011-03-07 09:52:45 +08:00
minggo 69edcb16af fix a mergeing bug 2011-03-04 17:17:53 +08:00
minggo f219abab6b [ios] merge yangws-issue363 and undo some commit 2011-03-04 17:02:22 +08:00
minggo 661bae2797 merge natural-law-iss370 2011-03-04 16:32:54 +08:00
minggo 8e2f9c96b8 remove unneeded files 2011-03-04 16:22:53 +08:00
natural-law aef83b2660 [uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication. 2011-03-02 17:45:04 +08:00
yangws 395a0b3d47 AtlasTest rename to LabelTEst on win32. 2011-03-02 17:34:26 +08:00
minggo 4379a1c96f Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
minggo f58d2f8b32 [andriod] fixed #247: support multitouch on android 2011-03-02 10:40:02 +08:00
minggo 0a5ec4c12b [android] move MultiTouchController.java to cocos2dx/lib/touch 2011-03-02 10:34:49 +08:00
minggo f7b401163b Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController 2011-03-02 09:38:23 +08:00
minggo e00222104f merge yangws-issue360 into dev 2011-03-02 09:31:47 +08:00
minggo 89b4d07ed8 [android] fixed #368: move Application code to cocos2dx/platform/ccxApplication 2011-03-01 19:53:39 +08:00
minggo fc75306402 [android] fix a bug when run in HVGA 2011-03-01 18:34:06 +08:00
yangws b54de8a3ef fixed #360 Modify CCXAppWiz for win32， add initInstance function in class AppDelegate 2011-03-01 14:28:39 +08:00
minggo b65d84551b resolve confict when merging branch yangws-issue366 2011-03-01 14:08:18 +08:00
yangws 7bc7d32001 fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication 2011-03-01 12:41:57 +08:00
minggo 1b6602f582 Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android 2011-02-28 10:00:55 +08:00
minggo 9179c65b69 Merge branch 'issue355' of https://github.com/yangws/cocos2d-x into yangws-issue355 2011-02-28 09:59:41 +08:00
minggo 421e187d32 Merge branch 'iss357' of https://github.com/natural-law/cocos2d-x into natural-law-iss357 2011-02-28 09:55:25 +08:00
minggo f504211e56 merge natural-law-iss332 to dev 2011-02-28 09:48:14 +08:00
minggo 498e0072e1 [android] fixed #358: autoscale HVGA resource to WVGA 2011-02-26 15:52:57 +08:00
yangws d78897da5e CCImage initWithString support line breaks and wrapping. 
CCLabelTTF support multi-text on win32 now.
 2011-02-26 11:09:49 +08:00
natural-law 7424db91d3 [uphone]fixed 357,Support words contain line breaks. 2011-02-25 18:08:12 +08:00
minggo 1428480c7f [android] fixed #338:refactor platform_support 2011-02-25 13:35:27 +08:00
natural-law 6c54eb0a86 Update the tests from 0.99.4 to 0.99.5. 2011-02-25 11:31:49 +08:00
minggo 0453eb0266 [android] issue #338:refactor platform_support 2011-02-24 19:42:45 +08:00