Commit Graph

2752 Commits

Author SHA1 Message Date
James Chen fd1343b951 Updated win32 template and fix a bug in win32/CCEGLView.cpp. 2012-08-20 17:08:29 +08:00
James Chen 0861877594 kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle. 2012-08-20 16:32:22 +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 738f150ecd fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android 2012-08-20 14:06:29 +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 63888a7eb5 issue #1432: MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen. 2012-08-20 10:38:21 +08:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
James Chen f7fd4fc2bf issue #1429: Fixed a bug in EAGLView.mm. 2012-08-17 15:24:33 +08:00
James Chen d3338a70e5 issue #1429: Updated EditBoxTest and fix a bug about callback function. 2012-08-17 14:29:07 +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
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 48fa8a4e88 fixed #1419: Update eclipse project configurations for linux port. 2012-08-16 18:09:01 +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 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 605f63f2b7 Merge branch 'gles20' into minggo_iss1405 2012-08-16 12:04:44 +08: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
James Chen de2c00b7ae issue #1405: fixed some compile error on win32 and linux. 2012-08-16 11:30:25 +08:00
minggo bcf61cdf26 issue #1405:use enum to distinguish target 2012-08-16 10:21:15 +08:00
minggo 4a97f52cd4 issue 1405:implement CCFileUtils::getResourceDirectory() on iOS 2012-08-15 16:03:55 +08:00
James Chen 0fce637ec7 issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest. 2012-08-15 14:33:56 +08:00
mustime 0933a032e9 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284 2012-08-14 09:41:18 +08:00
mustime 89f0508043 issue #1284: add detection for I9100 model 2012-08-13 17:14:33 +08:00
Walzer d99b7463b7 Merge pull request #1172 from walzer/gles20
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 08:34:58 -07:00
Walzer 9681c8d690 fix the out-of-range crash in CCArray::randomObject() 2012-08-11 23:31:51 +08:00
Walzer e964e861f2 Merge pull request #1162 from tongpengfei/gles20
fixed linux FontTest vertical alignment
2012-08-11 07:32:32 -07:00
Walzer a77a4eac03 add more details in doxygen comments. 2012-08-10 13:58:34 +08:00
James Chen ba78ac7d6d issue #1405: Remove unused method 'CCEGLView::getFrameSize' for ios port. 2012-08-09 18:28:49 +08:00
James Chen 03c2366821 Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20 2012-08-09 17:50:39 +08:00
James Chen 6e2cace72d Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res 2012-08-09 17:19:20 +08:00
James Chen a7ce8f2e21 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res 2012-08-09 17:16:10 +08:00
pengfei tong 82a2b9819c [LOG] remove noused code 2012-08-09 16:57:16 +08:00
pengfei tong 075a2a6a8a Merge branch 'test' into gles20 2012-08-09 16:41:24 +08:00
pengfei tong 188e267e7a [FIX] FontTest vertical alignment 2012-08-09 16:35:43 +08:00
pengfei tong 11be0edb06 [FIX] FontTest vertical alignment 2012-08-09 16:08:16 +08:00
minggo c31415b7bd issue #1405:resolution supports on mac 2012-08-09 14:34:20 +08:00
James Chen 826dfe4102 issue #1405: multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method. 2012-08-09 12:49:33 +08:00
Walzer 7863375cf8 issue #1424, http wrapper compiled pass on linux 2012-08-09 11:15:06 +08:00
Walzer 08198c082e issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
minggo c34812567f issue #1405: modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector 2012-08-09 10:23:39 +08:00
minggo cc39dc55f4 issue #1405:remove unneeded functions of CCFileUtils 2012-08-08 18:39:33 +08:00
minggo 3395bba327 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution 2012-08-08 17:42:45 +08:00
minggo 3853611e62 issue #1405:support loading resources from directory defined by developer 2012-08-08 17:42:04 +08:00
minggo f6115d5667 issue #1405:zoom out work ok 2012-08-07 18:24:45 +08:00
minggo 5d8f909af4 issue #1405:multi resolution works ok 2012-08-07 14:29:46 +08:00
minggo 9ccf3cefdf fixed #1417:add header search path and add CCTouch.cpp into mac project 2012-08-06 11:08:06 +08:00
James Chen e9aa3743fa issue #1405: muti-resolution works ok on linux. 2012-08-03 13:56:18 +08:00
James Chen ed69b62461 fixed #1419: Update cocos2d.h. 2012-08-03 11:16:34 +08:00
James Chen 086e63103d fixed #1419: Merge gles20 linux port.
There are still some issues:
1. CocosDeshionTest crash.
2. FontTest result is not correct.
2012-08-03 11:07:59 +08:00
James Chen 9c26e38563 Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20 2012-08-03 10:10:33 +08:00
pengfei tong a37fd743e0 [FIX] testjs 2012-08-02 16:23:31 +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 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
Walzer dc37896ed9 change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs 2012-08-01 13:24:23 +08:00
Walzer ba224cc283 add CCTouch.cpp into proj.win32, android.mk, xcode4 template. 2012-07-31 23:32:19 +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
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
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 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
Nat Weiss 9f0be2de05 Added Mac cpp HelloWorld and Tests. 2012-07-24 19:07:31 -07:00
minggo ed6b396782 fixed #1403:support png8 2012-07-24 16:43:48 +08:00
minggo 0a2570fec7 fixed #1383:save UserDefault.xml to Library/caches 2012-07-24 11:34:20 +08: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
James Chen 9a6729551c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399 2012-07-23 11:59:47 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
James Chen 7f6ffef8cf issue #1399: Set the flag 'LinkIncremental' value to false. 2012-07-23 11:47:27 +08:00
minggo ac70f8def5 Merge branch 'gles20-adjust-structure' into merge 2012-07-23 11:36:46 +08:00
minggo f38629fbfc Merge pull request #1109 from NatWeiss/addmac4
Adding Mac support!
2012-07-22 19:48:52 -07:00
Nat Weiss fcfea04bbc iPad detection is now where it belongs in CCApplication. 2012-07-21 11:46:42 -07:00
Nat Weiss a4760698ca Determines whether to use iPad graphics statically, so if the window is resized the graphics loaded are consistent. 2012-07-21 11:35:28 -07:00
Nat Weiss dc7ce1cd0f Improved mac file utils and event responsiveness. 2012-07-21 02:19:03 -07:00
James Chen 5e5b008742 issue #1399: Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System. 2012-07-21 13:49:20 +08:00
Nat Weiss d4b6d1262b Adding Mac support! 2012-07-20 21:23:40 -07:00
James Chen 557f654cf3 Built successfully on android. 2012-07-20 17:06:00 +08:00
James Chen 77f1fba566 issue #1399: Adjust folder structure, made it built successfully on win32. 2012-07-20 14:05:52 +08:00
minggo 7467d254d4 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399_adjust_structure 2012-07-19 17:26:39 +08:00
minggo f9c40f7372 issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
Yasith Vidanaarachchi 59a3bd1a9a Fix the re-assigning of texture rectangle to consider sprite frame's orientation.
If the progress sprite is vertical, in the sprite sheet it's rendered incorrectly without this fix.
2012-07-17 15:56:58 -03:00
Walzer 5bec3b3ac3 CCTextureCache.cpp:L532, tex -> texture 2012-07-14 23:44:56 +08:00
Walzer a46c53421c consistent the variable name in different functions. 2012-07-14 15:21:42 +08: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
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
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
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
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
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 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
minggo 7348fa12c3 update CHANGELOG and delete some unneeded files 2012-06-28 11:47:54 +08:00
James Chen a20a80323b fixed #1367: using CCString::createWithContentOfFile in CCBMFontConfiguration::parseConfigFile. 2012-06-27 17:04:54 +08:00
James Chen bde351dda7 fixed a bug in CCSpriteFrame::getTexture.
if( m_strTextureFilename.length() <= 0 ) // logic error, must be > 0
    {
        return CCTextureCache::sharedTextureCache()->addImage(m_strTextureFilename.c_str());
    }
