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

5871 Commits

Author SHA1 Message Date
minggo 4db53b2f91 fixed #1382:safe return mOwner to avoid crash caused by null pointer 2012-08-20 15:54:53 +08:00
James Chen 7eb5d85298 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb 2012-08-20 15:49:24 +08:00
James Chen 6c9b4d3357 fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs. 2012-08-20 15:49:02 +08:00
minggo 0baf8743c2 Merge pull request #1201 from minggo/gles20 
change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project
 2012-08-20 00:44:00 -07:00
minggo a8f2c74b9e change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project 2012-08-20 15:42:56 +08:00
minggo 77c244c6bc Merge pull request #1200 from minggo/iss1433_remove_fps_png_in_template 
fixed #1433:remove fpsxxx.png in win32 template
 2012-08-20 00:16:49 -07:00
minggo 40ee7496cd fixed #1433:remove fpsxxx.png in win32 template 2012-08-20 15:15:21 +08:00
minggo fbe9aa29dc Merge pull request #1199 from minggo/iss1433_remove_fps_png_in_template 
issue #1433:remove fpsxxx.png in xcode template
 2012-08-19 23:33:06 -07:00
minggo c307e02c43 issue #1433:remove fpsxxx.png in xcode template 2012-08-20 14:31:30 +08:00
minggo a1b679ca60 Merge pull request #1198 from minggo/iss1377_tmx_tile_crack 
reset texture parameter of CCTMXLayer after coming to foreground on android
 2012-08-19 23:08:35 -07:00
minggo 738f150ecd fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android 2012-08-20 14:06:29 +08:00
minggo c8808b5be2 Merge pull request #1197 from mustime/bug1284 
issue #1284: fix a compile error for missing android.so
 2012-08-19 21:53:32 -07:00
mustime cd6241655b issue #1284: fix a compile error for missing android.so 2012-08-20 12:49:59 +08:00
James Chen b63d4d7702 Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_bb 2012-08-20 11:40:23 +08:00
James Chen b3cbb646c8 Merge pull request #1196 from dumganhar/gles20 
fixed #1432: MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen.
 2012-08-19 19:40:30 -07:00
James Chen 63888a7eb5 issue #1432: MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen. 2012-08-20 10:38:21 +08:00
mustime 108c7608ec Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 2012-08-20 09:33:30 +08:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
minggo c014496467 Merge pull request #1192 from John-cdy/gles20 
issue #1404:Adjust the time of some testcases.
 2012-08-17 06:14:21 -07:00
James Chen a08fdd4ce1 Merge pull request #1194 from dumganhar/gles20 
issue #1429: Fixed a bug in EAGLView.mm.
 2012-08-17 00:29:41 -07:00
James Chen f7fd4fc2bf issue #1429: Fixed a bug in EAGLView.mm. 2012-08-17 15:24:33 +08:00
James Chen 0a6ac3658a Merge pull request #1193 from dumganhar/gles20 
issue #1429: Updated EditBoxTest and fixed a bug about callback function.
 2012-08-16 23:33:25 -07:00
James Chen d3338a70e5 issue #1429: Updated EditBoxTest and fix a bug about callback function. 2012-08-17 14:29:07 +08:00
Caidongyang 920430edf5 issue #1404:Adjust the time of some testcases. 2012-08-17 14:01:13 +08:00
mustime 12fb19c2d9 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into testlua 2012-08-17 10:42:52 +08:00
minggo 3a46252b77 Merge pull request #1190 from John-cdy/gles20 
issue 1404: Fixed some errors in qtp script.
 2012-08-16 19:18:08 -07:00
minggo d6d6332048 Merge pull request #1189 from mustime/bug1284 
Bug1284
 2012-08-16 19:10:32 -07:00
mustime 6f615ce085 issue #1284: add auto-detection of I9100 model for OpenSLES 2012-08-17 09:58:04 +08:00
mustime 4eee341407 issue #1284: add auto-detection of I9100 model for OpenSLES 2012-08-17 09:51:49 +08:00
minggo 316c484936 Merge pull request #1173 from mustime/bug1284 
issue #1284: add detection for I9100 model
 2012-08-16 18:39:28 -07:00
Caidongyang 117facdede issue 1404: Fixed some errors in qtp script. 2012-08-16 18:27:25 +08:00
James Chen 797c15b9a2 Merge pull request #1188 from dumganhar/gles20 
fixed #1419: Updated eclipse project configurations for linux port.
 2012-08-16 03:22:40 -07:00
James Chen ce9c744f21 fixed #1419: cocos2dx-test ~> TestCpp 2012-08-16 18:20:00 +08:00
James Chen 48fa8a4e88 fixed #1419: Update eclipse project configurations for linux port. 2012-08-16 18:09:01 +08:00
minggo 5a64a87498 Merge pull request #1187 from John-cdy/gles20 
issue #1404 Add new object to qtp_ObjectRepository.
 2012-08-16 00:30:46 -07:00
Caidongyang 7bde427b56 issue #1404 Add new object to qtp_ObjectRepository. 2012-08-16 15:23:25 +08:00
minggo 756a7e3b0c Merge pull request #1186 from minggo/gles20 
remove some unneeded codes
 2012-08-15 23:53:22 -07:00
minggo 714b9ef838 remove some unneeded codes 2012-08-16 14:51:58 +08:00
James Chen c6465bbc33 Merge pull request #1185 from dumganhar/gles20 
fixed a bug in CCActionInterval.cpp.
 2012-08-15 23:34:59 -07:00
James Chen 3c33c43fd4 fixed a bug in CCActionInterval.cpp. 
CCSequence::create(pAction2, CCDelayTime::create(d1 - d2)); ~> CCSequence::createWithTwoActions(pAction2, CCDelayTime::create(d1 - d2));
 2012-08-16 14:29:27 +08:00
James Chen 9d85117c22 Merge pull request #1184 from dumganhar/gles20 
issue #1405: fixed some compile error on win32 and linux.
 2012-08-15 21:08:05 -07:00
minggo c4f03bfef3 Merge pull request #1179 from John-cdy/gles20 
issue #1404 Modify scripts.mts and build script files.
 2012-08-15 21:07:25 -07:00
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