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

5481 Commits

Author SHA1 Message Date
Walzer f475bcf102 CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create 2012-09-16 16:21:42 +08:00
Walzer 4374695210 Merge pull request #1324 from walzer/gles20 
fixed "ant release" to "ant debug" in jenkins_scripts/mac/android/build-4.x-debug.sh
 2012-09-16 01:16:09 -07:00
Walzer 86d34f05c4 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-16 16:14:52 +08:00
Walzer c1ab4eab48 fixed #1404, modify "ant release" to "ant debug" in mac-android-4.x-debug.sh 2012-09-16 16:13:54 +08:00
Walzer b8fad67ef4 Fix English syntax in CCDrawingPrimitives.cpp 2012-09-16 10:18:06 +08:00
minggo 7e123f3aec Merge pull request #1322 from NatWeiss/fixtmxparser2 
Fixes a bug in the TMX parser which caused tileset images not to load.
 2012-09-15 18:50:44 -07:00
minggo eab52552be Merge pull request #1320 from NatWeiss/fixccthread 
Fixes CCThread.cpp so it is not included for Mac builds.
 2012-09-15 18:47:42 -07:00
Walzer a795e3c442 Merge pull request #1321 from donaldalanmorrison/gles20 
Minor English Spelling Corrections, etc.
 2012-09-15 18:40:48 -07:00
Nat Weiss 53e4da5d5c Fixes a bug in the TMX parser which caused tileset images not to load on Android. 2012-09-15 15:59:15 -07:00
Donald Alan Morrison 6816fb94fc A few more minor documentation changes. OK, enough for today! :-) 2012-09-15 15:12:28 -07:00
Donald Alan Morrison 216ebab0e1 Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
Walzer 877fe86675 Merge pull request #1319 from walzer/gles20 
fix a potential memory leak in CCTextureCache::addImage.
 2012-09-15 06:13:13 -07:00
Walzer 9a042b8056 fix a potential memory leak in CCTextureCache::addImage. Thanks to Alexander Markevich. 2012-09-15 21:11:50 +08:00
minggo 69ba265707 Merge pull request #1316 from donaldalanmorrison/gles20 
[Gles20] Minor changes to comments (English Spellings, etc.)
 2012-09-15 05:42:30 -07:00
James Chen 3be86f8b85 Merge pull request #1318 from dumganhar/gles20 
Updated "ant.properties" for TestJavascript project since it will ignore 'assets/Images, assets/Fonts' folder.
 2012-09-15 00:39:51 -07:00
Nat Weiss febafa6e82 Fixes CCThread.cpp so it is not included for Mac builds. 
The Mac platform already has it's own CCThread.mm.
 2012-09-15 00:37:12 -07:00
James Chen f4ddabb942 Updated "ant.properties" for TestJavascript project since it will ignore 'assets/Images, assets/Fonts' folder. 2012-09-15 15:36:31 +08:00
Donald Alan Morrison b29f9a7f3b Missed one spelling error. 2012-09-14 15:41:42 -07:00
Donald Alan Morrison b8412f3b7e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-14 15:27:55 -07:00
Donald Alan Morrison 7c750dc9c5 Minor changes to comments. One integer literal changed to float literal. 2012-09-14 15:26:38 -07:00
dualface 2866fa8f56 Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20 2012-09-14 18:00:30 +08:00
dualface 515ec3c482 ccDrawCircle() add scaleX and scaleY 2012-09-14 18:00:11 +08:00
dualface 62709d7c71 Merge remote-tracking branch 'origin/gles20' into gles20 2012-09-14 17:57:56 +08:00
dualface 2869aba7b4 avoid unused memory alloc 2012-09-14 17:54:53 +08:00
Walzer 64d6d6ed81 Merge pull request #1314 from walzer/gles20 
config scripts for jenkins-ci, compiling android on mac osx
 2012-09-14 01:44:53 -07:00
Walzer 7c744e785a fixed #1404, tweak back to lower case :) 2012-09-14 16:42:44 +08:00
Walzer bbb37a4d7c issue #1404, case insensitive, oops 2012-09-14 16:41:41 +08:00
Walzer 6fbeacf750 issue #1404, add scripts for ci 2012-09-14 16:33:54 +08:00
Nicolas Gramlich c2a62875cf Added ANDROID_SCRIPTINGCORE_LOAD_SCRIPTS_FROM_EXTERNAL_ASSET_DIRECTORY flag, that allows to load from external assets directory instead of from internal apk assets directory. 2012-09-13 11:13:02 -07:00
Nicolas Gramlich f03c0caaf9 Added proper JNIEXPORT/JNICALL markers to android platform jni bindings. 2012-09-13 09:34:30 -07:00
ebartley 3794542ca0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-13 08:47:07 -04:00
Walzer 150ef1f320 Update cocos2dx/platform/win32/CCEGLView.cpp 2012-09-13 15:53:57 +08:00
Walzer 5718dc1397 fixed #1474, check OpenGL version of win32 
When OpenGL version is too old to run 2dx (<1.5), popup a warning dialog to warn users.
 2012-09-13 15:52:46 +08:00
Walzer 47f51bf7af Update tools/jenkins_scripts/mac/ios/build-ios-all.sh 2012-09-13 14:11:09 +08:00
Walzer 4fd8650b06 Merge pull request #1311 from walzer/gles20 
update jenkins_scripts for build android-ant on windows cygwin
 2012-09-12 20:29:12 -07:00
Walzer de7969afdf update jenkins_scripts for build android-ant on windows cygwin 2012-09-13 11:28:12 +08:00
dualface 4aa74d8f5e [Mac] fix CCLuaLog crash 2012-09-13 10:26:47 +08:00
dualface 9418afacf9 delete CCDirector after call CCDirector::purgeDirector() 2012-09-13 10:26:30 +08:00
James Chen db24bd69f0 Merge pull request #1310 from flaming0/patch-1 
Updated cocos2dx/platform/win32/CCEGLView.cpp, removed '\n' of the end of CCLog in 'CCEGLView::initGL'.
 2012-09-12 18:40:48 -07:00
Nicolas Gramlich 696cdbaa8c Minor build fix due to merge fail. 2012-09-12 16:55:56 -07:00
Nicolas Gramlich 675d0adce5 Merge with gles20-official. 2012-09-12 16:51:01 -07:00
flamingo bb82930789 Update cocos2dx/platform/win32/CCEGLView.cpp 
extra endings in linux logging
 2012-09-12 22:17:56 +04:00
Walzer 63e279e484 Merge pull request #1308 from walzer/gles20 
updage tools/jenkins_scripts
 2012-09-12 03:29:12 -07:00
Walzer ba5f0996ad update tools/jenkins_scripts/ 2012-09-12 18:27:57 +08:00
Walzer 7d13516056 rename JenkinsScript to more comfortable 2012-09-12 16:00:36 +08:00
dualface e1149b0edd Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-11 17:57:27 +08:00
James Chen ef059a8db5 Merge pull request #1305 from dualface/gles20 
fixed #1477: Updated TestLua.
 2012-09-11 02:36:38 -07:00
dualface 3f37d95a0b Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-11 17:35:56 +08:00
YuLei 209e44ff09 [Lua] update HelloLua 2012-09-11 17:31:21 +08:00
YuLei 9de34c4f07 [Lua] remove unused codes 2012-09-11 17:13:45 +08:00