Skip to content

Commit

Permalink
Merge branch 'v3' into modifyWidgetDefaultBehavior
Browse files Browse the repository at this point in the history 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
  • Loading branch information
@zilongshanren
zilongshanren committed Dec 25, 2014
2 parents d8f726b + 6ec0301 commit 29e9ef7
Show file tree
Hide file tree
Showing 89 changed files with 3,433 additions and 1,116 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cocos2d-x-3.4 ??
[NEW] UI:LoadingBar: add TextureResType to LoadingBar's create method
cocos2d-x-3.4beta0 ??
[NEW] Action: MoveTo and MoveBy support Vec3
[NEW] Allocator: add custom allocator support, global, default, fixed block, object pool.
[NEW] UI:LoadingBar: add TextureResType to LoadingBar's create method
[NEW] Director: add setClearColor() to set clear values for the color buffers

[FIX] FileUtils: WebP format with alpha channel displayed wrong
[FIX] Label: content size of Label is incorrect if the string is set to empty string
Expand Down
38 changes: 38 additions & 0 deletions build/cocos2d_libs.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,12 @@
38B8E2E219E671D2002D7CE7 /* UILayoutComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38B8E2DF19E671D2002D7CE7 /* UILayoutComponent.cpp */; };
38B8E2E319E671D2002D7CE7 /* UILayoutComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */; };
38B8E2E419E671D2002D7CE7 /* UILayoutComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */; };
38F5263E1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */; };
38F5263F1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */; };
38F526401A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */; };
38F526411A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */; };
38F526421A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */; };
38F526431A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */; };
3E2BDADE19C030ED0055CDCD /* AudioEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E2BDADD19C030ED0055CDCD /* AudioEngine.h */; };
3E2BDAEC19C0436F0055CDCD /* AudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */; };
3E2F27A619CFBFE100E7C490 /* AudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */; };
Expand Down Expand Up @@ -1304,6 +1310,10 @@
46C02E0818E91123004B7456 /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = 46C02E0518E91123004B7456 /* xxhash.c */; };
46C02E0918E91123004B7456 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C02E0618E91123004B7456 /* xxhash.h */; };
46C02E0A18E91123004B7456 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C02E0618E91123004B7456 /* xxhash.h */; };
4D76BE3A1A4AAF0A00102962 /* CCActionTimelineNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D76BE381A4AAF0A00102962 /* CCActionTimelineNode.cpp */; };
4D76BE3B1A4AAF0A00102962 /* CCActionTimelineNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D76BE381A4AAF0A00102962 /* CCActionTimelineNode.cpp */; };
4D76BE3C1A4AAF0A00102962 /* CCActionTimelineNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D76BE391A4AAF0A00102962 /* CCActionTimelineNode.h */; };
4D76BE3D1A4AAF0A00102962 /* CCActionTimelineNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D76BE391A4AAF0A00102962 /* CCActionTimelineNode.h */; };
5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; };
5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; };
5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; };
Expand Down Expand Up @@ -2450,6 +2460,9 @@
38B8E2D419E66581002D7CE7 /* CSLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLoader.h; sourceTree = "<group>"; };
38B8E2DF19E671D2002D7CE7 /* UILayoutComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutComponent.cpp; sourceTree = "<group>"; };
38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutComponent.h; sourceTree = "<group>"; };
38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArmatureNodeReader.cpp; sourceTree = "<group>"; };
38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArmatureNodeReader.h; sourceTree = "<group>"; };
38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSArmatureNode_generated.h; sourceTree = "<group>"; };
3E2BDADD19C030ED0055CDCD /* AudioEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioEngine.h; sourceTree = "<group>"; };
3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioEngine.cpp; sourceTree = "<group>"; };
3E6176551960F89B00DE83F5 /* CCController-iOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "CCController-iOS.mm"; path = "../base/CCController-iOS.mm"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2629,6 +2642,8 @@
46A170781807CE7A005B8026 /* CCPhysicsWorld.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPhysicsWorld.h; sourceTree = "<group>"; };
46C02E0518E91123004B7456 /* xxhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xxhash.c; sourceTree = "<group>"; };
46C02E0618E91123004B7456 /* xxhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxhash.h; sourceTree = "<group>"; };
4D76BE381A4AAF0A00102962 /* CCActionTimelineNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionTimelineNode.cpp; sourceTree = "<group>"; };
4D76BE391A4AAF0A00102962 /* CCActionTimelineNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionTimelineNode.h; sourceTree = "<group>"; };
50272538190BF1B900AAF4ED /* cocos2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = ../cocos/cocos2d.h; sourceTree = "<group>"; };
50272539190BF1B900AAF4ED /* cocos2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2d.cpp; path = ../cocos/cocos2d.cpp; sourceTree = "<group>"; };
5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColorAlphaTest.frag; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3081,6 +3096,8 @@
0634A4C4194B19E400E608AF /* ActionTimeline */ = {
isa = PBXGroup;
children = (
4D76BE381A4AAF0A00102962 /* CCActionTimelineNode.cpp */,
4D76BE391A4AAF0A00102962 /* CCActionTimelineNode.h */,
38B8E2D319E66581002D7CE7 /* CSLoader.cpp */,
38B8E2D419E66581002D7CE7 /* CSLoader.h */,
0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */,
Expand Down Expand Up @@ -4380,6 +4397,16 @@
path = SpriteReader;
sourceTree = "<group>";
};
38F5263A1A48363B000DB7F7 /* ArmatureNodeReader */ = {
isa = PBXGroup;
children = (
38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */,
38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */,
38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */,
);
path = ArmatureNodeReader;
sourceTree = "<group>";
};
46A15FD01807A56F005B8026 /* audio */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4981,6 +5008,7 @@
50FCEB6818C72017004AD434 /* WidgetReader */ = {
isa = PBXGroup;
children = (
38F5263A1A48363B000DB7F7 /* ArmatureNodeReader */,
382384251A2590F9002C4610 /* NodeReader */,
3823843A1A259140002C4610 /* SingleNodeReader */,
382384411A25915C002C4610 /* SpriteReader */,
Expand Down Expand Up @@ -5227,6 +5255,7 @@
15AE180A19AAD2F700C27E9E /* CCAABB.h in Headers */,
46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */,
15AE1A5A19AAD40300C27E9E /* b2StackAllocator.h in Headers */,
38F526401A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */,
B29A7E3119EE1B7700872B35 /* SkinnedMeshAttachment.h in Headers */,
15AE1B6F19AADA9900C27E9E /* GUIDefine.h in Headers */,
15AE1A8119AAD40300C27E9E /* b2FrictionJoint.h in Headers */,
Expand Down Expand Up @@ -5269,6 +5298,7 @@
15AE1AD919AAD41000C27E9E /* b2Rope.h in Headers */,
15AE187B19AAD33D00C27E9E /* CCBAnimationManager.h in Headers */,
1A57006B180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */,
4D76BE3C1A4AAF0A00102962 /* CCActionTimelineNode.h in Headers */,
1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */,
15AE1BD719AAE01E00C27E9E /* CCControlSlider.h in Headers */,
15AE1BE519AAE01E00C27E9E /* CCTableView.h in Headers */,
Expand Down Expand Up @@ -5355,6 +5385,7 @@
15AE1B6C19AADA9900C27E9E /* UIWidget.h in Headers */,
15AE180E19AAD2F700C27E9E /* CCAnimate3D.h in Headers */,
1A5701B3180BCB590088DEC7 /* CCFontFNT.h in Headers */,
38F526421A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */,
15AE1BD919AAE01E00C27E9E /* CCControlStepper.h in Headers */,
15AE192119AAD35000C27E9E /* CocoStudio.h in Headers */,
15AE18A119AAD33D00C27E9E /* CCNodeLoaderListener.h in Headers */,
Expand Down Expand Up @@ -5981,6 +6012,7 @@
15AE1AA819AAD40300C27E9E /* b2Island.h in Headers */,
15B3708B19EE414C00ABE682 /* Manifest.h in Headers */,
1A570213180BCBF40088DEC7 /* CCProgressTimer.h in Headers */,
38F526431A48363B000DB7F7 /* CSArmatureNode_generated.h in Headers */,
B37510821823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */,
1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */,
15AE1ABB19AAD40300C27E9E /* b2EdgeAndPolygonContact.h in Headers */,
Expand Down Expand Up @@ -6012,6 +6044,7 @@
15AE1A3B19AAD3D500C27E9E /* b2BroadPhase.h in Headers */,
15AE195619AAD35100C27E9E /* CCDisplayManager.h in Headers */,
15AE1B8719AADA9A00C27E9E /* UIButton.h in Headers */,
38F526411A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */,
50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */,
5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */,
15AE1B7519AADA9A00C27E9E /* UILoadingBar.h in Headers */,
Expand Down Expand Up @@ -6239,6 +6272,7 @@
15AE1B8B19AADA9A00C27E9E /* UIImageView.h in Headers */,
15AE1A4619AAD3D500C27E9E /* b2TimeOfImpact.h in Headers */,
50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */,
4D76BE3D1A4AAF0A00102962 /* CCActionTimelineNode.h in Headers */,
50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */,
15AE198B19AAD36A00C27E9E /* ButtonReader.h in Headers */,
);
Expand Down Expand Up @@ -6554,6 +6588,7 @@
382383F01A258FA7002C4610 /* flatc.cpp in Sources */,
1A57028A180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */,
15AE18E619AAD35000C27E9E /* CCActionFrameEasing.cpp in Sources */,
38F5263E1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */,
B29A7DC919EE1B7700872B35 /* SlotData.c in Sources */,
15AE190F19AAD35000C27E9E /* CCInputDelegate.cpp in Sources */,
15AE181A19AAD2F700C27E9E /* CCBundle3D.cpp in Sources */,
Expand Down Expand Up @@ -6739,6 +6774,7 @@
15AE182819AAD2F700C27E9E /* CCMeshSkin.cpp in Sources */,
15AE19A619AAD39600C27E9E /* TextReader.cpp in Sources */,
15AE198819AAD36A00C27E9E /* ButtonReader.cpp in Sources */,
4D76BE3A1A4AAF0A00102962 /* CCActionTimelineNode.cpp in Sources */,
15AE1A6319AAD40300C27E9E /* b2Island.cpp in Sources */,
15AE1A8419AAD40300C27E9E /* b2Joint.cpp in Sources */,
50ABBD601925AB0000A911A9 /* Vec4.cpp in Sources */,
Expand Down Expand Up @@ -6952,6 +6988,7 @@
50ABBE241925AB6F00A911A9 /* base64.cpp in Sources */,
1A5701A6180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */,
15AE192B19AAD35100C27E9E /* TriggerObj.cpp in Sources */,
4D76BE3B1A4AAF0A00102962 /* CCActionTimelineNode.cpp in Sources */,
15AE198519AAD36400C27E9E /* WidgetReader.cpp in Sources */,
15AE1AAA19AAD40300C27E9E /* b2World.cpp in Sources */,
15AE1AB019AAD40300C27E9E /* b2ChainAndPolygonContact.cpp in Sources */,
Expand Down Expand Up @@ -7038,6 +7075,7 @@
15AE19B619AAD39700C27E9E /* TextBMFontReader.cpp in Sources */,
15AE1BFD19AAE01E00C27E9E /* CCInvocation.cpp in Sources */,
B24AA98A195A675C007B4522 /* CCFastTMXTiledMap.cpp in Sources */,
38F5263F1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */,
15AE18CE19AAD33D00C27E9E /* CCNodeLoader.cpp in Sources */,
38ACD1FD1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp in Sources */,
29394CF719B01DBA00D2DE1A /* UIWebViewImpl-ios.mm in Sources */,
Expand Down
Loading

0 comments on commit 29e9ef7

Please sign in to comment.