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

4785 Commits

Author SHA1 Message Date
Caidongyang f578fc8a90 Issue1404 Modify *.sh files and add xcode4 (debug and release) build scripts,include ios and mac 2012-08-02 14:31:07 +08:00
mustime 6beae122da issue #1284: fixed the problem that if the same effect is played for two 
times, it will stop and restart
 2012-08-02 14:28:40 +08:00
pengfei tong c82c8412a8 [LOG] fix makefile 2012-08-02 13:19:40 +08:00
pengfei tong b93d0b5ebf [LOG] add linux port 2012-08-02 13:02:59 +08:00
minggo 5399aac590 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution 2012-08-02 10:50:15 +08:00
minggo 4e5f69fd9e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-02 10:48:59 +08:00
minggo 60983e8a02 Merge pull request #1147 from folecr/morefixandroidbuildscript 
Further clean up of android build scripts and template
 2012-08-01 19:45:18 -07:00
minggo d02c620844 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-02 10:02:39 +08:00
minggo 2cbf58c0db Merge pull request #1148 from walzer/geometry-oo 
fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
 2012-08-01 18:50:45 -07:00
minggo 306e5e13f2 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-02 09:35:06 +08:00
minggo 426a52447d issue #1405:correct touch coordinate when enable retina with retina supportted device 2012-08-01 18:44:10 +08:00
minggo 0b2396c54b issue #1405:support three type of resolution 2012-08-01 16:56:12 +08:00
Walzer cc3d850892 fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
folecr 868d768156 Cleaner template for build_native.sh 
* used by projects generated with create-android-project.sh
 2012-07-31 22:56:18 -07:00
folecr 4d3df6145b Cleaner build scripts 2012-07-31 22:56:18 -07:00
folecr e69cda8fe2 Quoted use of bash variables 2012-07-31 22:56:17 -07:00
Walzer 2dc1f9ed7f Merge pull request #1146 from walzer/gles20 
change the param sequence of CCLabelTTF::create and initWithString, rding to JS APIs
 2012-07-31 22:25:41 -07:00
Walzer dc37896ed9 change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs 2012-08-01 13:24:23 +08:00
Walzer b0e440dca1 Merge pull request #1143 from walzer/gles20 
fixed #1413, add CCTouch::getLocation(), getDelta() method
 2012-07-31 18:53:11 -07:00
Walzer ba224cc283 add CCTouch.cpp into proj.win32, android.mk, xcode4 template. 2012-07-31 23:32:19 +08:00
minggo 554e736d82 Merge pull request #1144 from John-cdy/gles20 
Modify *.bat files error for android(win32)
 2012-07-31 03:06:33 -07:00
Caidongyang e8d82c3e77 Modify *.bat files error for android(win32) 2012-07-31 18:01:57 +08:00
Walzer 0431cb455b fixed #1413, add CCTouch::getLocation(), getDelta() method 
return OpenGL coordinates directly, to make the usage more convenient.
 2012-07-31 17:41:53 +08:00
minggo cfe5806fc1 Merge pull request #1141 from John-cdy/gles20 
Issue #1404 Add shell scripts
 2012-07-31 02:20:00 -07:00
Caidongyang 935b0bc944 Issue 1404 Modify *.bat files for android(win32) 2012-07-31 17:16:58 +08:00
Caidongyang d831e6feaa #Issus1404 Modify *.bat scripts for android 2012-07-31 17:13:14 +08:00
minggo 78a0584e16 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-07-31 15:16:10 +08:00
minggo 730b19af11 Merge pull request #1140 from walzer/UI2GUI 
issue #1399, use extensions/GUI instead of extensions/UI
 2012-07-31 00:07:31 -07:00
minggo bade695004 Merge branch 'UI2GUI' of https://github.com/walzer/cocos2d-x into gles20 2012-07-31 15:05:30 +08:00
Walzer 3a36032cd0 issue #1399, re-generate xcode4 templates for extensions/GUI 2012-07-31 15:02:31 +08:00
minggo 83adb2599c Merge branch 'UI2GUI' of https://github.com/walzer/cocos2d-x into gles20 2012-07-31 14:51:49 +08:00
Caidongyang 24efe50c6e Issue #1404 Add shell scripts 2012-07-31 13:39:36 +08:00
Walzer 824162f69e add Nat Weiss, author of mac port into AUTHORS 2012-07-30 23:35:58 +08:00
Walzer b8fa32dbc0 use extensions/GUI instead of extensions/UI 2012-07-30 22:57:59 +08:00
minggo b01e825e82 Merge pull request #1139 from walzer/gles20 
fixed #1409, sync with CocosBuilder v2.0, use number "4" to stand for PROPERTY_*_DISABLED in CCControlButton
 2012-07-29 20:18:07 -07:00
Walzer dfea09819f fixed #1409, sync with CocosBuilder v2.0, use number "4" to stand for PROPERTY_*_DISABLED in CCControlButton 
The cub & ccbi files in current test suit use "3" to stand for DISABLED state in CCControlButton, while CocosBuilder v2.0 generate "4" for it.
 2012-07-29 22:13:20 +08:00
Walzer 497f0ceddc Merge pull request #1138 from walzer/gles20 
fixed #1408, CCBReader, CCMenuItemImage should be loaded when the target and selector are empty
 2012-07-29 06:18:47 -07:00
Walzer 1411705de4 fixed #1408, CCBReader, CCMenuItemImage should be loaded when the target and selector are empty 2012-07-29 21:17:35 +08:00
minggo 84d47d2400 Merge pull request #1137 from folecr/fixandroidbuildscript 
issue #1407:Cleaner build script
 2012-07-27 17:52:44 -07:00
folecr 200992b272 Cleaner build script 
* Quoted parameters for bash directives
 * Forgo the extra _LOCAL variables by testing environment variables
 * Better path assumptions
 * References
   * http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
   * http://stackoverflow.com/questions/228544/how-to-tell-if-a-string-is-not-defined-in-a-bash-shell-script
 2012-07-27 17:45:21 -07:00
minggo 073f035078 Merge pull request #1136 from mustime/bug1381 
issue 1381: change setContentSize(CCSize size) to setContentSize(const CCsize & size) in CCNode and its subclass
 2012-07-27 03:36:25 -07:00
mustime 1a55b7c5ba Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381 2012-07-27 18:29:57 +08:00
mustime 5bc130dee7 issue #1381: change the setContentSize interface in CCScrollView 2012-07-27 18:20:11 +08:00
mustime 9949a34669 issue 1381: change setContentSize(CCSize size) to setContentSize(const 
CCsize & size) in CCNode
 2012-07-27 16:57:56 +08:00
James Chen 76ce004a66 Merge pull request #1134 from dumganhar/gles20 
Fix a compile error in TestJavascript project.
 2012-07-26 23:17:53 -07:00
James Chen 1efe20e4c3 Fix a compile error in TestJavascript project. 2012-07-27 14:16:23 +08:00
James Chen 2fd9c16276 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-07-27 14:14:37 +08:00
minggo 7bfc88c568 Merge pull request #1130 from mustime/bug1284 
issue #1284: using OpenSL for playing effects on I9100
 2012-07-26 20:31:51 -07:00
mustime b4e7e1152f issue #1284: fix the problem that effect still plays after stop->resume 2012-07-27 10:36:05 +08:00
minggo ad22f67386 Merge pull request #1131 from John-cdy/gles20 
Issue #1404 Add automatic testing tools
 2012-07-26 18:56:22 -07:00