2012-06-27 15:04:42 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
minggo 4f5d1d06e5 modify cocos2d-x version 2012-06-26 15:37:47 +08:00
minggo 16310cb544 fixed #1364:add paused state 2012-06-26 11:02:19 +08:00
James Chen 5274fc378d fixed a typo in CCScene.h. 2012-06-21 13:48:57 +08:00
Ngoc Dao 28cc77008d "node" -> "create" 2012-06-21 14:33:27 +09:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
Walzer d7162fcfc5 Add groups in all classes for doxygen. Upgrade doxygen to 0.8.1 2012-06-20 18:07:27 +08:00
James Chen f8ebbccb98 fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify 2012-06-20 14:38:13 +08:00
James Chen 24e3ec7499 fixed #1336: Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen d3d3288e09 fixed #1336: Updated CCScene.h. 2012-06-20 12:03:50 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
James Chen 07b9db8e91 Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
James Chen c4056b1bb0 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
James Chen 591566b43a fixed #1335: Memory leaks in cocos2dx and CCBReader. 2012-06-19 16:31:26 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 2666df9472 issue #1269:mrege latest code and fix conflict 2012-06-19 13:57:33 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen c1883c1237 fixed #1334: Updated CCScrollView.h 2012-06-19 10:55:52 +08:00
James Chen da85a36cd1 Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi
Conflicts:
	cocos2dx/extensions/CCScrollView/CCScrollView.h
