Nicolas Gramlich
2554f25cd8
CCString: Added CCStringCompare operator (can be used i.e. in stl containers).
2012-06-14 13:50:47 -07: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
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
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