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

4525 Commits

Author SHA1 Message Date
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 064ffc8396 Merge pull request #1019 from minggo/iss1293_ccdirector_getFrames 
fixed #1293:rename getFrames to getTotalFrames and return correct value
 2012-06-13 19:51:12 -07:00
minggo b3fb5e6d4c fixed #1293:rename getFrames to getTotalFrames and return correct value 2012-06-14 10:49:53 +08:00
minggo eab44f3d6e Merge pull request #1012 from nicolasgramlich/gles20-ccbi 
issue #1323:CCBIReader along with some merges from cocos2d-iphone where necessary.
 2012-06-13 19:01:55 -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 a4f0ba8722 Merge pull request #1018 from minggo/iss1322_labelttf 
Make vertical alignment of CCLabelTTF works ok on iOS and Android
 2012-06-13 03:37:31 -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
minggo f80fd0c232 Merge pull request #1015 from minggo/gles20 
issue #1310:synchronize some codes
 2012-06-12 19:46:45 -07:00
minggo b282d52a65 issue #1310:synchronize some codes 2012-06-13 10:41:04 +08:00
James Chen 716c90805b Merge pull request #1014 from dumganhar/gles20 
issue #1310: Added one resource (TestPremultipliedAlpha.plist).
 2012-06-12 18:59:47 -07:00
James Chen 1a3de95ccb issue #1310: Added one resource (TestPremultipliedAlpha.plist). 2012-06-13 09:58:50 +08: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 5fb09bea49 Merge pull request #1011 from dumganhar/gles20 
issue #1310: Updated MotionStreakTest.
 2012-06-12 03:28:23 -07:00
James Chen d2a16c2b76 issue #1310: Updated MotionStreakTest. 2012-06-12 18:27:36 +08:00
James Chen 51f02112c7 Merge pull request #1010 from dumganhar/gles20 
issue #1310: Updated TileMapTest, TransitionsTest, ZwoptexTest.
 2012-06-12 03:23:53 -07:00
James Chen e943dbf2fd issue #1310: Updated TileMapTest, TransitionsTest, ZwoptexTest. 2012-06-12 18:22:48 +08:00
James Chen dbde2e0464 Merge pull request #1009 from dumganhar/gles20 
issue #1310: Updated SchedulerTest.
 2012-06-12 03:16:57 -07:00
James Chen 2be8ba120c issue #1310: Updated vs2008 project setting. 2012-06-12 18:15:25 +08:00
James Chen 6d4b80a826 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 18:13:02 +08:00
James Chen dab90107b9 issue #1310: Updated SchedulerTest. 2012-06-12 18:12:45 +08:00
James Chen 92f0364dca Merge pull request #1008 from dumganhar/gles20 
issue #1310: Reverted floatr to CCTimer.
 2012-06-12 02:09:10 -07:00
James Chen 08fc714a7f issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
minggo 1d77d53af3 Merge pull request #1007 from minggo/gles20 
issue #1310: synchronize some codes
 2012-06-12 01:57:24 -07:00
minggo 9fbe1fef96 issue #1310: synchronize some codes 2012-06-12 16:56:34 +08:00
James Chen a7e2fef3d4 Merge pull request #1006 from dumganhar/gles20 
issue #1310: Updated RotateWorldTest and SceneTest.
 2012-06-12 01:23:37 -07:00
James Chen c8b5ad0440 issue #1310: Updated RotateWorldTest and SceneTest. 2012-06-12 16:22:25 +08:00
James Chen afba11abb7 Merge pull request #1005 from dumganhar/gles20 
issue #1310: Updated ParallaxTest and RenderTextureTest.
 2012-06-12 00:56:36 -07:00
James Chen 23519ef85c issue #1310: Updated ParallaxTest and RenderTextureTest. 2012-06-12 15:55:23 +08:00
James Chen ea99de351a Merge pull request #1004 from dumganhar/gles20 
issue #1310: Updated ParticleTest.
 2012-06-12 00:41:21 -07:00
James Chen 1c0f391e03 issue #1310: Updated ParticleTest. 2012-06-12 15:40:31 +08:00
James Chen 94a7be82b4 Merge pull request #1003 from dumganhar/gles20 
issue #1310: Updated NodeTest.
 2012-06-12 00:23:27 -07:00
James Chen ae1ea76ca1 issue #1310: Updated NodeTest. 2012-06-12 15:22:42 +08:00
James Chen ecdd9f0072 Merge pull request #1002 from dumganhar/gles20 
issue #1310: Updated LayerTest.
 2012-06-12 00:15:37 -07:00
James Chen f5b2a5d33d issue #1310: Updated LayerTest. 2012-06-12 15:14:01 +08:00
James Chen 14386b06cd Merge pull request #1001 from dumganhar/gles20 
issue #1310: Synchronize to RC2, updated something as follows:
1.Added some resources for tests project;
2.Updated LabelTest;
3.Added init method for CCLabelBMFont;
4.Fixed a bug in CCLabelAtlas::initWithString;
5.In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
 2012-06-11 23:39:53 -07:00