2012-06-19 10:51:40 +08:00
James Chen 9fa74721a7 fixed #1334: Add ScrollViewTest to CocosBuilderTest. 2012-06-19 10:34:15 +08:00
Nicolas Gramlich ac4a56a38c Fixed CCScrollView (since it was behaving differently compared to the cocos2d-iphone version). 2012-06-18 18:43:53 -07:00
Nicolas Gramlich 6f26ea7a56 Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest. 2012-06-18 13:59:45 -07:00
Nicolas Gramlich fea4401681 CCBReader: Named a whole bunch of parameters in the CCNodeLoader headers. 2012-06-18 13:41:48 -07:00
Nicolas Gramlich 227683bfa4 Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files. 2012-06-18 13:33:19 -07:00
Nicolas Gramlich aa83408ba7 Addded virtual destructors to all classes in the CCBReader extension. CCBReader: named some parameters in the header. 2012-06-18 12:03:06 -07:00
Nicolas Gramlich 2f3fed2562 CCNodeLoader: Replaced manual deletes with 'safe' Macros. 2012-06-18 11:43:46 -07:00
minggo 6d0608d0f1 fixed #1333: add CCScrollView for iOS 2012-06-18 19:24:47 +08:00
James Chen c3653f651a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20-ccbi 2012-06-18 19:02:02 +08:00
James Chen f346d09449 issue #1333: Added CCScrollViewLoader. Not implement. 2012-06-18 19:00:26 +08:00
James Chen 579e6a1100 issue #1333: export CCTouch class. 2012-06-18 18:32:17 +08:00
James Chen b66be55156 issue #1333: Use CC_PROPERTY instead of CC_PROPERTY_PASS_BY_REF for m_tContenSize 2012-06-18 18:31:29 +08:00
James Chen 85ff705415 fixed #1333: added CCScrollView to extension. 2012-06-18 18:30:07 +08:00
minggo c1f5d173ef fixed #1332: add cocos2d version 2012-06-18 16:16:09 +08:00
James Chen 453a7c63d3 issue #1330: Some memory leaks fixes. 2012-06-16 14:31:57 +08:00
James Chen ec75695a4f issue #1330: Added virtual destructor for interfaces. 2012-06-16 13:04:23 +08:00
James Chen 73c9707d5d CCBIReader fixes + building and running flawless on iOS and Android.
Made it works on win32.
2012-06-16 12:48:20 +08:00
James Chen ab3dd66167 Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi 2012-06-16 11:05:28 +08:00
Nicolas Gramlich 13bcf2180c Merge with gles20. 2012-06-15 16:26:10 -07:00
Nicolas Gramlich 54944ab1f9 Fixed a comment. 2012-06-15 16:06:54 -07:00
Nicolas Gramlich f0c1a4001c Removed CC_FONT_LABEL_SUPPORT since it wasn't defined anywhere and now custom TTF fonts work. 2012-06-15 14:06:01 -07:00
Nicolas Gramlich 420d9ef41b Fixed fntFile and fontTTF properties not having the full path prexifed, if they are non system fonts. 2012-06-15 14:01:57 -07:00
folecr 90a6a65404 Modify source.dir to match updated directory name 2012-06-15 09:24:10 -07:00
James Chen cc572ab8e7 fixed #1329: Moved all java files part of engine into a certain directory, then all projects refer to them. 2012-06-15 18:15:43 +08:00
James Chen 24cc0796b6 Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android 2012-06-15 17:47:04 +08:00
minggo 899022d107 fixed #1292:fix some bugs that caused by modify function name 2012-06-15 17:39:13 +08:00
James Chen 1d0fa4a9aa fixed #1292: Updated lua bindings. 2012-06-15 17:26:11 +08:00
James Chen 61719d813e fixed #1292:make some function names more readable. 2012-06-15 16:47:54 +08:00
James Chen 595a402c83 fixed #1292:make some function names more readable. 2012-06-15 16:47:30 +08:00
James Chen e7628de857 fixed a warning in CCScale9Sprite::initWithBatchNode. 2012-06-15 15:36:36 +08:00
James Chen 0afdfe33da Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-15 15:25:37 +08:00
James Chen c17091ac70 fixed #1310: Updated vs2010 project configuration after synchronizing to rc2. 2012-06-15 15:24:22 +08:00
minggo 266a5e5e66 Merge pull request #1028 from minggo/iss1292_moidify_function_name
issue #1292:make some function names more readable
2012-06-15 00:14:13 -07:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
folecr 6fc2dc5ed9 Use Java code instead of XML to define layout
* Android layout for cocos apps are very simple (full screen)
 * Avoids creation of R.java for loading the layout
 * Can package entire library in jar
 * Remove unused layout resource
