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

6369 Commits

Author SHA1 Message Date
Walzer 5bec3b3ac3 CCTextureCache.cpp:L532, tex -> texture 2012-07-14 23:44:56 +08:00
Walzer 1fd0fd7967 Merge pull request #1098 from walzer/gles20 
consistent the variable name in different functions.
 2012-07-14 00:30:15 -07:00
Walzer a46c53421c consistent the variable name in different functions. 2012-07-14 15:21:42 +08:00
Walzer 3ea9874e2f Merge pull request #1097 from walzer/gles20 
fixed #1095 on github issue, which is issue #1395 in cocos2d-x issue system
 2012-07-14 00:08:56 -07:00
Walzer e6ae45e1b2 fixed issue #1395, which was reported at https://github.com/cocos2d/cocos2d-x/issues/1095 2012-07-14 15:06:11 +08:00
Walzer 5f64e4c167 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-07-14 14:52:15 +08:00
Walzer 2d28c02fcf Merge pull request #1096 from lvallejo/gles20 
Fixed Spelling CCObject::isSingleRefrence to CCObject::isSingleReference
 2012-07-13 19:48:13 -07:00
Luis Vallejo c9408b7b75 Fixed Spelling Error CCObject::isSingleRefrence to CCObject::isSingleReference 2012-07-14 09:56:07 +08:00
minggo fd04f2024b Merge pull request #1094 from NatWeiss/fixxcode42 
Fixes a compilation error for Xcode 4.2
 2012-07-10 21:08:32 -07:00
Nat Weiss d77d10a974 Fixes a compilation error for Xcode 4.2 and still maintains compatibility with Xcode 4.5. 2012-07-10 21:01:32 -07:00
James Chen 5c19237126 Merge pull request #1092 from mustime/bug1381 
fixed #1381: fixed different declaration on CCLayerColor::setContentSize
 2012-07-09 18:36:20 -07:00
mustime 50289655a5 fixed #1381: fixed different declaration on CCLayerColor::setContentSize 2012-07-10 09:13:49 +08:00
James Chen 502982fda7 Merge pull request #1091 from NatWeiss/fixwin32il 
fixed #1390: Fixes Win32 error "The application failed to initalize properly".
 2012-07-09 01:37:20 -07:00
minggo 37f535c95d Merge pull request #1090 from mustime/bug1379 
fixed #1379: Fixed typing error in CCNode.cpp line74
 2012-07-09 00:00:09 -07:00
Nat Weiss ee12785c6a Fixes Win32 error "The application failed to initalize properly 0xc000000d" 2012-07-08 23:54:29 -07:00
mustime e289ce628c fixed #1379: Fixed typing error in CCNode.cpp line74 2012-07-09 14:45:04 +08:00
minggo 27a6182055 Merge pull request #1089 from NatWeiss/fixxcode45 
fixed #1389: Fixes a few Xcode 4.5-specific error messages.
 2012-07-08 23:04:41 -07:00
Nat Weiss 43d40bd5a0 Fixes a few Xcode 4.5-specific error messages. 2012-07-08 22:37:19 -07:00
James Chen cc718ea406 Merge pull request #1087 from ngocdaothanh/patch-4 
fixed #1372: Fix compilation error: platform/android/CCEGLView.h:30.
 2012-07-08 18:57:16 -07:00
minggo 006e879665 Merge pull request #1082 from simdm/gles20 
fixed #1384 cocosbuilder , error when loading CCControlButton from ccbi
 2012-07-05 20:27:37 -07:00
Ngoc Dao 14a23ced56 Fix compilation error: platform/android/CCEGLView.h:30:39: error: platform/CCPlatFormMacros.h: No such file or directory 2012-07-06 10:32:54 +09:00
simdm d3d42f12c4 fixed #1081 cocosbuilder , error when loading CCControlButton from ccbi 2012-07-05 00:49:51 +08:00
James Chen b14627b6ae Merge pull request #1077 from dumganhar/gles20 
fixed #1371: Particle crashes if setAutoRemoveOnFinish(true).
 2012-07-01 06:20:29 -07:00
