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

4999 Commits

Author SHA1 Message Date
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
pengfei tong 188e267e7a [FIX] FontTest vertical alignment 2012-08-09 16:35:43 +08:00
James Chen db8913c8e6 Merge branch 'network' of https://github.com/walzer/cocos2d-x into network 2012-08-09 16:29:40 +08:00
pengfei tong 11be0edb06 [FIX] FontTest vertical alignment 2012-08-09 16:08:16 +08:00
minggo c31415b7bd issue #1405:resolution supports on mac 2012-08-09 14:34:20 +08:00
mustime 3a758794d7 issue #1425: reconstruct some interfaces in .pkg files 2012-08-09 12:51:59 +08:00
James Chen 826dfe4102 issue #1405: multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method. 2012-08-09 12:49:33 +08:00
mustime 0f29640310 issue #1425: reconstruct some interfaces in .pkg files 2012-08-09 12:46:45 +08:00
Walzer 9d6e37cf73 issue #1424, rename "Network" to "network" 2012-08-09 11:44:24 +08:00
Walzer d2cfdf1d2f change Network to Network-rename 2012-08-09 11:43:08 +08:00
Walzer 7863375cf8 issue #1424, http wrapper compiled pass on linux 2012-08-09 11:15:06 +08:00
James Chen af1b58bea6 Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res 2012-08-09 10:53:14 +08:00
Walzer 08198c082e issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
minggo c34812567f issue #1405: modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector 2012-08-09 10:23:39 +08:00
minggo cc39dc55f4 issue #1405:remove unneeded functions of CCFileUtils 2012-08-08 18:39:33 +08:00
minggo 3395bba327 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution 2012-08-08 17:42:45 +08:00
minggo 3853611e62 issue #1405:support loading resources from directory defined by developer 2012-08-08 17:42:04 +08:00
Walzer 9ee50bb59a issue #1424, add doxygen comments, use httpbin.org interfaces in GET/POST before setting up our website. 2012-08-08 12:05:02 +08:00
Walzer b094f70ab3 issue #1424, http-get works ok. Tomorrow I will focus on post. 2012-08-07 18:28:07 +08:00
minggo f6115d5667 issue #1405:zoom out work ok 2012-08-07 18:24:45 +08:00
minggo 5d8f909af4 issue #1405:multi resolution works ok 2012-08-07 14:29:46 +08:00
mustime e6e43029e5 testlua: modified some pkg files 2012-08-06 16:02:49 +08:00
Walzer 39e45da8d9 Merge branch 'gles20' of https://github.com/greathqy/cocos2d-x into network 2012-08-06 15:36:13 +08:00
qingyun 054fe4993c fix CCLog stack overflow 2012-08-06 14:47:23 +08:00
minggo 1b01659221 Merge pull request #1158 from John-cdy/gles20 
issue #1404:Modify directory structure
 2012-08-05 23:24:10 -07:00
Caidongyang 37d84ba6bb issue #1404:Add new files 2012-08-06 11:59:37 +08:00
Caidongyang 3fce97e62e issue #1404:Modify directory structure 2012-08-06 11:55:05 +08:00
minggo c799bd3c15 Merge pull request #1157 from minggo/iss1417_mac 
add header search path and add CCTouch.cpp into mac project
 2012-08-05 20:31:18 -07:00
minggo 9ccf3cefdf fixed #1417:add header search path and add CCTouch.cpp into mac project 2012-08-06 11:08:06 +08:00
minggo 658f2e78c5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-06 10:44:03 +08:00
qingyun b3206737e3 add group for CCHttpRequest.h 2012-08-04 18:30:05 +08:00