2012-06-14 19:52:45 -07:00
folecr 4e5a64fd9e Minimal layout directives in XML 2012-06-14 19:52:45 -07:00
James Chen 3a5ba4a24c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-15 10:52:31 +08:00
James Chen 4c1ca36aa8 fixed #1326: The compilation of Hellolua and testjs project was broken after synchronizing to rc2. 2012-06-15 10:51:53 +08:00
minggo c965c8d770 fixed 1181: synchronize latest codes 2012-06-15 10:27:52 +08:00
folecr b6164c7590 Create a library named cocos2dandroid
* Based on sources from HelloWorld that should be common across all cocos2d-x android projects
 * Rename, use prefix cocos2dx_default_ for items in layout
 * Project files for android library, targeted to android-8
2012-06-14 19:21:02 -07:00
Nicolas Gramlich 8d7dce0999 Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest. 2012-06-14 18:16:54 -07:00
Nicolas Gramlich a7ad34864f CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff. 2012-06-14 14:23:53 -07:00
Nicolas Gramlich c7daca43d0 CCNodeLoaderLibrary: Now free from direct std::string usage. 2012-06-14 13:51:32 -07:00
Nicolas Gramlich 2554f25cd8 CCString: Added CCStringCompare operator (can be used i.e. in stl containers). 2012-06-14 13:50:47 -07:00
minggo 221be759c6 issue #1324: merge James Chen's codes 2012-06-14 18:54:05 +08:00
minggo 9d9e2579e3 issue #1181: save render texture when comming to background 2012-06-14 18:37:57 +08:00
James Chen 052d8ea931 fixed #1324: Added some create methods. Compiling successfully on win32 by vs2008. 2012-06-14 18:32:44 +08:00
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
2012-06-14 17:36:31 +08:00
James Chen 740e28dbc1 issue #1324: Uncommented old interfaces. 2012-06-14 17:29:23 +08:00
James Chen 7fe3f7357e issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
Nicolas Gramlich 4c6bf89167 Cleaned up public interface of CCNodeLoaderLibrary (now takes either const char * or CCString, instead of std::string). 2012-06-14 01:16:54 -07:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
Nicolas Gramlich cdd1fb50ac Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY* 2012-06-14 00:01:01 -07:00
Nicolas Gramlich 8e67d3e2d6 Enhanced CCString with two 'constructors' and a compare function. 2012-06-13 23:56:21 -07:00
minggo e3a84c70e9 Merge pull request #1020 from minggo/iss1257_CCGrabber
fixed #1257: make CCGrabber the same logic with iphone version
2012-06-13 23:42:37 -07:00
minggo f742de1de3 fixed #1257: make CCGrabber the same logic with iphone version 2012-06-14 14:41:02 +08:00
minggo b3fb5e6d4c fixed #1293:rename getFrames to getTotalFrames and return correct value 2012-06-14 10:49:53 +08:00
Nicolas Gramlich 0c4a6be8ff Added missiong cpp files in Android.mk. Android build now successful. 2012-06-13 16:05:31 -07:00
Nicolas Gramlich d4a19f4296 CCNodeLoader.h: Added parameter names. 2012-06-13 15:57:59 -07:00
Nicolas Gramlich 67ab3a1bcc CCSpriteLoader: Fixed a bug calling the wrong superclass method. 2012-06-13 15:57:33 -07:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07:00
Nicolas Gramlich 3e61e1f014 Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android. 2012-06-13 15:25:59 -07:00
Nicolas Gramlich de95e2c1ed Applied changes/fixes brough up by minggo. 2012-06-13 14:33:39 -07:00
Nicolas Gramlich e2a1a246a0 Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files. 2012-06-13 14:26:28 -07:00
Nicolas Gramlich 29b22adccc Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work. 2012-06-13 14:19:13 -07:00
minggo 9321a8d025 fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
minggo 15ad463fbe issue #1322: vertical alignment ok on iOS 2012-06-13 16:20:58 +08:00
minggo 2460a9f41e Merge pull request #1016 from minggo/gles20
issue #1310: modify some format
2012-06-12 20:24:34 -07:00
minggo ec4a21eaf4 issue #1310: modify some format 2012-06-13 11:23:43 +08:00
minggo 2f17e131e6 Merge pull request #979 from icewind/gles20
Override setOpacity to affect a background sprites
2012-06-12 19:49:40 -07:00
Nicolas Gramlich 895604f42e Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector. 2012-06-12 11:59:49 -07:00
Nicolas Gramlich 26d470f411 CCLabelTTFLoader: Now applying vertical alignment. 2012-06-12 11:30:36 -07:00
James Chen 08fc714a7f issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
James Chen 94a389ad06 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 14:34:17 +08:00
James Chen b770010c41 issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString.
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
2012-06-12 14:33:53 +08:00
minggo 916b276607 issue #1310: synchronize CCTexturePVR 2012-06-12 12:02:15 +08:00
minggo 36455a90e1 Merge pull request #998 from minggo/gles20
set font size when changed
2012-06-11 18:44:20 -07:00
minggo 9c58f13abb set font size when changed 2012-06-12 09:43:27 +08:00
Nicolas Gramlich e52d5ae223 CCSpriteFrameCache: Minor optimization. 2012-06-11 18:31:36 -07:00
Nicolas Gramlich 1f2652a8d7 Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.) 2012-06-11 18:31:11 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 9c52fce5d2 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 10:43:27 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen be362bef9b issue #1310: Some typo fixes. Updated CCTexture2D.h/.cpp. 2012-06-11 21:58:04 +08:00
James Chen 62f87c18a2 issue #1310: Exported CCCatmullRomTo class and ccCardinalSplineAt function. 2012-06-11 20:02:40 +08:00
minggo ccbfd24c21 issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest 2012-06-11 18:25:57 +08:00
James Chen b61ad6cdba Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 14:45:09 +08:00
James Chen 2ce7c86c50 fixed #1315: TileMapTest can't be shown correctly in retina mode. 2012-06-11 14:44:32 +08:00
minggo 55ee220245 Merge pull request #993 from minggo/gles20
issue #1310: synchronize CCLabelTTF
2012-06-10 23:37:31 -07:00
minggo b4899ae46d issue #1310: synchronize CCLabelTTF 2012-06-11 14:36:25 +08:00
James Chen bd535c3c1c issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode. 2012-06-11 11:53:17 +08:00
James Chen 33ea7905a5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
	cocos2dx/platform/ios/CCFileUtils.mm