James Chen fa1f8fe8f6 fixed #1371: Particle crashes if setAutoRemoveOnFinish(true). 
Scheduler: removeUpdateFromHash calls [target release] at the very end to prevent a possible crash.
 2012-07-01 21:17:44 +08:00
James Chen 427845e2e7 Merge pull request #1075 from dumganhar/gles20 
Renamed namespace 'cocos' to 'cc' in javascript bindings.
 2012-06-29 00:51:23 -07:00
James Chen eb082897f2 Renamed namespace 'cocos' to 'cc' in javascript bindings. 2012-06-29 15:47:47 +08:00
James Chen bf92165f20 Merge pull request #1074 from dumganhar/gles20 
Updated proj.android/project.properties. target=android-10 --> 8
 2012-06-28 03:27:20 -07:00
James Chen 20eec32ff0 Updated proj.android/project.properties. target=android-10 --> 8 2012-06-28 18:26:28 +08:00
James Chen 41c38492b7 Merge pull request #1073 from dumganhar/gles20 
Added some resources. Updated Texture2dTest.cpp.
 2012-06-28 02:40:08 -07:00
James Chen 26a02804d9 Added some resources. Updated Texture2dTest.cpp. 2012-06-28 17:34:50 +08:00
James Chen 94e78f2dec Merge pull request #1072 from dumganhar/gles20 
Reverted build_native.sh.
 2012-06-28 02:00:03 -07:00
James Chen aba33b5bda Reverted build_native.sh. 2012-06-28 16:58:32 +08:00
minggo 254c2066f2 Merge pull request #1071 from minggo/gles20 
add product name for iOS
 2012-06-27 22:53:00 -07:00
minggo 5b08a5996c add product name for iOS 2012-06-28 13:52:10 +08:00
minggo b291bad46f Merge pull request #1070 from minggo/gles20 
modify code sign
 2012-06-27 22:41:55 -07:00
minggo e3771a8ad4 modify code sign 2012-06-28 13:41:05 +08:00
minggo 7a6a05bcdf Merge pull request #1069 from minggo/gles20 
some modification
 2012-06-27 21:05:52 -07:00
minggo 51b5912f46 add resources for retina 2012-06-28 12:00:36 +08:00
minggo 3c43dfb6fe disable retina 2012-06-28 11:50:11 +08:00
minggo 7348fa12c3 update CHANGELOG and delete some unneeded files 2012-06-28 11:47:54 +08:00
James Chen e4702a40b6 Merge pull request #1068 from dumganhar/gles20 
fixed #1370: Create project script can't work correctly on android.
 2012-06-27 20:06:50 -07:00
James Chen fc8ab2e80e fixed #1370: Create project script can't work correctly on android. 2012-06-28 11:05:34 +08:00
Walzer 5d0bcc2bc7 Merge remote-tracking branch 'parent/gles20' into gles20 2012-06-28 10:49:23 +08:00
James Chen 897f92a4c5 Merge pull request #1067 from dumganhar/gles20 
fixed #1369: Invoking CCLabelTTF:setPosition(x,y) in lua script causes crash
 2012-06-27 09:07:57 -07:00
James Chen edca0871a6 fixed #1369: Invoking CCLabelTTF:setPosition(x,y) in lua script causes crash. 2012-06-28 00:05:45 +08:00
James Chen 00b36359fc Merge pull request #1066 from dumganhar/gles20 
fixed #1368: Implement EffectsAdvancedTest (Effect4)
 2012-06-27 05:53:27 -07:00
James Chen 86942aedb4 fixed #1368: Implement EffectsAdvancedTest (Effect4). Added some comments. 2012-06-27 20:50:47 +08:00
James Chen c3fce65f7f Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-06-27 20:01:05 +08:00
James Chen 33e32e987c Implement EffectsAdvancedTest (Effect4). 2012-06-27 18:44:25 +08:00
James Chen f11fa550fb Merge pull request #1065 from dumganhar/gles20 
fixed #1367: Updated ShaderTest.cpp, TileMapTest.cpp, CCLableBMFont.cpp
 2012-06-27 02:12:07 -07:00