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

5855 Commits

Author SHA1 Message Date
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
mustime 491c05b25c issue #1284: unify the static variables' name to s_pXX 2012-07-26 16:45:21 +08:00
Caidongyang 5dc604ebfc Issue #1404 Add automatic testing tools 2012-07-26 16:25:54 +08:00
mustime 2e335f6dee issue #1284: changed some names to make the code more readable 2012-07-26 16:22:23 +08:00
mustime bfc53e3453 issue #1284: using OpenSL for playing effects on I9100 2012-07-26 15:30:09 +08:00
James Chen 18b1d097c7 Merge pull request #1126 from dumganhar/gles20 
fixed a compile error on win32.
 2012-07-25 22:56:46 -07:00
minggo 16c469fa4e Merge pull request #1127 from mustime/bug1381 
issue #1381: change the setContentSize interface in the subclasses of CCNode
 2012-07-25 21:39:44 -07:00
mustime 9ad241c8f8 issue #1381: change the setContentSize interface in the subclasses of 
CCNode
 2012-07-26 12:03:37 +08:00
James Chen b716f4ff62 fixed a compile error on win32. 2012-07-26 11:42:31 +08:00
minggo 7a1e35492c Merge pull request #1125 from NatWeiss/mactests 
Added Mac cpp HelloWorld and Tests
 2012-07-24 19:38:31 -07:00
Nat Weiss 9f0be2de05 Added Mac cpp HelloWorld and Tests. 2012-07-24 19:07:31 -07:00
minggo 5814dbd8ca Merge pull request #1124 from minggo/iss1403_png8 
fixed #1403:support png8
 2012-07-24 01:47:43 -07:00
minggo ed6b396782 fixed #1403:support png8 2012-07-24 16:43:48 +08:00
minggo 9374767fae Merge pull request #1121 from minggo/iss1383_userdefault_path 
fixed #1383:save UserDefault.xml to Library/caches
 2012-07-23 20:36:14 -07:00
minggo 0a2570fec7 fixed #1383:save UserDefault.xml to Library/caches 2012-07-24 11:34:20 +08:00
James Chen 5343da0bcd Merge pull request #1120 from dumganhar/gles20 
fixed #1385: Logic error in BitmapFontMultiLineAlignment.
 2012-07-23 20:33:00 -07:00
James Chen fda669510a fixed #1385: Logic error in BitmapFontMultiLineAlignment. 2012-07-24 11:32:02 +08:00
James Chen 85533cf3ef Merge pull request #1119 from dumganhar/gles20 
fixed #1386: PauseResumeActionsTest crashes.
 2012-07-23 20:22:49 -07:00
James Chen e7d7ff99c7 fixed #1386: PauseResumeActionsTest crashes. 2012-07-24 11:21:08 +08:00
Walzer 221d06509a Merge pull request #1118 from walzer/gles20 
fixed #1402, résolve conflicting "create" functions
 2012-07-23 09:40:51 -07:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
minggo 851241d3c3 Merge pull request #1116 from minggo/iss1399_adjust_structure 
Iss1399 adjust structure
 2012-07-23 02:19:30 -07:00
minggo 59db9f0c6f issue #1399:lua building works ok after adjusting directory structure 2012-07-23 17:14:18 +08:00
minggo 4eb59cd3d0 issue #1399:xcode template works ok after adjusting directory structure 2012-07-23 17:10:56 +08:00
James Chen 446b63d32a Merge pull request #1115 from dumganhar/iss1399 
issue #1399: Updated android template. Added cocos_extension_static dependence for created project by default.
 2012-07-23 01:44:29 -07:00
James Chen 722084bbaa issue #1399: Updated android template. Added cocos_extension_static dependence for created project by default. 2012-07-23 16:42:07 +08:00
minggo 2dcaffdfbc Merge pull request #1114 from minggo/modify_xcode_project 
Modify project information of TestJavascript
 2012-07-23 00:50:30 -07:00
minggo 790b6b775e remove some icon informations of TestJavascript 2012-07-23 15:48:03 +08:00
minggo aea895c45b remove some icon informations of TestJavascript 2012-07-23 15:42:17 +08:00
minggo e249d6b0ce Merge branch 'gles20' of https://github.com/walzer/cocos2d-x into modify_xcode_project 2012-07-23 15:38:24 +08:00
Walzer cc23d0667d unify Bundle ID for all xcodeprojects to "org.cocos2d-x.*", add icons for iphone/ipad * retina. 2012-07-23 15:23:26 +08:00