2012-06-11 11:01:36 +08:00
James Chen c95cbb1774 issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status.
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
2012-06-11 10:59:57 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
minggo c8c696a2df Merge pull request #989 from NatWeiss/gles20
Fixed a few release-mode Xcode warnings about unused parameters.
2012-06-09 03:13:22 -07:00
Nat Weiss 70fa2ec3cb Fixed a few release-mode Xcode warnings about unused parameters. 2012-06-08 13:52:40 -07:00
Nicolas Gramlich 1e9656854b Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 10:22:25 -07:00
James Chen c9dc60b0f7 issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project. 2012-06-08 17:58:21 +08:00
James Chen 371b3f9938 issue #1310: Tests project updated!. 2012-06-08 17:34:15 +08:00
James Chen a40dfa427a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 17:15:32 +08:00
James Chen 9ff7dcd96d issue #1310: Removed some functions. 2012-06-08 17:15:00 +08:00
minggo 913707f259 Merge pull request #983 from NatWeiss/gles20
Allows Cocos2D-X to be built for iOS including all cpp files
2012-06-08 01:55:19 -07:00
James Chen 12a9d13443 issue #1310: Synchronize to RC2, HelloWorld works ok on win32. 2012-06-08 16:54:38 +08:00
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen 35e9e44e39 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 15:31:23 +08:00
minggo 6b7a59f007 issue #1310:synchronize CCLableAtlas and CCLabelBMFont 2012-06-08 15:29:47 +08:00
James Chen 6cf608effd issue #1310: deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h. 2012-06-08 15:17:15 +08:00
James Chen 4a887ac598 issue #1310: Updated CCScene.h. 2012-06-08 15:03:18 +08:00
Nat Weiss 6ee3db827c Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 23:52:15 -07:00
James Chen fd2d9a8aa6 issue #1310: Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'. 2012-06-08 14:50:41 +08:00
James Chen c8dfe7f92b issue #1310: Finished CCRenderTexture.h(.cpp). 2012-06-08 14:30:55 +08:00
minggo 9a600c6221 issue #1310: syncronize base_nodes 2012-06-08 14:17:39 +08:00
James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
	cocos2dx/CCScheduler.h
	cocos2dx/include/ccTypes.h
