Skip to content

Commit eaddfa4

Browse files
jtwiggjtwigg
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into joints_v2
2 parents 7e1b076 + f46bd83 commit eaddfa4

21 files changed

+1066
-184
lines changed

‎cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,16 @@
101101
50F9E8170E1AA34E000E7616 /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F9E8160E1AA34E000E7616 /* ccTypes.h */; };
102102
50FBB2DA117613F500150761 /* CCActionTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FBB2D8117613F500150761 /* CCActionTween.h */; };
103103
50FBB2DB117613F500150761 /* CCActionTween.m in Sources */ = {isa = PBXBuildFile; fileRef = 50FBB2D9117613F500150761 /* CCActionTween.m */; };
104-
9D25E1351912E5370099AF7E /* CCEffectBrightnessAndContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D25E1331912E5370099AF7E /* CCEffectBrightnessAndContrast.h */; };
105-
9D25E1361912E5370099AF7E /* CCEffectBrightnessAndContrast.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D25E1341912E5370099AF7E /* CCEffectBrightnessAndContrast.m */; };
106104
5B051B1D18FC032F0091CB8C /* CCBAnimationManager+FrameAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B051B1B18FC032F0091CB8C /* CCBAnimationManager+FrameAnimation.h */; };
107105
5B051B1E18FC032F0091CB8C /* CCBAnimationManager+FrameAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B051B1C18FC032F0091CB8C /* CCBAnimationManager+FrameAnimation.m */; };
106+
9D25E1351912E5370099AF7E /* CCEffectBrightnessAndContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D25E1331912E5370099AF7E /* CCEffectBrightnessAndContrast.h */; };
107+
9D25E1361912E5370099AF7E /* CCEffectBrightnessAndContrast.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D25E1341912E5370099AF7E /* CCEffectBrightnessAndContrast.m */; };
108+
9D85671D191B018200573093 /* CCEffectBrightness.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671B191B018200573093 /* CCEffectBrightness.h */; };
109+
9D85671E191B018200573093 /* CCEffectBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D85671C191B018200573093 /* CCEffectBrightness.m */; };
110+
9D856721191B019900573093 /* CCEffectContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671F191B019900573093 /* CCEffectContrast.h */; };
111+
9D856722191B019900573093 /* CCEffectContrast.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D856720191B019900573093 /* CCEffectContrast.m */; };
112+
9DF37621191C594A00C6D27A /* CCEffectPixellate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */; };
113+
9DF37622191C594A00C6D27A /* CCEffectPixellate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF37620191C594A00C6D27A /* CCEffectPixellate.m */; };
108114
A003AC8C1657071100C7B792 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = A003AC8B1657071100C7B792 /* ccFPSImages.h */; };
109115
A003AC8F16572D6000C7B792 /* ccFPSImages.m in Sources */ = {isa = PBXBuildFile; fileRef = A003AC8E16572D6000C7B792 /* ccFPSImages.m */; };
110116
A039EBFF155C686B0061EE37 /* CCNode+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = A039EBFD155C686B0061EE37 /* CCNode+Debug.h */; };
@@ -259,6 +265,8 @@
259265
D272033018FC89A000B100FF /* CCEffectTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = D272032318FC89A000B100FF /* CCEffectTexture.m */; };
260266
D272033318FC9A4700B100FF /* CCEffectGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = D272033118FC9A4700B100FF /* CCEffectGlow.h */; };
261267
D272033418FC9A4700B100FF /* CCEffectGlow.m in Sources */ = {isa = PBXBuildFile; fileRef = D272033218FC9A4700B100FF /* CCEffectGlow.m */; };
268+
D2B49104192146FB00C3443A /* CCEffectGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */; };
269+
D2B49105192146FB00C3443A /* CCEffectGaussianBlur.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */; };
262270
D309055018AC23110081BF11 /* CCRenderer_private.h in Headers */ = {isa = PBXBuildFile; fileRef = D309054F18AC23110081BF11 /* CCRenderer_private.h */; };
263271
D33803E318032ECE0072D8FE /* CCPhysicsBody.m in Sources */ = {isa = PBXBuildFile; fileRef = D33803E218032ECE0072D8FE /* CCPhysicsBody.m */; };
264272
D33803E618032F390072D8FE /* CCPhysicsNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D33803E518032F390072D8FE /* CCPhysicsNode.m */; };
@@ -420,6 +428,13 @@
420428
92FF6C7318F33A2A005B7139 /* CCActionManager_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCActionManager_Private.h; sourceTree = "<group>"; };
421429
9D25E1331912E5370099AF7E /* CCEffectBrightnessAndContrast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBrightnessAndContrast.h; sourceTree = "<group>"; };
422430
9D25E1341912E5370099AF7E /* CCEffectBrightnessAndContrast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBrightnessAndContrast.m; sourceTree = "<group>"; };
431+
9D85671A191AE2CC00573093 /* CCEffectStack_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEffectStack_Private.h; sourceTree = "<group>"; };
432+
9D85671B191B018200573093 /* CCEffectBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBrightness.h; sourceTree = "<group>"; };
433+
9D85671C191B018200573093 /* CCEffectBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBrightness.m; sourceTree = "<group>"; };
434+
9D85671F191B019900573093 /* CCEffectContrast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectContrast.h; sourceTree = "<group>"; };
435+
9D856720191B019900573093 /* CCEffectContrast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectContrast.m; sourceTree = "<group>"; };
436+
9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectPixellate.h; sourceTree = "<group>"; };
437+
9DF37620191C594A00C6D27A /* CCEffectPixellate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectPixellate.m; sourceTree = "<group>"; };
423438
A003AC8B1657071100C7B792 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = "<group>"; };
424439
A003AC8E16572D6000C7B792 /* ccFPSImages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ccFPSImages.m; sourceTree = "<group>"; };
425440
A034FF85149DC993009F11AA /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -582,6 +597,8 @@
582597
D272032318FC89A000B100FF /* CCEffectTexture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectTexture.m; sourceTree = "<group>"; };
583598
D272033118FC9A4700B100FF /* CCEffectGlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGlow.h; sourceTree = "<group>"; };
584599
D272033218FC9A4700B100FF /* CCEffectGlow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGlow.m; sourceTree = "<group>"; };
600+
D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGaussianBlur.h; sourceTree = "<group>"; };
601+
D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGaussianBlur.m; sourceTree = "<group>"; };
585602
D2B840C31909F447008063EA /* CCRenderTexture_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCRenderTexture_Private.h; sourceTree = "<group>"; };
586603
D309054F18AC23110081BF11 /* CCRenderer_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer_private.h; sourceTree = "<group>"; };
587604
D33803DC18032E4F0072D8FE /* CCPhysics+ObjectiveChipmunk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CCPhysics+ObjectiveChipmunk.h"; sourceTree = "<group>"; };
@@ -1190,13 +1207,22 @@
11901207
D272031C18FC89A000B100FF /* CCEffectColorPulse.h */,
11911208
D272031D18FC89A000B100FF /* CCEffectColorPulse.m */,
11921209
D272032018FC89A000B100FF /* CCEffectStack.h */,
1210+
9D85671A191AE2CC00573093 /* CCEffectStack_Private.h */,
11931211
D272032118FC89A000B100FF /* CCEffectStack.m */,
11941212
D272032218FC89A000B100FF /* CCEffectTexture.h */,
11951213
D272032318FC89A000B100FF /* CCEffectTexture.m */,
11961214
D272033118FC9A4700B100FF /* CCEffectGlow.h */,
11971215
D272033218FC9A4700B100FF /* CCEffectGlow.m */,
11981216
9D25E1331912E5370099AF7E /* CCEffectBrightnessAndContrast.h */,
11991217
9D25E1341912E5370099AF7E /* CCEffectBrightnessAndContrast.m */,
1218+
9D85671B191B018200573093 /* CCEffectBrightness.h */,
1219+
9D85671C191B018200573093 /* CCEffectBrightness.m */,
1220+
9D85671F191B019900573093 /* CCEffectContrast.h */,
1221+
9D856720191B019900573093 /* CCEffectContrast.m */,
1222+
9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */,
1223+
9DF37620191C594A00C6D27A /* CCEffectPixellate.m */,
1224+
D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */,
1225+
D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */,
12001226
);
12011227
name = Effects;
12021228
sourceTree = "<group>";
@@ -1288,6 +1314,7 @@
12881314
5038B6B20E196CD8009A621E /* CCParticleSystemBase.h in Headers */,
12891315
B7705FE01831A07B0043CC67 /* ALBuffer.h in Headers */,
12901316
B7705FE41831A07B0043CC67 /* ALChannelSource.h in Headers */,
1317+
9D856721191B019900573093 /* CCEffectContrast.h in Headers */,
12911318
B77060011831A07B0043CC67 /* NSMutableDictionary+WeakReferences.h in Headers */,
12921319
50F9E8170E1AA34E000E7616 /* ccTypes.h in Headers */,
12931320
D3A2E7D2181E12750033614C /* CCPhysicsShape.h in Headers */,
@@ -1299,6 +1326,7 @@
12991326
B7705FE81831A07B0043CC67 /* ALDevice.h in Headers */,
13001327
B7705FCD1831A07B0043CC67 /* OALAction+Private.h in Headers */,
13011328
501CCFB50E99657C00B86F68 /* TGAlib.h in Headers */,
1329+
D2B49104192146FB00C3443A /* CCEffectGaussianBlur.h in Headers */,
13021330
B7D2730D1822F4AA0054849B /* CCBAnimationManager.h in Headers */,
13031331
50F7B2780F28DE7C00057537 /* CCActionEase.h in Headers */,
13041332
B798D1451820305400E7BFCD /* CCSprite_Private.h in Headers */,
@@ -1320,6 +1348,7 @@
13201348
D272032718FC89A000B100FF /* CCEffectColor.h in Headers */,
13211349
B7E260D818171D2000A0E872 /* CCTextField.h in Headers */,
13221350
B7D273131822F4AA0054849B /* CCBReader.h in Headers */,
1351+
9DF37621191C594A00C6D27A /* CCEffectPixellate.h in Headers */,
13231352
50CB3B0E100AC43A00B7A750 /* CCActionManager.h in Headers */,
13241353
509D0818101E4FCE007E1749 /* CCTiledMap.h in Headers */,
13251354
50F29F6F102053370046CA73 /* base64.h in Headers */,
@@ -1367,6 +1396,7 @@
13671396
E0EAD10C121F4B4600B0C81C /* CCESRenderer.h in Headers */,
13681397
E0EAD19D121F4D7300B0C81C /* CCGL.h in Headers */,
13691398
E0EAD1F1121F522A00B0C81C /* CCConfiguration.h in Headers */,
1399+
9D85671D191B018200573093 /* CCEffectBrightness.h in Headers */,
13701400
D272032B18FC89A000B100FF /* CCEffectNode.h in Headers */,
13711401
B77060061831A07B0043CC67 /* OALTools.h in Headers */,
13721402
E0F924711224140400EF2362 /* CCTexturePVR.h in Headers */,
@@ -1519,6 +1549,7 @@
15191549
D33803EA180331A90072D8FE /* CCPhysicsJoint.m in Sources */,
15201550
B7705FE91831A07B0043CC67 /* ALDevice.m in Sources */,
15211551
5018F2740DFDEAFF00C013A5 /* CCLabelTTF.m in Sources */,
1552+
9D856722191B019900573093 /* CCEffectContrast.m in Sources */,
15221553
5018F2760DFDEAFF00C013A5 /* CCNodeColor.m in Sources */,
15231554
B77060001831A07B0043CC67 /* NSMutableArray+WeakReferences.m in Sources */,
15241555
5018F2780DFDEAFF00C013A5 /* CCScene.m in Sources */,
@@ -1528,6 +1559,7 @@
15281559
504055B10E3230BD00213FEF /* CCParticleExamples.m in Sources */,
15291560
506602120E38A70D000B500E /* CCScheduler.m in Sources */,
15301561
50A07B7B0E4CBCD300AAF0BB /* cocos2d.m in Sources */,
1562+
D2B49105192146FB00C3443A /* CCEffectGaussianBlur.m in Sources */,
15311563
B7D273181822F4AA0054849B /* CCBSequenceProperty.m in Sources */,
15321564
501CCFB40E99657C00B86F68 /* TGAlib.m in Sources */,
15331565
B7E260D918171D2000A0E872 /* CCTextField.m in Sources */,
@@ -1575,6 +1607,7 @@
15751607
E01E6D8D121F130E001A484F /* CCLabelBMFont.m in Sources */,
15761608
E0EAD100121F4B4600B0C81C /* CCDirectorIOS.m in Sources */,
15771609
E0EAD109121F4B4600B0C81C /* CCGLView.m in Sources */,
1610+
9D85671E191B018200573093 /* CCEffectBrightness.m in Sources */,
15781611
D272033418FC9A4700B100FF /* CCEffectGlow.m in Sources */,
15791612
B7D273101822F4AA0054849B /* CCBKeyframe.m in Sources */,
15801613
E0F924721224140400EF2362 /* CCTexturePVR.m in Sources */,
@@ -1595,6 +1628,7 @@
15951628
A0C87D1B14F9A3A100C0E8B2 /* NSThread+performBlock.m in Sources */,
15961629
B7705FE11831A07B0043CC67 /* ALBuffer.m in Sources */,
15971630
B7D273161822F4AA0054849B /* CCBsequence.m in Sources */,
1631+
9DF37622191C594A00C6D27A /* CCEffectPixellate.m in Sources */,
15981632
A0A7A53D1514F27D00C8BD16 /* CCActionCatmullRom.m in Sources */,
15991633
D380581B1889AD6000822437 /* CCRenderer.m in Sources */,
16001634
D272032818FC89A000B100FF /* CCEffectColor.m in Sources */,

0 commit comments

Comments
 (0)