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

5079 Commits

Author SHA1 Message Date
James Chen 605f63f2b7 Merge branch 'gles20' into minggo_iss1405 2012-08-16 12:04:44 +08:00
James Chen 1d51fabf72 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-08-16 12:03:48 +08:00
minggo f8c9ca5286 Merge pull request #1183 from minggo/iss1430_label 
compute correct label's width or height when its value is 0
 2012-08-15 20:47:02 -07:00
minggo 416ce6b91d fixed #1430: add some comment 2012-08-16 11:45:52 +08:00
minggo 6a9da80292 fixed #1430: compute correct label's width or height when its value is 0 2012-08-16 11:43:44 +08:00
mustime a5a4ca9868 issue #1425: add matrix.pkg 2012-08-16 11:39:47 +08:00
James Chen de2c00b7ae issue #1405: fixed some compile error on win32 and linux. 2012-08-16 11:30:25 +08:00
James Chen bf1a88ae06 Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_iss1405 2012-08-16 11:08:06 +08:00
James Chen 95cabd7e42 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-16 11:04:54 +08:00
minggo bcf61cdf26 issue #1405:use enum to distinguish target 2012-08-16 10:21:15 +08:00
minggo 67bda8cffa Merge pull request #1180 from minggo/iss1405_multi_resolution 
issue 1405:implement CCFileUtils::getResourceDirectory() on iOS
 2012-08-15 02:20:58 -07:00
Caidongyang 035480c8e0 issue #1404 Now i change the mail recipient to me,and when the test is stable,i will change it back. 2012-08-15 16:25:00 +08:00
minggo 4a97f52cd4 issue 1405:implement CCFileUtils::getResourceDirectory() on iOS 2012-08-15 16:03:55 +08:00
Caidongyang 6e19e1b592 issue #1404 Modify scripts.mts and build script files. 2012-08-15 15:59:46 +08:00
mustime 81f9e68351 issue #1284: using dlopen instead of specifing android-9 platform 2012-08-15 15:57:23 +08:00
minggo 1ef1079d2d Merge pull request #1177 from John-cdy/gles20 
issue #1404 Modify qtp_win32 script.mts.
 2012-08-15 00:51:41 -07:00
James Chen c88c7ea88a Merge pull request #1176 from dumganhar/iss1429_CCEditBox 
issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
 2012-08-15 00:19:58 -07:00
Caidongyang 2dca0d9945 issue #1404 Modify qtp_win32 script.mts. 2012-08-15 15:17:34 +08:00
James Chen 0fce637ec7 issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest. 2012-08-15 14:33:56 +08:00
minggo 7da6171715 Merge pull request #1174 from John-cdy/gles20 
issue #1404:Add win32Test project and rename some script files
 2012-08-14 01:35:38 -07:00
Caidongyang 8ce66142a0 issue #1404 Delete snapshots's files 2012-08-14 16:30:45 +08:00
Caidongyang 361b8516c7 issue #1404:Add win32Test project and rename some script files 2012-08-14 15:48:38 +08:00
mustime dd2e8988da issue #1284: fix the error when comparing two string 2012-08-14 10:47:20 +08:00
mustime 0933a032e9 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284 2012-08-14 09:41:18 +08:00
mustime 89f0508043 issue #1284: add detection for I9100 model 2012-08-13 17:14:33 +08:00
Walzer d99b7463b7 Merge pull request #1172 from walzer/gles20 
fix the out-of-range crash in CCArray::randomObject()
 2012-08-11 08:34:58 -07:00
Walzer 9681c8d690 fix the out-of-range crash in CCArray::randomObject() 2012-08-11 23:31:51 +08:00
Walzer e964e861f2 Merge pull request #1162 from tongpengfei/gles20 
fixed linux FontTest vertical alignment
 2012-08-11 07:32:32 -07:00
minggo 42ad94abab Merge pull request #1171 from mustime/testlua 
issue #1425: corresponding changes for .pkg files
 2012-08-11 01:11:04 -07:00
mustime d5b99cc79e issue #1425: corresponding changes for .pkg files 2012-08-11 16:05:38 +08:00
minggo 333533082d Merge pull request #1170 from mustime/testlua 
Testlua
 2012-08-10 05:18:02 -07:00
mustime 42208f93aa issue #1425: change the interfaces in .pkg files to satisfy the current 
version
 2012-08-10 18:14:04 +08:00
mustime 67add089d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into testlua 2012-08-10 14:20:21 +08:00
Walzer 49e68df95c Merge pull request #1168 from walzer/gles20 
add more details in doxygen comments.
 2012-08-09 22:59:13 -07:00
Walzer a77a4eac03 add more details in doxygen comments. 2012-08-10 13:58:34 +08:00
Walzer c6c5d3fa1f Merge pull request #1167 from walzer/gles20 
enable search in doxygen, rename doxygen.cocos2d-x to doxygen.config to make it more readable.
 2012-08-09 08:17:16 -07:00
Walzer 3048c221bf enable search in doxygen, rename doxygen.cocos2d-x to doxygen.config to make it more readable. 2012-08-09 23:15:57 +08:00
James Chen 015642fb6d Merge pull request #1166 from dumganhar/gles20 
issue #1405: Remove unused method 'CCEGLView::getFrameSize' for ios port.
 2012-08-09 03:30:22 -07:00
James Chen ba78ac7d6d issue #1405: Remove unused method 'CCEGLView::getFrameSize' for ios port. 2012-08-09 18:28:49 +08:00
James Chen 9a461dec31 Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into gles20 2012-08-09 17:55:13 +08:00
James Chen c4d4a032e3 Merge pull request #1165 from dumganhar/iss1405_multi_resolution 
issue #1405: muti-resolution works ok on linux.
 2012-08-09 02:54:30 -07:00
James Chen 03c2366821 Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20 2012-08-09 17:50:39 +08:00
James Chen 4e876b48a6 Merge pull request #1164 from dumganhar/iss1405_multi_resolution 
issue #1405: Multi resolution works ok.
 2012-08-09 02:29:41 -07:00
James Chen 0394d9cc70 issue #1405: Update iphonehd resources. 2012-08-09 17:26:37 +08:00
James Chen 6e2cace72d Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res 2012-08-09 17:19:20 +08:00
James Chen a7ce8f2e21 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res 2012-08-09 17:16:10 +08:00
James Chen ff2a9ccbd7 Merge pull request #1163 from dumganhar/network 
fixed #1424: add a simple wrapper of http access
 2012-08-09 02:09:15 -07:00
James Chen 3ff21fe275 fixed #1424: http wrapper compiled ok on win32. 2012-08-09 17:04:55 +08:00
pengfei tong 82a2b9819c [LOG] remove noused code 2012-08-09 16:57:16 +08:00
pengfei tong 075a2a6a8a Merge branch 'test' into gles20 2012-08-09 16:41:24 +08:00