2012-06-08 14:14:13 +08:00
James Chen c5cf23c859 issue #1310: First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
Nat Weiss ed43e6a90b Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 21:16:24 -07:00
icewind b87e932b9f Override setOpacity to affect a background sprites
Calling button->setOpacity was affecting only to label. Now opacity
value applies also to a background sprites
2012-06-07 13:20:30 +04:00
minggo 2b55a76970 Merge pull request #978 from minggo/iss1202_remove_CCFileData
fixed #1202:remove CCFileData
2012-06-06 23:15:05 -07:00
minggo 49d8ac72f6 fixed #1202:remove CCFileData 2012-06-07 14:13:44 +08:00
James Chen f466b081c9 fixed #1308: Used std::sort to sort the touchHandler array. 2012-06-07 11:38:59 +08:00
Nicolas Gramlich 45d9fc9686 Making use of the new SEL_CCControlHandler in the CCControlExtension. 2012-06-06 14:32:15 -07:00
Nicolas Gramlich df571e9cbb CCControlExtension: Added support for SEL_CCControlHandler (as opposed to SEL_MenuHandler), which also passes the CCControlEvent parameter. 2012-06-06 14:31:14 -07:00
Nicolas Gramlich aefc1e1370 CCBMemberVariableAssigner and CCBSelectorResolver: now using const char * instead of std::string. 2012-06-06 11:43:33 -07:00
Nicolas Gramlich 671a0ef5b4 Removed zombie file: CCBMemberVariableAssigner.cpp. 2012-06-06 11:06:28 -07:00
James Chen c64c4a74bf fixed #1308: Strange TouchDispatcher behavior. 2012-06-06 22:49:28 +08:00
James Chen 4b7f9f582f fixed #1297: fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR(). 2012-06-06 15:56:55 +08:00
James Chen 734ea54aba fixed #1302: The parameter of CCMenu::setHandlerPriority should be signed int. 2012-06-06 15:16:02 +08:00
James Chen 2238db301b fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points. 2012-06-06 14:13:40 +08:00
James Chen 6bb2941ec9 fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA 2012-06-06 10:06:51 +08:00
Nicolas Gramlich bcf53f1453 Added CCNodeLoaderLibrary (more of a factory pattern, compared to adding the CCNodeLoaders directly to the CCBReader. Fixed all TODOs regarding (potential) memory leaks (Thanks to Ricardo Quesada). CCNodeLoaders are now autorelease objects (having a static 'loader()' method to be used). 2012-06-05 17:15:28 -07:00
Nicolas Gramlich c9db868d93 CCLabelTTF: Now internally using std::string instead of std::string *. 2012-06-05 17:12:41 -07:00
Nicolas Gramlich 2d86a4089c CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *. 2012-06-05 17:11:50 -07:00
Nicolas Gramlich 0702becaf5 CCAutoreleasepool: Fixed typo. 2012-06-05 16:22:42 -07:00
James Chen 56817244ed fixed #1297: Retina mode can't work in 'Projection2D' mode. 2012-06-05 15:27:46 +08:00
minggo 7733607fe2 fixed #1296: fix logical error of CCTMXTileMap::tilesetForLayer() 2012-06-05 10:51:53 +08:00
Nicolas Gramlich 420a731138 Switched from std::string to const char *. 2012-06-04 17:45:25 -07:00
Nicolas Gramlich d3e0f8dc92 Added support for resolutionScale. 2012-06-04 16:16:42 -07:00
Nicolas Gramlich 28862c30cf CCNodeLoader: Fixed small memory leak. 2012-06-04 16:03:45 -07:00
Nicolas Gramlich 5c38dd7193 Added CCBMemberVariableAssigner and CCBSelectorResolver. 2012-06-04 15:52:49 -07:00
Nicolas Gramlich 6c5be5e56e CCScale9Sprite: Removed debug logging. 2012-06-04 15:30:03 -07:00
James Chen 1b4de48e86 Merge pull request #961 from icewind/gles20
fixed #1289: CCControlButton update. Added zoomOnTouchDown property and setPreferredSize.
2012-06-03 19:55:39 -07:00
minggo ae15525e32 Merge pull request #965 from NatWeiss/gles20
fixed #1288:Enhances CCTransitionScene to work even if there is no running scene.
2012-06-03 07:36:17 -07:00
Nicolas Gramlich bb49eaebe9 Added CCParticleSystemQuadLoader. 2012-06-01 16:45:30 -07:00
Nicolas Gramlich 8576837e5e CCParticleSystemQuad: Added CCParticleSystemQuad::node(). 2012-06-01 16:38:43 -07:00
Nicolas Gramlich 43682e6857 Added CControlLoader and CCControlButtonLoader. 2012-06-01 15:14:18 -07:00
Nicolas Gramlich 2340c93c17 Fixed CCNodeLoader::parsePropTypeSpriteFrame not trying to load 'null' sprites/spritesheets. Also minor renaming. 2012-06-01 15:13:16 -07:00
Nicolas Gramlich 9951ba8ad2 Minor changes. 2012-06-01 15:12:07 -07:00
Nicolas Gramlich 67d9b8ea25 Minor changes. 2012-06-01 15:11:42 -07:00
Nicolas Gramlich eee8ba7586 CCLabelTTF: Added getters for fontName and fontSize. 2012-06-01 15:11:16 -07:00
Nicolas Gramlich 9576db1e28 CCControlButton: Added LabelAnchorPoint property. (According to: https://github.com/YannickL/CCControlExtension/ : 623f10433a088140adbb1e1d7d6c97e1ae05adf9) 2012-06-01 15:10:20 -07:00
Nicolas Gramlich 18fba1664d CCControlButton: Added getters and setters for backgroundspriteframe, titlettf, titlettfsize, titleBMGont. Added ZoomOnTouchDown property. (According to: https://github.com/YannickL/CCControlExtension/ : 9dfb9d97a5fe729115b461d9a52ebc36aba51c72, b31256ad6b26e7f645719f203f0e72d717e68c75, 7a79cd702d4ccb958281bcec5d8a7658723f7c2a, c4bbcb9beb2febfb4b55323709e30082af902c90, d4a88349e1f60100225d49e43af587dc10def66f) 2012-06-01 12:29:48 -07:00
Nicolas Gramlich 8dbe897755 CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a) 2012-06-01 11:59:10 -07:00
icewind ac268896f1 CCControlButton update. Added zoomOnTouchDown property and setPreferredSize
Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
2012-06-01 14:07:45 +04:00
Nat Weiss 0fedc8a84a Enhances CCTransitionScene to work even if there is no running scene. 2012-06-01 00:54:17 -07:00
James Chen f6ae01c523 Merge pull request #959 from dumganhar/typo_fix
Typo fixed in CCGL.h
2012-05-31 23:50:11 -07:00
James Chen 3959fe8f4d typo fixed in CCGL.h 2012-06-01 14:48:45 +08:00
minggo 63cf48f548 Merge pull request #958 from NatWeiss/gles20
fixed #1286: Fixes the declaration of tgaLoadRLEImageData()
2012-05-31 23:46:36 -07:00
Nat Weiss 472c98b652 Fixes the declaration of tgaLoadRLEImageData() to match it's implementation. This causes an android build to be successful. 2012-05-31 23:20:56 -07:00
James Chen 2b235fd705 Delete libEGL.dll(.lib). 2012-06-01 13:56:22 +08:00
James Chen ebcc78497f fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error. 2012-06-01 13:44:28 +08:00
Nicolas Gramlich 62e0c1cda0 Added CCMenuLoader, CCMenuItemLoader and CCMenuItemImageLoader. 2012-05-31 17:07:02 -07:00
Nicolas Gramlich 40f1ffe5fb CCMenuItem(Image): Added possibility to init without any image. (Changes according to: 5e8518eaed78a6c589bf73dadf85e2056f834f36, 013b4cec0a9250268b131105795e87d37cba4d52) 2012-05-31 17:04:53 -07:00
Nicolas Gramlich 7cb3be2057 Minor change. 2012-05-31 17:01:01 -07:00
Nicolas Gramlich b63559d86d Added CCBFileLoader.cpp. Fixed a bug in CCNodeLoader::onHandlePropTypeSize. 2012-05-31 14:57:13 -07:00
Nicolas Gramlich 39442e9bb6 Merged with gles20. 2012-05-31 13:10:51 -07:00
Nicolas Gramlich 4a027082be Pulled changes from github. 2012-05-31 13:08:33 -07:00
Nicolas Gramlich 8a01e33491 Added CCScale9SpriteLoader. 2012-05-31 12:38:00 -07:00
Nicolas Gramlich 948fcc3d07 CCScale9Sprite: Moved anchorpoint initialization back to updateWithBatchNode, since this is probably the intended location, but causes problems due to the order properties appear in the CCBI file format. 2012-05-31 12:37:28 -07:00
Nicolas Gramlich 8678a14b6e CCScale9Sprite: Added initialization of insets. Moved setting the default anchorpoint to its constructor. 2012-05-31 12:03:33 -07:00
Nicolas Gramlich fe9fb347aa CCScale9Sprite: Added support for insets by floats and CCRect. Fixed bug for positioning for uneven insets. Changing texture no longer affects the anchor point. Made it possible to set the SpriteFrame. (Changes according to https://github.com/YannickL/CCControlExtension/commits/gles20: d00c4f90ab53d5295bce03123ddbccc4fa0acf58, ed56cb1558c755748437d152f2f7a4bb5a1455ba, c4bbcb9beb2febfb4b55323709e30082af902c90, 5da062de92d39d91b014f87809fc30ba501538fc) 2012-05-31 11:47:16 -07:00
James Chen 63a6b97bc5 fixed #1280: Renamed some functions. 2012-05-31 15:32:18 +08:00
James Chen b39af18a5f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1280_labeltest 2012-05-31 13:08:19 +08:00