[cocos2d/cocos2d-swift] 39b82a: CCEffectRenderer - Fix build warning
13 views
Skip to first unread message
GitHub
Sep 22, 2014, 12:52:27 AM9/22/14
to cocos2d-iph...@googlegroups.com
Branch: refs/heads/metal-hacking
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 39b82af5a229b1303a0a0ea4b43836aa75af10ee
https://github.com/cocos2d/cocos2d-swift/commit/39b82af5a229b1303a0a0ea4b43836aa75af10ee
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M cocos2d/CCEffectRenderer.m
Log Message:
-----------
CCEffectRenderer - Fix build warning
GLKMatrix4Invert() takes bool not BOOL as its final argument.
Commit: b1c8eda1a21cfc3aa2497b7d6123ab0b88c3e8c9
https://github.com/cocos2d/cocos2d-swift/commit/b1c8eda1a21cfc3aa2497b7d6123ab0b88c3e8c9
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M README.md
M UnitTests/CCReaderTest.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
R cocos2d-ui-tests/tests/CCEffectPongTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d/cocos2d.h
R install.sh
R installer/build_installer.sh
R installer/install.platypus
R installer/install.sh
R installer/install_icon.png
R templates/CCNode class.xctemplate/CCNode/___FILEBASENAME___.h
R templates/CCNode class.xctemplate/CCNode/___FILEBASENAME___.m
R templates/CCNode class.xctemplate/CCSprite/___FILEBASENAME___.h
R templates/CCNode class.xctemplate/CCSprite/___FILEBASENAME___.m
R templates/CCNode class.xctemplate/TemplateIcon.icns
R templates/CCNode class.xctemplate/TemplateInfo.plist
R templates/Support/Base/base.xctemplate/TemplateInfo.plist
R templates/Support/Base/base_ios.xctemplate/Resources/Defaul...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Default-Landscape~ipad.png
R templates/Support/Base/base_ios.xctemplate/Resources/Default.png
R templates/Support/Base/base_ios.xctemplate/Resources/Def...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-120.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-72.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Ico...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-76.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Ico...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Small-50.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Small.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Spotlight-iOS7.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Spot...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-iPad-Sp...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Ic...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Info.plist
R templates/Support/Base/base_ios.xctemplate/Resources/angry.png
R templates/Support/Base/base_ios.xctemplate/Resources/iTunesArtwork
R templates/Support/Base/base_ios.xctemplate/Resources/iTunesArtwork@2x
R templates/Support/Base/base_ios.xctemplate/TemplateInfo.plist
R templates/Support/Base/base_osx.xctemplate/Resources/English.lproj/InfoPlist.strings
R templates/Support/Base/base_osx.xctemplate/Resources/English.lproj/MainMenu.xib
R templates/Support/Base/base_osx.xctemplate/Resources/Info.plist
R templates/Support/Base/base_osx.xctemplate/Resources/icon.icns
R templates/Support/Base/base_osx.xctemplate/TemplateInfo.plist
R templates/Support/Bundle/bundle.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_ccbreader.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_chipmunk.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_cocos2d-ui.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_cocos2d.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_objectal.xctemplate/TemplateInfo.plist
R templates/cocos2d OS X.xctemplate/Classes/AppDelegate.h
R templates/cocos2d OS X.xctemplate/Classes/AppDelegate.m
R templates/cocos2d OS X.xctemplate/Classes/HelloWorldLayer.h
R templates/cocos2d OS X.xctemplate/Classes/HelloWorldLayer.m
R templates/cocos2d OS X.xctemplate/Supporting Files/Prefix.pch
R templates/cocos2d OS X.xctemplate/Supporting Files/main.m
R templates/cocos2d OS X.xctemplate/TemplateIcon.icns
R templates/cocos2d OS X.xctemplate/TemplateInfo.plist
R templates/cocos2d iOS Newton.xctemplate/Classes/AppDelegate.h
R templates/cocos2d iOS Newton.xctemplate/Classes/AppDelegate.m
R templates/cocos2d iOS Newton.xctemplate/Classes/HelloWorldScene.h
R templates/cocos2d iOS Newton.xctemplate/Classes/HelloWorldScene.m
R templates/cocos2d iOS Newton.xctemplate/Classes/IntroScene.h
R templates/cocos2d iOS Newton.xctemplate/Classes/IntroScene.m
R templates/cocos2d iOS Newton.xctemplate/Newton/LightBulb.h
R templates/cocos2d iOS Newton.xctemplate/Newton/LightBulb.m
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonConstants.h
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonScene.h
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonScene.m
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonSphere.h
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonSphere.m
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/fire.off.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/fire.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/left.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.2.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.c.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.d.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.e.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.h.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.highlight.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.l.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.o.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.r.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.s.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.shadow.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.w.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/light.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/reset.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/right.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/rope.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/newton.tps
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/fire.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/fire.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipad.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipad.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipadhd.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipadhd.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Rope.h
R templates/cocos2d iOS Newton.xctemplate/Newton/Rope.m
R templates/cocos2d iOS Newton.xctemplate/Supporting Files/Prefix.pch
R templates/cocos2d iOS Newton.xctemplate/Supporting Files/main.m
R templates/cocos2d iOS Newton.xctemplate/TemplateIcon.icns
R templates/cocos2d iOS Newton.xctemplate/TemplateInfo.plist
R templates/cocos2d iOS.xctemplate/Classes/AppDelegate.h
R templates/cocos2d iOS.xctemplate/Classes/AppDelegate.m
R templates/cocos2d iOS.xctemplate/Classes/HelloWorldScene.h
R templates/cocos2d iOS.xctemplate/Classes/HelloWorldScene.m
R templates/cocos2d iOS.xctemplate/Classes/IntroScene.h
R templates/cocos2d iOS.xctemplate/Classes/IntroScene.m
R templates/cocos2d iOS.xctemplate/Supporting Files/Prefix.pch
R templates/cocos2d iOS.xctemplate/Supporting Files/main.m
R templates/cocos2d iOS.xctemplate/TemplateIcon.icns
R templates/cocos2d iOS.xctemplate/TemplateInfo.plist
A tools/BuildDistribution.sh
M tools/build_docs.sh
A tools/git-archive-all
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 75077bd51905e83b7fea5ecca714f3f7faeb4bd4
https://github.com/cocos2d/cocos2d-swift/commit/75077bd51905e83b7fea5ecca714f3f7faeb4bd4
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectColorChannelOffset - Initial commit
Commit: 27c3963a84bc0c6e98c6fda16d5186fccf3e01c7
https://github.com/cocos2d/cocos2d-swift/commit/27c3963a84bc0c6e98c6fda16d5186fccf3e01c7
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectColorChannelOffset.h
M cocos2d/CCEffectColorChannelOffset.m
M cocos2d/cocos2d.h
Log Message:
-----------
CCEffectColorChannelOffset - First pass at the implementation
The basics are working though alpha isn't handled yet. This also adds a test to CCEffectsTest.
Commit: 05b9385fac4fd24664be91a03b898599b9e35188
https://github.com/cocos2d/cocos2d-swift/commit/05b9385fac4fd24664be91a03b898599b9e35188
Author: Sean Ridenour <kew...@gmail.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Always stop animating when app is backgrounded
Even if the CCDirector isn't the "visible" view controller, the app will still crash if it gets backgrounded and the CCDirector keeps trying to draw. Make sure CCDirector stops drawing if, say, the GameCenter login screen is showing and the user switches away from the app to look up their password in 1Password or something.
Commit: 975dff55c12b01db9dbd7a4baa21d0e692dafe66
https://github.com/cocos2d/cocos2d-swift/commit/975dff55c12b01db9dbd7a4baa21d0e692dafe66
Author: Sean Ridenour <kew...@gmail.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
More consistent curly braces.
Commit: 86a34fe739450bdaebdf50d0c4d38b369909dcf7
https://github.com/cocos2d/cocos2d-swift/commit/86a34fe739450bdaebdf50d0c4d38b369909dcf7
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectColorChannelOffset - Compute output alpha as the average of the sample alpha values
Commit: 5c1dff3469d41029ac070d535c3151bdce05914a
https://github.com/cocos2d/cocos2d-swift/commit/5c1dff3469d41029ac070d535c3151bdce05914a
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Remove misplaced ' ' character
Commit: 858b6a9f23dea6d905a02b0147aa76e10d7a5cf4
https://github.com/cocos2d/cocos2d-swift/commit/858b6a9f23dea6d905a02b0147aa76e10d7a5cf4
Author: Sarah Smith <s...@storybridge.org>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
Log Message:
-----------
Handle odd line seperators in CCLabelBMFont.
The XCode plist editor and some other editors can create string data
with Unicode line seperators in it, eg: \u2028.
http://en.wikipedia.org/wiki/Newline#Unicode
You can easily enter one using <ctrl>+<enter> in your plist or code
editor. The plist editor will not let you type <enter> as it will just
commit the current cell being edited. To get an actual newline you can
type <option>+<enter>.
Code in CCLabelBMFont correctly tests using NSCharacterSet
newlineCharacterSet in most places, but in two places incorrectly
tests for equality against '\n'.
So strings with one of these "odd" newlines will be rendered with all
the text on one line. Fix this, and make the code consistent.
Commit: c4bc3e040e5aedbc2cca0f3ad1bf2ee070c36866
https://github.com/cocos2d/cocos2d-swift/commit/c4bc3e040e5aedbc2cca0f3ad1bf2ee070c36866
Author: AT2014 <in...@apptyrant.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Changed paths:
M cocos2d/CCNode.m
Log Message:
-----------
Added reschedule:interval method to CCNode.
Added reschedule:interval method to CCNode.m. When you call the reschedule:interval: method using a selector that is already scheduled this method will update the interval. It may be useful to use this method at certain times rather than using the schedule:interval: method (which will unschedule and then reschedule an already scheduled method).
If you call reschedule:interval method and pass in a selector that was never scheduled, this method will schedule the selector for the first time.
Commit: b5c1a11708d9d68e563257d00864608d2f10b709
https://github.com/cocos2d/cocos2d-swift/commit/b5c1a11708d9d68e563257d00864608d2f10b709
Author: AT2014 <in...@apptyrant.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Changed paths:
M cocos2d/CCNode.h
Log Message:
-----------
Added reschedule method to CCNode header
Added reschedule:interval: method to CCNode header file.
Commit: bc53002792f9bf8363f8b7ef20d60abc5f9902f6
https://github.com/cocos2d/cocos2d-swift/commit/bc53002792f9bf8363f8b7ef20d60abc5f9902f6
Author: AT2014 <in...@apptyrant.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Changed paths:
M cocos2d/CCNode.h
Log Message:
-----------
Fixed header comment.
Fixed header comment on reschedule:interval: method.
Commit: 8f4d8c196b2d46d5c8899673e0260dbfb63c68a6
https://github.com/cocos2d/cocos2d-swift/commit/8f4d8c196b2d46d5c8899673e0260dbfb63c68a6
Author: slembcke <slem...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCRenderer.m
Log Message:
-----------
Fixed a bug with render state caching and added unit tests for it.
Commit: 798f3215a05671d68c0db9c3702136a0cd3cbfb8
https://github.com/cocos2d/cocos2d-swift/commit/798f3215a05671d68c0db9c3702136a0cd3cbfb8
Author: Donald Ness <donal...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
Log Message:
-----------
Fix compiler warning
Cast NSUInteger to unsigned long and use %lu format specifier
http://useyourloaf.com/blog/2014/04/13/format-string-issue-using-nsinteger.html
Commit: 314af8a1428649b37d2eb4b34601ddc62d75f144
https://github.com/cocos2d/cocos2d-swift/commit/314af8a1428649b37d2eb4b34601ddc62d75f144
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffect_Private.h
Log Message:
-----------
CCEffect - Add support for effect padding
Fix clipping of effects that expand the visual footprint of the node they're applied to (blur for example).
The user can now specify horizontal and vertical padding that increases the size of the rendered
geometry but adjusts the texture coordinates such that the sprite image stays the same size. By
adding this padding, effects like blur no longer get clipped off by the edge of the sprite geometry.
Unfortunately, for sprites from sprite sheets, individual effects must also be modified to avoid
fetching outside the sprite's footprint within the sheet. Because GLES does not support the
clamp-to-border wrap mode, this must be handled within the shaders.
Commit: 65601a8355ad1f69fa83b689c68109742f6c6844
https://github.com/cocos2d/cocos2d-swift/commit/65601a8355ad1f69fa83b689c68109742f6c6844
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectBlur.m
Log Message:
-----------
CCEffectBlur - Add padding support to CCEffectBlur and add a test for it
Commit: e40c1e35241f7ec27d23f1a29abc9728b3e559ea
https://github.com/cocos2d/cocos2d-swift/commit/e40c1e35241f7ec27d23f1a29abc9728b3e559ea
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M .gitmodules
A CCRendererGLSupport.m
R Resources/Fonts/Abduction.ttf
A Resources/Fonts/RobotoSlab-Bold.ttf
A Resources/Fonts/RobotoSlab-Light.ttf
A Resources/Fonts/RobotoSlab-Regular.ttf
A Resources/Fonts/RobotoSlab-Thin.ttf
A Resources/Fonts/ThisFontIsAbdFont.ttf
A Resources/Images/DistanceFieldX.png
A Resources/Images/Ohm.png
M Resources/Images/fire.pvr
A Resources/Images/test_1021x1024.png
A Resources/Music/CIRCUS.mp3
M Resources/Particles/BoilingFoam.plist
M Resources/Particles/BurstPipe.plist
M Resources/Particles/ExplodingRing.plist
M Resources/Particles/LavaFlow.plist
M Resources/Particles/Phoenix.plist
M Resources/Particles/SmallSun.plist
M Resources/Particles/SpookyPeas.plist
A Resources/Sounds/sound.ogg
M Resources/TileMaps/orthogonal-desert-obscenely-large.tmx
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/appledoc.xcscheme
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/cocos2d.xcscheme
M cocos2d-osx.xcodeproj/project.pbxproj
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties.lock
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileHashes.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileSnapshots.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/outputFileStates.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/taskArtifacts.bin
A cocos2d-tests-android/.idea/.name
A cocos2d-tests-android/.idea/compiler.xml
A cocos2d-tests-android/.idea/copyright/profiles_settings.xml
A cocos2d-tests-android/.idea/dictionaries/phausler.xml
A cocos2d-tests-android/.idea/encodings.xml
A cocos2d-tests-android/.idea/gradle.xml
A cocos2d-tests-android/.idea/libraries/appcompat_v7_19_0_1.xml
A cocos2d-tests-android/.idea/libraries/support_v4_19_0_1.xml
A cocos2d-tests-android/.idea/misc.xml
A cocos2d-tests-android/.idea/modules.xml
A cocos2d-tests-android/.idea/scopes/scope_settings.xml
A cocos2d-tests-android/.idea/vcs.xml
A cocos2d-tests-android/.idea/workspace.xml
A cocos2d-tests-android/Headless.approj/targets/Headless/Debug.overrides.json
A cocos2d-tests-android/Headless.iml
A cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
A cocos2d-tests-android/Headless/Headless-Headless.iml
A cocos2d-tests-android/Headless/Headless-Info.plist
A cocos2d-tests-android/Headless/Headless-Prefix.pch
A cocos2d-tests-android/Headless/HeadlessActivity.h
A cocos2d-tests-android/Headless/HeadlessActivity.m
A cocos2d-tests-android/Headless/SimpleScene.h
A cocos2d-tests-android/Headless/SimpleScene.m
A cocos2d-tests-android/Headless/build.gradle
A cocos2d-tests-android/Headless/en.lproj/InfoPlist.strings
A cocos2d-tests-android/Headless/java/org/cocos2d/demo/HeadlessActivity.java
A cocos2d-tests-android/Headless/proguard-rules.txt
A cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
A cocos2d-tests-android/Headless/src/main/res/drawable-hdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-mdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xxhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/tests/CCBMFontTest.m
A cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
A cocos2d-tests-android/Headless/tests/CCEffectsTest.m
A cocos2d-tests-android/Headless/tests/CCLabelTTFTest.m
A cocos2d-tests-android/Headless/tests/CCLayoutTest.m
A cocos2d-tests-android/Headless/tests/CCPhysicsTest.m
A cocos2d-tests-android/Headless/tests/CCRendererTest.m
A cocos2d-tests-android/Headless/tests/CCResponderTest.m
A cocos2d-tests-android/Headless/tests/CCSchedulerTest.m
A cocos2d-tests-android/Headless/tests/CCScrollViewTest.m
A cocos2d-tests-android/Headless/tests/CCSliderTest.m
A cocos2d-tests-android/Headless/tests/CCSprite9SliceTest.m
A cocos2d-tests-android/Headless/tests/CCTableViewTest.m
A cocos2d-tests-android/Headless/tests/CCTextFieldTest.m
A cocos2d-tests-android/Headless/tests/CCTextureCacheTest.m
A cocos2d-tests-android/Headless/tests/CCTransitionTest.m
A cocos2d-tests-android/Headless/tests/ColorPickerTest.m
A cocos2d-tests-android/Headless/tests/ColorTest.m
A cocos2d-tests-android/Headless/tests/ObjectALTest.m
A cocos2d-tests-android/Headless/tests/ParallaxTest.m
A cocos2d-tests-android/Headless/tests/ParticleTest.m
A cocos2d-tests-android/Headless/tests/PositioningTest.m
A cocos2d-tests-android/Headless/tests/SpritePerformanceTest.m
A cocos2d-tests-android/Headless/tests/TextureTest.m
A cocos2d-tests-android/Headless/tests/TilemapTest.m
A cocos2d-tests-android/Headless/tests/VertexZTest.m
A cocos2d-tests-android/HeadlessTests/HeadlessTests-Info.plist
A cocos2d-tests-android/HeadlessTests/HeadlessTests.m
A cocos2d-tests-android/HeadlessTests/en.lproj/InfoPlist.strings
A cocos2d-tests-android/build.gradle
A cocos2d-tests-android/gradle.properties
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.jar
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.properties
A cocos2d-tests-android/gradlew
A cocos2d-tests-android/gradlew.bat
A cocos2d-tests-android/local.properties
A cocos2d-tests-android/settings.gradle
M cocos2d-tests-ios.xcodeproj/project.pbxproj
A cocos2d-tests-iosAndroid-Info.plist
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/MainMenu.m
M cocos2d-ui-tests/ios/Resources/Info.plist
M cocos2d-ui-tests/osx/Resources/Info.plist
M cocos2d-ui-tests/osx/main.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCLabelTTFTest.m
M cocos2d-ui-tests/tests/CCResponderTest.m
M cocos2d-ui-tests/tests/CCTextFieldTest.m
M cocos2d-ui-tests/tests/ColorTest.m
M cocos2d-ui-tests/tests/ObjectALTest.m
M cocos2d-ui-tests/tests/ParallaxTest.m
M cocos2d-ui-tests/tests/ParticleTest.m
M cocos2d-ui-tests/tests/PositioningTest.m
M cocos2d-ui-tests/tests/TextureTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCButton.h
M cocos2d-ui/CCButton.m
M cocos2d-ui/CCControl.m
M cocos2d-ui/CCControlSubclass.h
M cocos2d-ui/CCScrollView.h
M cocos2d-ui/CCScrollView.m
M cocos2d-ui/CCSlider.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/CCTextField.m
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.h
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m
A cocos2d-ui/Platform/Android/java/CCEditText.h
A cocos2d-ui/Platform/Android/java/CCEditText.m
A cocos2d-ui/Platform/Android/java/org/cocos2d/CCEditText.java
A cocos2d-ui/Platform/CCPlatformTextField.h
A cocos2d-ui/Platform/CCPlatformTextField.m
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.h
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.m
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.h
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.m
M cocos2d/CCActionCatmullRom.m
M cocos2d/CCActionInstant.m
M cocos2d/CCAnimation.h
M cocos2d/CCCache.h
M cocos2d/CCCache.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.h
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
A cocos2d/CCEffectDropShadow.h
A cocos2d/CCEffectDropShadow.m
M cocos2d/CCEffectNode.h
A cocos2d/CCEffectOuterGlow.h
A cocos2d/CCEffectOuterGlow.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCLabelTTF.h
M cocos2d/CCLabelTTF.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.h
M cocos2d/CCNodeColor.m
M cocos2d/CCParticleSystemBase.m
M cocos2d/CCProgressNode.m
M cocos2d/CCProtocols.h
A cocos2d/CCRenderDispatch.h
A cocos2d/CCRenderDispatch.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCResponder.h
M cocos2d/CCResponder.m
M cocos2d/CCResponderManager.h
M cocos2d/CCResponderManager.m
M cocos2d/CCScheduler.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.h
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTexture_Private.h
M cocos2d/CCTiledMapLayer.h
M cocos2d/CCTiledMapLayer.m
A cocos2d/CCTouch.h
A cocos2d/CCTouch.m
A cocos2d/CCTouchEvent.h
A cocos2d/CCTouchEvent.m
M cocos2d/CCTransition.m
A cocos2d/Platforms/Android/CCActivity.h
A cocos2d/Platforms/Android/CCActivity.m
A cocos2d/Platforms/Android/CCDirectorAndroid.h
A cocos2d/Platforms/Android/CCDirectorAndroid.m
A cocos2d/Platforms/Android/CCGLView.h
A cocos2d/Platforms/Android/CCGLView.m
A cocos2d/Platforms/Android/CCGestureListener.h
A cocos2d/Platforms/Android/CCGestureListener.m
A cocos2d/Platforms/Android/CCMathTypesAndroid.h
A cocos2d/Platforms/Android/CCMathUtilsAndroid.h
A cocos2d/Platforms/Android/CCMatrix3.h
A cocos2d/Platforms/Android/CCMatrix3.m
A cocos2d/Platforms/Android/CCMatrix4.h
A cocos2d/Platforms/Android/CCMatrix4.m
A cocos2d/Platforms/Android/CCQuaternion.h
A cocos2d/Platforms/Android/CCQuaternion.m
A cocos2d/Platforms/Android/CCTouchAndroid.h
A cocos2d/Platforms/Android/CCTouchAndroid.m
A cocos2d/Platforms/Android/CCVector2.h
A cocos2d/Platforms/Android/CCVector3.h
A cocos2d/Platforms/Android/CCVector4.h
A cocos2d/Platforms/Android/java/org/cocos2d/CCActivity.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGLView.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGestureListener.java
A cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/CCNS.h
A cocos2d/Platforms/CCRenderDispatch_Private.h
M cocos2d/Platforms/Mac/CCDirectorMac.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/Mac/CCWindow.h
M cocos2d/Platforms/Mac/CCWindow.m
M cocos2d/Platforms/Mac/NSEvent+CC.h
M cocos2d/Platforms/Mac/NSEvent+CC.m
M cocos2d/Platforms/iOS/CCAppDelegate.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.h
M cocos2d/Platforms/iOS/CCDirectorIOS.m
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCES2Renderer.m
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
A cocos2d/Platforms/iOS/CCMetalSupport.m
A cocos2d/Platforms/iOS/CCMetalSupport_Private.h
A cocos2d/Platforms/iOS/CCMetalView.h
A cocos2d/Platforms/iOS/CCMetalView.m
A cocos2d/Platforms/iOS/CCShaders.metal
A cocos2d/Platforms/iOS/CCTouchIOS.h
A cocos2d/Platforms/iOS/CCTouchIOS.m
M cocos2d/Platforms/iOS/UITouch+CC.h
M cocos2d/Platforms/iOS/UITouch+CC.m
M cocos2d/Support/CCColor.h
M cocos2d/Support/CCColor.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
M cocos2d/Support/CGPointExtension.h
M cocos2d/Support/CGPointExtension.m
M cocos2d/Support/NSAttributedString+CCAdditions.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/ccConfig.h
M cocos2d/ccMacros.h
M cocos2d/ccTypes.h
M cocos2d/cocos2d.h
M external/ObjectAL/Actions/OALActionManager.m
M external/ObjectAL/AudioTrack/OALAudioTrack.h
M external/ObjectAL/AudioTrack/OALAudioTrack.m
M external/ObjectAL/AudioTrack/OALAudioTracks.h
M external/ObjectAL/AudioTrack/OALAudioTracks.m
M external/ObjectAL/OALSimpleAudio.h
M external/ObjectAL/OALSimpleAudio.m
A external/ObjectAL/Support/ALWeakArray.h
A external/ObjectAL/Support/ALWeakArray.m
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 8bdd372de770cd183eb76e7f6ccc589589d3544a
https://github.com/cocos2d/cocos2d-swift/commit/8bdd372de770cd183eb76e7f6ccc589589d3544a
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M .gitmodules
A CCRendererGLSupport.m
R Resources/Fonts/Abduction.ttf
A Resources/Fonts/RobotoSlab-Bold.ttf
A Resources/Fonts/RobotoSlab-Light.ttf
A Resources/Fonts/RobotoSlab-Regular.ttf
A Resources/Fonts/RobotoSlab-Thin.ttf
A Resources/Fonts/ThisFontIsAbdFont.ttf
A Resources/Images/DistanceFieldX.png
A Resources/Images/Ohm.png
M Resources/Images/fire.pvr
A Resources/Images/test_1021x1024.png
A Resources/Music/CIRCUS.mp3
M Resources/Particles/BoilingFoam.plist
M Resources/Particles/BurstPipe.plist
M Resources/Particles/ExplodingRing.plist
M Resources/Particles/LavaFlow.plist
M Resources/Particles/Phoenix.plist
M Resources/Particles/SmallSun.plist
M Resources/Particles/SpookyPeas.plist
A Resources/Sounds/sound.ogg
M Resources/TileMaps/orthogonal-desert-obscenely-large.tmx
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/appledoc.xcscheme
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/cocos2d.xcscheme
M cocos2d-osx.xcodeproj/project.pbxproj
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties.lock
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileHashes.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileSnapshots.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/outputFileStates.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/taskArtifacts.bin
A cocos2d-tests-android/.idea/.name
A cocos2d-tests-android/.idea/compiler.xml
A cocos2d-tests-android/.idea/copyright/profiles_settings.xml
A cocos2d-tests-android/.idea/dictionaries/phausler.xml
A cocos2d-tests-android/.idea/encodings.xml
A cocos2d-tests-android/.idea/gradle.xml
A cocos2d-tests-android/.idea/libraries/appcompat_v7_19_0_1.xml
A cocos2d-tests-android/.idea/libraries/support_v4_19_0_1.xml
A cocos2d-tests-android/.idea/misc.xml
A cocos2d-tests-android/.idea/modules.xml
A cocos2d-tests-android/.idea/scopes/scope_settings.xml
A cocos2d-tests-android/.idea/vcs.xml
A cocos2d-tests-android/.idea/workspace.xml
A cocos2d-tests-android/Headless.approj/targets/Headless/Debug.overrides.json
A cocos2d-tests-android/Headless.iml
A cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
A cocos2d-tests-android/Headless/Headless-Headless.iml
A cocos2d-tests-android/Headless/Headless-Info.plist
A cocos2d-tests-android/Headless/Headless-Prefix.pch
A cocos2d-tests-android/Headless/HeadlessActivity.h
A cocos2d-tests-android/Headless/HeadlessActivity.m
A cocos2d-tests-android/Headless/SimpleScene.h
A cocos2d-tests-android/Headless/SimpleScene.m
A cocos2d-tests-android/Headless/build.gradle
A cocos2d-tests-android/Headless/en.lproj/InfoPlist.strings
A cocos2d-tests-android/Headless/java/org/cocos2d/demo/HeadlessActivity.java
A cocos2d-tests-android/Headless/proguard-rules.txt
A cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
A cocos2d-tests-android/Headless/src/main/res/drawable-hdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-mdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xxhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/tests/CCBMFontTest.m
A cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
A cocos2d-tests-android/Headless/tests/CCEffectsTest.m
A cocos2d-tests-android/Headless/tests/CCLabelTTFTest.m
A cocos2d-tests-android/Headless/tests/CCLayoutTest.m
A cocos2d-tests-android/Headless/tests/CCPhysicsTest.m
A cocos2d-tests-android/Headless/tests/CCRendererTest.m
A cocos2d-tests-android/Headless/tests/CCResponderTest.m
A cocos2d-tests-android/Headless/tests/CCSchedulerTest.m
A cocos2d-tests-android/Headless/tests/CCScrollViewTest.m
A cocos2d-tests-android/Headless/tests/CCSliderTest.m
A cocos2d-tests-android/Headless/tests/CCSprite9SliceTest.m
A cocos2d-tests-android/Headless/tests/CCTableViewTest.m
A cocos2d-tests-android/Headless/tests/CCTextFieldTest.m
A cocos2d-tests-android/Headless/tests/CCTextureCacheTest.m
A cocos2d-tests-android/Headless/tests/CCTransitionTest.m
A cocos2d-tests-android/Headless/tests/ColorPickerTest.m
A cocos2d-tests-android/Headless/tests/ColorTest.m
A cocos2d-tests-android/Headless/tests/ObjectALTest.m
A cocos2d-tests-android/Headless/tests/ParallaxTest.m
A cocos2d-tests-android/Headless/tests/ParticleTest.m
A cocos2d-tests-android/Headless/tests/PositioningTest.m
A cocos2d-tests-android/Headless/tests/SpritePerformanceTest.m
A cocos2d-tests-android/Headless/tests/TextureTest.m
A cocos2d-tests-android/Headless/tests/TilemapTest.m
A cocos2d-tests-android/Headless/tests/VertexZTest.m
A cocos2d-tests-android/HeadlessTests/HeadlessTests-Info.plist
A cocos2d-tests-android/HeadlessTests/HeadlessTests.m
A cocos2d-tests-android/HeadlessTests/en.lproj/InfoPlist.strings
A cocos2d-tests-android/build.gradle
A cocos2d-tests-android/gradle.properties
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.jar
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.properties
A cocos2d-tests-android/gradlew
A cocos2d-tests-android/gradlew.bat
A cocos2d-tests-android/local.properties
A cocos2d-tests-android/settings.gradle
M cocos2d-tests-ios.xcodeproj/project.pbxproj
A cocos2d-tests-iosAndroid-Info.plist
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/MainMenu.m
M cocos2d-ui-tests/ios/Resources/Info.plist
M cocos2d-ui-tests/osx/Resources/Info.plist
M cocos2d-ui-tests/osx/main.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCLabelTTFTest.m
M cocos2d-ui-tests/tests/CCResponderTest.m
M cocos2d-ui-tests/tests/CCTextFieldTest.m
M cocos2d-ui-tests/tests/ColorTest.m
M cocos2d-ui-tests/tests/ObjectALTest.m
M cocos2d-ui-tests/tests/ParallaxTest.m
M cocos2d-ui-tests/tests/ParticleTest.m
M cocos2d-ui-tests/tests/PositioningTest.m
M cocos2d-ui-tests/tests/TextureTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCButton.h
M cocos2d-ui/CCButton.m
M cocos2d-ui/CCControl.m
M cocos2d-ui/CCControlSubclass.h
M cocos2d-ui/CCScrollView.h
M cocos2d-ui/CCScrollView.m
M cocos2d-ui/CCSlider.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/CCTextField.m
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.h
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m
A cocos2d-ui/Platform/Android/java/CCEditText.h
A cocos2d-ui/Platform/Android/java/CCEditText.m
A cocos2d-ui/Platform/Android/java/org/cocos2d/CCEditText.java
A cocos2d-ui/Platform/CCPlatformTextField.h
A cocos2d-ui/Platform/CCPlatformTextField.m
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.h
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.m
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.h
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.m
M cocos2d/CCActionCatmullRom.m
M cocos2d/CCActionInstant.m
M cocos2d/CCAnimation.h
M cocos2d/CCCache.h
M cocos2d/CCCache.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.h
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
A cocos2d/CCEffectDropShadow.h
A cocos2d/CCEffectDropShadow.m
M cocos2d/CCEffectNode.h
A cocos2d/CCEffectOuterGlow.h
A cocos2d/CCEffectOuterGlow.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCLabelTTF.h
M cocos2d/CCLabelTTF.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.h
M cocos2d/CCNodeColor.m
M cocos2d/CCParticleSystemBase.m
M cocos2d/CCProgressNode.m
M cocos2d/CCProtocols.h
A cocos2d/CCRenderDispatch.h
A cocos2d/CCRenderDispatch.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCResponder.h
M cocos2d/CCResponder.m
M cocos2d/CCResponderManager.h
M cocos2d/CCResponderManager.m
M cocos2d/CCScheduler.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.h
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTexture_Private.h
M cocos2d/CCTiledMapLayer.h
M cocos2d/CCTiledMapLayer.m
A cocos2d/CCTouch.h
A cocos2d/CCTouch.m
A cocos2d/CCTouchEvent.h
A cocos2d/CCTouchEvent.m
M cocos2d/CCTransition.m
A cocos2d/Platforms/Android/CCActivity.h
A cocos2d/Platforms/Android/CCActivity.m
A cocos2d/Platforms/Android/CCDirectorAndroid.h
A cocos2d/Platforms/Android/CCDirectorAndroid.m
A cocos2d/Platforms/Android/CCGLView.h
A cocos2d/Platforms/Android/CCGLView.m
A cocos2d/Platforms/Android/CCGestureListener.h
A cocos2d/Platforms/Android/CCGestureListener.m
A cocos2d/Platforms/Android/CCMathTypesAndroid.h
A cocos2d/Platforms/Android/CCMathUtilsAndroid.h
A cocos2d/Platforms/Android/CCMatrix3.h
A cocos2d/Platforms/Android/CCMatrix3.m
A cocos2d/Platforms/Android/CCMatrix4.h
A cocos2d/Platforms/Android/CCMatrix4.m
A cocos2d/Platforms/Android/CCQuaternion.h
A cocos2d/Platforms/Android/CCQuaternion.m
A cocos2d/Platforms/Android/CCTouchAndroid.h
A cocos2d/Platforms/Android/CCTouchAndroid.m
A cocos2d/Platforms/Android/CCVector2.h
A cocos2d/Platforms/Android/CCVector3.h
A cocos2d/Platforms/Android/CCVector4.h
A cocos2d/Platforms/Android/java/org/cocos2d/CCActivity.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGLView.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGestureListener.java
A cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/CCNS.h
A cocos2d/Platforms/CCRenderDispatch_Private.h
M cocos2d/Platforms/Mac/CCDirectorMac.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/Mac/CCWindow.h
M cocos2d/Platforms/Mac/CCWindow.m
M cocos2d/Platforms/Mac/NSEvent+CC.h
M cocos2d/Platforms/Mac/NSEvent+CC.m
M cocos2d/Platforms/iOS/CCAppDelegate.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.h
M cocos2d/Platforms/iOS/CCDirectorIOS.m
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCES2Renderer.m
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
A cocos2d/Platforms/iOS/CCMetalSupport.m
A cocos2d/Platforms/iOS/CCMetalSupport_Private.h
A cocos2d/Platforms/iOS/CCMetalView.h
A cocos2d/Platforms/iOS/CCMetalView.m
A cocos2d/Platforms/iOS/CCShaders.metal
A cocos2d/Platforms/iOS/CCTouchIOS.h
A cocos2d/Platforms/iOS/CCTouchIOS.m
M cocos2d/Platforms/iOS/UITouch+CC.h
M cocos2d/Platforms/iOS/UITouch+CC.m
M cocos2d/Support/CCColor.h
M cocos2d/Support/CCColor.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
M cocos2d/Support/CGPointExtension.h
M cocos2d/Support/CGPointExtension.m
M cocos2d/Support/NSAttributedString+CCAdditions.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/ccConfig.h
M cocos2d/ccMacros.h
M cocos2d/ccTypes.h
M cocos2d/cocos2d.h
M external/ObjectAL/Actions/OALActionManager.m
M external/ObjectAL/AudioTrack/OALAudioTrack.h
M external/ObjectAL/AudioTrack/OALAudioTrack.m
M external/ObjectAL/AudioTrack/OALAudioTracks.h
M external/ObjectAL/AudioTrack/OALAudioTracks.m
M external/ObjectAL/OALSimpleAudio.h
M external/ObjectAL/OALSimpleAudio.m
A external/ObjectAL/Support/ALWeakArray.h
A external/ObjectAL/Support/ALWeakArray.m
Log Message:
-----------
Merge branch 'develop' into colorChannelSeparation
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-ui-tests/tests/CCEffectsTest.m
Commit: 0794447d9ec2b22b603d9d9c0de3b3834bc12af2
https://github.com/cocos2d/cocos2d-swift/commit/0794447d9ec2b22b603d9d9c0de3b3834bc12af2
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
Log Message:
-----------
CCEffects - Add CCEffectColorChannelOffset
This was removed while resolving a merge conflict.
Commit: e0cdec386f6c06384dd8fee203efe4dfa573f3da
https://github.com/cocos2d/cocos2d-swift/commit/e0cdec386f6c06384dd8fee203efe4dfa573f3da
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M .gitmodules
A CCRendererGLSupport.m
R Resources/Fonts/Abduction.ttf
A Resources/Fonts/RobotoSlab-Bold.ttf
A Resources/Fonts/RobotoSlab-Light.ttf
A Resources/Fonts/RobotoSlab-Regular.ttf
A Resources/Fonts/RobotoSlab-Thin.ttf
A Resources/Fonts/ThisFontIsAbdFont.ttf
A Resources/Images/DistanceFieldX.png
A Resources/Images/Ohm.png
M Resources/Images/fire.pvr
A Resources/Images/test_1021x1024.png
A Resources/Music/CIRCUS.mp3
M Resources/Particles/BoilingFoam.plist
M Resources/Particles/BurstPipe.plist
M Resources/Particles/ExplodingRing.plist
M Resources/Particles/LavaFlow.plist
M Resources/Particles/Phoenix.plist
M Resources/Particles/SmallSun.plist
M Resources/Particles/SpookyPeas.plist
A Resources/Sounds/sound.ogg
M Resources/TileMaps/orthogonal-desert-obscenely-large.tmx
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/appledoc.xcscheme
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/cocos2d.xcscheme
M cocos2d-osx.xcodeproj/project.pbxproj
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties.lock
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileHashes.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileSnapshots.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/outputFileStates.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/taskArtifacts.bin
A cocos2d-tests-android/.idea/.name
A cocos2d-tests-android/.idea/compiler.xml
A cocos2d-tests-android/.idea/copyright/profiles_settings.xml
A cocos2d-tests-android/.idea/dictionaries/phausler.xml
A cocos2d-tests-android/.idea/encodings.xml
A cocos2d-tests-android/.idea/gradle.xml
A cocos2d-tests-android/.idea/libraries/appcompat_v7_19_0_1.xml
A cocos2d-tests-android/.idea/libraries/support_v4_19_0_1.xml
A cocos2d-tests-android/.idea/misc.xml
A cocos2d-tests-android/.idea/modules.xml
A cocos2d-tests-android/.idea/scopes/scope_settings.xml
A cocos2d-tests-android/.idea/vcs.xml
A cocos2d-tests-android/.idea/workspace.xml
A cocos2d-tests-android/Headless.approj/targets/Headless/Debug.overrides.json
A cocos2d-tests-android/Headless.iml
A cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
A cocos2d-tests-android/Headless/Headless-Headless.iml
A cocos2d-tests-android/Headless/Headless-Info.plist
A cocos2d-tests-android/Headless/Headless-Prefix.pch
A cocos2d-tests-android/Headless/HeadlessActivity.h
A cocos2d-tests-android/Headless/HeadlessActivity.m
A cocos2d-tests-android/Headless/SimpleScene.h
A cocos2d-tests-android/Headless/SimpleScene.m
A cocos2d-tests-android/Headless/build.gradle
A cocos2d-tests-android/Headless/en.lproj/InfoPlist.strings
A cocos2d-tests-android/Headless/java/org/cocos2d/demo/HeadlessActivity.java
A cocos2d-tests-android/Headless/proguard-rules.txt
A cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
A cocos2d-tests-android/Headless/src/main/res/drawable-hdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-mdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xxhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/tests/CCBMFontTest.m
A cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
A cocos2d-tests-android/Headless/tests/CCEffectsTest.m
A cocos2d-tests-android/Headless/tests/CCLabelTTFTest.m
A cocos2d-tests-android/Headless/tests/CCLayoutTest.m
A cocos2d-tests-android/Headless/tests/CCPhysicsTest.m
A cocos2d-tests-android/Headless/tests/CCRendererTest.m
A cocos2d-tests-android/Headless/tests/CCResponderTest.m
A cocos2d-tests-android/Headless/tests/CCSchedulerTest.m
A cocos2d-tests-android/Headless/tests/CCScrollViewTest.m
A cocos2d-tests-android/Headless/tests/CCSliderTest.m
A cocos2d-tests-android/Headless/tests/CCSprite9SliceTest.m
A cocos2d-tests-android/Headless/tests/CCTableViewTest.m
A cocos2d-tests-android/Headless/tests/CCTextFieldTest.m
A cocos2d-tests-android/Headless/tests/CCTextureCacheTest.m
A cocos2d-tests-android/Headless/tests/CCTransitionTest.m
A cocos2d-tests-android/Headless/tests/ColorPickerTest.m
A cocos2d-tests-android/Headless/tests/ColorTest.m
A cocos2d-tests-android/Headless/tests/ObjectALTest.m
A cocos2d-tests-android/Headless/tests/ParallaxTest.m
A cocos2d-tests-android/Headless/tests/ParticleTest.m
A cocos2d-tests-android/Headless/tests/PositioningTest.m
A cocos2d-tests-android/Headless/tests/SpritePerformanceTest.m
A cocos2d-tests-android/Headless/tests/TextureTest.m
A cocos2d-tests-android/Headless/tests/TilemapTest.m
A cocos2d-tests-android/Headless/tests/VertexZTest.m
A cocos2d-tests-android/HeadlessTests/HeadlessTests-Info.plist
A cocos2d-tests-android/HeadlessTests/HeadlessTests.m
A cocos2d-tests-android/HeadlessTests/en.lproj/InfoPlist.strings
A cocos2d-tests-android/build.gradle
A cocos2d-tests-android/gradle.properties
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.jar
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.properties
A cocos2d-tests-android/gradlew
A cocos2d-tests-android/gradlew.bat
A cocos2d-tests-android/local.properties
A cocos2d-tests-android/settings.gradle
M cocos2d-tests-ios.xcodeproj/project.pbxproj
A cocos2d-tests-iosAndroid-Info.plist
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/MainMenu.m
M cocos2d-ui-tests/ios/Resources/Info.plist
M cocos2d-ui-tests/osx/Resources/Info.plist
M cocos2d-ui-tests/osx/main.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCLabelTTFTest.m
M cocos2d-ui-tests/tests/CCResponderTest.m
M cocos2d-ui-tests/tests/CCTextFieldTest.m
M cocos2d-ui-tests/tests/ColorTest.m
M cocos2d-ui-tests/tests/ObjectALTest.m
M cocos2d-ui-tests/tests/ParallaxTest.m
M cocos2d-ui-tests/tests/ParticleTest.m
M cocos2d-ui-tests/tests/PositioningTest.m
M cocos2d-ui-tests/tests/TextureTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCButton.h
M cocos2d-ui/CCButton.m
M cocos2d-ui/CCControl.m
M cocos2d-ui/CCControlSubclass.h
M cocos2d-ui/CCScrollView.h
M cocos2d-ui/CCScrollView.m
M cocos2d-ui/CCSlider.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/CCTextField.m
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.h
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m
A cocos2d-ui/Platform/Android/java/CCEditText.h
A cocos2d-ui/Platform/Android/java/CCEditText.m
A cocos2d-ui/Platform/Android/java/org/cocos2d/CCEditText.java
A cocos2d-ui/Platform/CCPlatformTextField.h
A cocos2d-ui/Platform/CCPlatformTextField.m
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.h
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.m
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.h
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.m
M cocos2d/CCActionCatmullRom.m
M cocos2d/CCActionInstant.m
M cocos2d/CCAnimation.h
M cocos2d/CCCache.h
M cocos2d/CCCache.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.h
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
A cocos2d/CCEffectDropShadow.h
A cocos2d/CCEffectDropShadow.m
M cocos2d/CCEffectNode.h
A cocos2d/CCEffectOuterGlow.h
A cocos2d/CCEffectOuterGlow.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCLabelTTF.h
M cocos2d/CCLabelTTF.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.h
M cocos2d/CCNodeColor.m
M cocos2d/CCParticleSystemBase.m
M cocos2d/CCProgressNode.m
M cocos2d/CCProtocols.h
A cocos2d/CCRenderDispatch.h
A cocos2d/CCRenderDispatch.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCResponder.h
M cocos2d/CCResponder.m
M cocos2d/CCResponderManager.h
M cocos2d/CCResponderManager.m
M cocos2d/CCScheduler.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.h
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTexture_Private.h
M cocos2d/CCTiledMapLayer.h
M cocos2d/CCTiledMapLayer.m
A cocos2d/CCTouch.h
A cocos2d/CCTouch.m
A cocos2d/CCTouchEvent.h
A cocos2d/CCTouchEvent.m
M cocos2d/CCTransition.m
A cocos2d/Platforms/Android/CCActivity.h
A cocos2d/Platforms/Android/CCActivity.m
A cocos2d/Platforms/Android/CCDirectorAndroid.h
A cocos2d/Platforms/Android/CCDirectorAndroid.m
A cocos2d/Platforms/Android/CCGLView.h
A cocos2d/Platforms/Android/CCGLView.m
A cocos2d/Platforms/Android/CCGestureListener.h
A cocos2d/Platforms/Android/CCGestureListener.m
A cocos2d/Platforms/Android/CCMathTypesAndroid.h
A cocos2d/Platforms/Android/CCMathUtilsAndroid.h
A cocos2d/Platforms/Android/CCMatrix3.h
A cocos2d/Platforms/Android/CCMatrix3.m
A cocos2d/Platforms/Android/CCMatrix4.h
A cocos2d/Platforms/Android/CCMatrix4.m
A cocos2d/Platforms/Android/CCQuaternion.h
A cocos2d/Platforms/Android/CCQuaternion.m
A cocos2d/Platforms/Android/CCTouchAndroid.h
A cocos2d/Platforms/Android/CCTouchAndroid.m
A cocos2d/Platforms/Android/CCVector2.h
A cocos2d/Platforms/Android/CCVector3.h
A cocos2d/Platforms/Android/CCVector4.h
A cocos2d/Platforms/Android/java/org/cocos2d/CCActivity.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGLView.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGestureListener.java
A cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/CCNS.h
A cocos2d/Platforms/CCRenderDispatch_Private.h
M cocos2d/Platforms/Mac/CCDirectorMac.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/Mac/CCWindow.h
M cocos2d/Platforms/Mac/CCWindow.m
M cocos2d/Platforms/Mac/NSEvent+CC.h
M cocos2d/Platforms/Mac/NSEvent+CC.m
M cocos2d/Platforms/iOS/CCAppDelegate.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.h
M cocos2d/Platforms/iOS/CCDirectorIOS.m
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCES2Renderer.m
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
A cocos2d/Platforms/iOS/CCMetalSupport.m
A cocos2d/Platforms/iOS/CCMetalSupport_Private.h
A cocos2d/Platforms/iOS/CCMetalView.h
A cocos2d/Platforms/iOS/CCMetalView.m
A cocos2d/Platforms/iOS/CCShaders.metal
A cocos2d/Platforms/iOS/CCTouchIOS.h
A cocos2d/Platforms/iOS/CCTouchIOS.m
M cocos2d/Platforms/iOS/UITouch+CC.h
M cocos2d/Platforms/iOS/UITouch+CC.m
M cocos2d/Support/CCColor.h
M cocos2d/Support/CCColor.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
M cocos2d/Support/CGPointExtension.h
M cocos2d/Support/CGPointExtension.m
M cocos2d/Support/NSAttributedString+CCAdditions.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/ccConfig.h
M cocos2d/ccMacros.h
M cocos2d/ccTypes.h
M cocos2d/cocos2d.h
M external/ObjectAL/Actions/OALActionManager.m
M external/ObjectAL/AudioTrack/OALAudioTrack.h
M external/ObjectAL/AudioTrack/OALAudioTrack.m
Log Message:
-----------
Merge branch 'develop' into effectPadding
Conflicts:
cocos2d-ui-tests/tests/CCEffectsTest.m
Commit: a6f7bf94333fc3ac05c0c81243365ed04acc399d
https://github.com/cocos2d/cocos2d-swift/commit/a6f7bf94333fc3ac05c0c81243365ed04acc399d
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectsColorChannelOffset - Add support for effect padding
Commit: f7395f571702f490ade73d005d09417b2603fb7d
https://github.com/cocos2d/cocos2d-swift/commit/f7395f571702f490ade73d005d09417b2603fb7d
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCEffect.m
Log Message:
-----------
CCEffects - Don't apply name mangling to the texture coordinate center and extent uniforms
They're CCEffect built-ins (not effect implementation specific) so they are shared between stacked
effects and should not be mangled.
Commit: 7e1c72a20b1918f4b359baed72c306ceb4abf489
https://github.com/cocos2d/cocos2d-swift/commit/7e1c72a20b1918f4b359baed72c306ceb4abf489
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCEffectStack.m
Log Message:
-----------
CCEffectStack - Update the padding of an effect stack from its contained effects
If the padding of any contained effects is greater than the padding set directly on the
stack, use the contained effects value.
Commit: 2677e6e66b4dfe104187d041a8a21cf33a785917
https://github.com/cocos2d/cocos2d-swift/commit/2677e6e66b4dfe104187d041a8a21cf33a785917
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCEffectRenderer.m
Log Message:
-----------
CCEffectRenderer - Fix texture coordinates for intermediate render passes from sprite sheets
We had been using the sprite's original texture coordinates for all render passes which will not
work with sprite sheets. When reading from an intermediate render target we need the texture
coordinates to be lower left (0,0) and upper right (1,1) and this is not going to be the case when
a sprite draws its image from a sprite sheet.
Fix this problem by overwriting the sprite texture coordinates with the required values when reading
from a sprite sheet.
Commit: 8d84523eb61e95b1ff0459cb64909a3f90297ddd
https://github.com/cocos2d/cocos2d-swift/commit/8d84523eb61e95b1ff0459cb64909a3f90297ddd
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Add labels to the sprites in the padding test
Commit: b534ffc82106f3ce98c24ea8643a019d5db383d9
https://github.com/cocos2d/cocos2d-swift/commit/b534ffc82106f3ce98c24ea8643a019d5db383d9
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d-osx.xcodeproj/project.pbxproj
Log Message:
-----------
CCEffects - Add color channel offset, drop shadow, and outer glow to the OSX Xcode project
Commit: f77af86d967b99c8f4313304fbc60ef6492d1bcb
https://github.com/cocos2d/cocos2d-swift/commit/f77af86d967b99c8f4313304fbc60ef6492d1bcb
Author: John Twigg <john....@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCLabelTTF.m
Log Message:
-----------
Approved by @sergey . Hotfix for Label TTF outlines.
Commit: 3a2e6d23938e502b1f49e595a51f4e35900a102f
https://github.com/cocos2d/cocos2d-swift/commit/3a2e6d23938e502b1f49e595a51f4e35900a102f
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCLabelTTF.m
Log Message:
-----------
Merge pull request #959 from jtwigg/v3.2
Hot fix for TTF outlines.
Commit: 1fbebec12907237a6aeda7af8cb14325e15054e2
https://github.com/cocos2d/cocos2d-swift/commit/1fbebec12907237a6aeda7af8cb14325e15054e2
Author: Viktor <viktor...@gmail.com>
Date: 2014-09-04 (Thu, 04 Sep 2014)
Changed paths:
M VERSION
M cocos2d/cocos2d.h
Log Message:
-----------
Updates version to 3.2.1
Commit: 0bda1e734869b762cdd1765c0f114b4ffc577af3
https://github.com/cocos2d/cocos2d-swift/commit/0bda1e734869b762cdd1765c0f114b4ffc577af3
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-04 (Thu, 04 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Switch test image and effect for padding test
I don't want to introduce yet another test image.
Commit: d8ba36eeda5424b270a8a4c54c80d7d472c5e0ae
https://github.com/cocos2d/cocos2d-swift/commit/d8ba36eeda5424b270a8a4c54c80d7d472c5e0ae
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-04 (Thu, 04 Sep 2014)
Changed paths:
M cocos2d/CCEffectHue.m
Log Message:
-----------
CCEffectHue - Remove non-color matrix version of the hue transform
Commit: 7eee45402dc127ecd878e546e68acaf00d1436d3
https://github.com/cocos2d/cocos2d-swift/commit/7eee45402dc127ecd878e546e68acaf00d1436d3
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffect.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffect_Private.h
Log Message:
-----------
CCEffects - Improve padding support
Effects can now inform the effect renderer how they are using the different texture coordinate sets
so the renderer can correctly decide how to transform the texture coordinates when padding is
requested.
Commit: abdb92c824712a2385abaf6cec061c7b8788a374
https://github.com/cocos2d/cocos2d-swift/commit/abdb92c824712a2385abaf6cec061c7b8788a374
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffectBloom.m
Log Message:
-----------
CCEffectBloom - Add support for padding to the bloom effect
Commit: 2b777fd7c2f85cd0b1cf91f26f419c02cc16fd6b
https://github.com/cocos2d/cocos2d-swift/commit/2b777fd7c2f85cd0b1cf91f26f419c02cc16fd6b
Author: ksjogo <jo...@kronberger-spiele.de>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
Log Message:
-----------
fixing CCRenderTexture -clearStencil
Commit: 560ac9c45888b3fca20d15705b0ff7813ab95f0b
https://github.com/cocos2d/cocos2d-swift/commit/560ac9c45888b3fca20d15705b0ff7813ab95f0b
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffect.m
M cocos2d/CCEffectBrightness.m
M cocos2d/CCEffectContrast.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffect_Private.h
Log Message:
-----------
CCEffects - Adapt the default input snippets to effect padding
When effects that do not require padding are stacked with effects that do, their
input snippets need to handle the possibility that they will fetch out of bounds texels.
Commit: 27c0a68a960ab808f58d237d0863774ef5edc1e6
https://github.com/cocos2d/cocos2d-swift/commit/27c0a68a960ab808f58d237d0863774ef5edc1e6
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectColorChannelOffset - Fix effect function name
Commit: ddbf9064dd2ef7f59e71bf09f7dfb33b56a39104
https://github.com/cocos2d/cocos2d-swift/commit/ddbf9064dd2ef7f59e71bf09f7dfb33b56a39104
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffectBlur.m
Log Message:
-----------
CCEffectBlur - Adapt blur to the recent effect renderer changes
Commit: 43772d215a6aa853a3dc567b687a9dd86a8fb0b9
https://github.com/cocos2d/cocos2d-swift/commit/43772d215a6aa853a3dc567b687a9dd86a8fb0b9
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Add more test cases to the padding test, add padding to the bloom test
Commit: a71a439e552b499a70ebdcf19843168425dcc1aa
https://github.com/cocos2d/cocos2d-swift/commit/a71a439e552b499a70ebdcf19843168425dcc1aa
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
Log Message:
-----------
Merge pull request #972 from ksjogo/969
fixing CCRenderTexture -clearStencil
Commit: f6dbb410804371f53df59e1a8e700c7d00597823
https://github.com/cocos2d/cocos2d-swift/commit/f6dbb410804371f53df59e1a8e700c7d00597823
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCBReader/CCBReader_Private.h
M cocos2d/CCPhysicsBody.m
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 066ded1b19513d325581129350e989a22dce7b52
https://github.com/cocos2d/cocos2d-swift/commit/066ded1b19513d325581129350e989a22dce7b52
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d/CCRenderTexture.m
Log Message:
-----------
Fix merge damage affecting android build
Commit: 4f891c86cbf986020264fb463c6de91fc3aeed44
https://github.com/cocos2d/cocos2d-swift/commit/4f891c86cbf986020264fb463c6de91fc3aeed44
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
R external/ObjectAL/Actions/OALAction+Private.h
R external/ObjectAL/Actions/OALAction.h
R external/ObjectAL/Actions/OALAction.m
R external/ObjectAL/Actions/OALActionManager.h
R external/ObjectAL/Actions/OALActionManager.m
R external/ObjectAL/Actions/OALAudioActions.h
R external/ObjectAL/Actions/OALAudioActions.m
R external/ObjectAL/Actions/OALUtilityActions.h
R external/ObjectAL/Actions/OALUtilityActions.m
R external/ObjectAL/AudioTrack/OALAudioTrack.h
R external/ObjectAL/AudioTrack/OALAudioTrack.m
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.h
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.m
R external/ObjectAL/AudioTrack/OALAudioTracks.h
R external/ObjectAL/AudioTrack/OALAudioTracks.m
R external/ObjectAL/OALSimpleAudio.h
R external/ObjectAL/OALSimpleAudio.m
R external/ObjectAL/ObjectAL.h
R external/ObjectAL/ObjectALConfig.h
R external/ObjectAL/OpenAL/ALBuffer.h
R external/ObjectAL/OpenAL/ALBuffer.m
R external/ObjectAL/OpenAL/ALCaptureDevice.h
R external/ObjectAL/OpenAL/ALCaptureDevice.m
R external/ObjectAL/OpenAL/ALChannelSource.h
R external/ObjectAL/OpenAL/ALChannelSource.m
R external/ObjectAL/OpenAL/ALContext.h
R external/ObjectAL/OpenAL/ALContext.m
R external/ObjectAL/OpenAL/ALDevice.h
R external/ObjectAL/OpenAL/ALDevice.m
R external/ObjectAL/OpenAL/ALListener.h
R external/ObjectAL/OpenAL/ALListener.m
R external/ObjectAL/OpenAL/ALSoundSource.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.m
R external/ObjectAL/OpenAL/ALSource.h
R external/ObjectAL/OpenAL/ALSource.m
R external/ObjectAL/OpenAL/ALTypes.h
R external/ObjectAL/OpenAL/ALWrapper.h
R external/ObjectAL/OpenAL/ALWrapper.m
R external/ObjectAL/OpenAL/OpenALManager.h
R external/ObjectAL/OpenAL/OpenALManager.m
R external/ObjectAL/Session/OALAudioSession.h
R external/ObjectAL/Session/OALAudioSession.m
R external/ObjectAL/Session/OALSuspendHandler.h
R external/ObjectAL/Session/OALSuspendHandler.m
R external/ObjectAL/Support/ALWeakArray.h
R external/ObjectAL/Support/ALWeakArray.m
R external/ObjectAL/Support/ALWeakDictionary.h
R external/ObjectAL/Support/ALWeakDictionary.m
R external/ObjectAL/Support/ALWeakElement.h
R external/ObjectAL/Support/ALWeakElement.m
R external/ObjectAL/Support/ARCSafe_MemMgmt.h
R external/ObjectAL/Support/IOSVersion.h
R external/ObjectAL/Support/IOSVersion.m
R external/ObjectAL/Support/OALAudioFile.h
R external/ObjectAL/Support/OALAudioFile.m
R external/ObjectAL/Support/OALNotifications.h
R external/ObjectAL/Support/OALTools.h
R external/ObjectAL/Support/OALTools.m
R external/ObjectAL/Support/ObjectALMacros.h
R external/ObjectAL/Support/SynthesizeSingleton.h
R external/ObjectAL/Support/mach_timing.c
R external/ObjectAL/Support/mach_timing.h
Log Message:
-----------
Remove ObjectAL, will become a submodule
Commit: 8ce94bc842e17ee57adf0f2679875c5a047e6856
https://github.com/cocos2d/cocos2d-swift/commit/8ce94bc842e17ee57adf0f2679875c5a047e6856
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
M .gitmodules
A external/ObjectAL
Log Message:
-----------
Add ObjectAL as a submodule
Commit: 7d1c580f86bdb8e5b042ea1232b35dafaccfa1bf
https://github.com/cocos2d/cocos2d-swift/commit/7d1c580f86bdb8e5b042ea1232b35dafaccfa1bf
Author: Viktor Lidholt <viktor...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M .gitmodules
Log Message:
-----------
Updates submodules to https
Commit: 516ef6d20bd32df40869afad0f6de964f44fd50f
https://github.com/cocos2d/cocos2d-swift/commit/516ef6d20bd32df40869afad0f6de964f44fd50f
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.m
M cocos2d/cocos2d.h
Log Message:
-----------
Added inner glow (using distance fields). Fixed minor bugs with outline effect. Cleaned up comments.
Commit: d46d8ee95bd00434cc578a387fb6bd1fcd4ac02c
https://github.com/cocos2d/cocos2d-swift/commit/d46d8ee95bd00434cc578a387fb6bd1fcd4ac02c
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M .gitmodules
R external/ogg
R external/tremor
Log Message:
-----------
Ogg and Tremor moved into ObjectAL
Commit: 9d3092b350698bc52c9927522f111eaaba199929
https://github.com/cocos2d/cocos2d-swift/commit/9d3092b350698bc52c9927522f111eaaba199929
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M .gitmodules
M external/ObjectAL
Log Message:
-----------
ObjectAL submodule updated for Android
Commit: a2daa58ea4213ec97a83069e9f602c2a57a7155f
https://github.com/cocos2d/cocos2d-swift/commit/a2daa58ea4213ec97a83069e9f602c2a57a7155f
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
Log Message:
-----------
Move ObjectAL into subproject in Xcode
Commit: 9aba7086403282b54a339c58ff2ae0aa1cac07f9
https://github.com/cocos2d/cocos2d-swift/commit/9aba7086403282b54a339c58ff2ae0aa1cac07f9
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M external/ObjectAL
Log Message:
-----------
Fix iOS build
Commit: 6e95c1136fffd04bdc52c8461857e694c9e0773e
https://github.com/cocos2d/cocos2d-swift/commit/6e95c1136fffd04bdc52c8461857e694c9e0773e
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
R external/ObjectAL
Log Message:
-----------
Renaming ObjectAL repo, deleting first
Commit: 079861bed3df8b1d09b98b16a26b36589d4f1f36
https://github.com/cocos2d/cocos2d-swift/commit/079861bed3df8b1d09b98b16a26b36589d4f1f36
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
A external/ObjectAL
Log Message:
-----------
Renaming ObjectAL repo
Commit: 39de916772d2f51422ccfc68c164949515b2161b
https://github.com/cocos2d/cocos2d-swift/commit/39de916772d2f51422ccfc68c164949515b2161b
Author: slembcke <slem...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d-osx.xcodeproj/project.pbxproj
Log Message:
-----------
Mac project fixes
Commit: b53b44e500b8154693a7efc9202a91e20ebb7a5d
https://github.com/cocos2d/cocos2d-swift/commit/b53b44e500b8154693a7efc9202a91e20ebb7a5d
Author: slembcke <slem...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Support/CCFileUtils.h
A external/ObjectAL
R external/ObjectAL/Actions/OALAction+Private.h
R external/ObjectAL/Actions/OALAction.h
R external/ObjectAL/Actions/OALAction.m
R external/ObjectAL/Actions/OALActionManager.h
R external/ObjectAL/Actions/OALActionManager.m
R external/ObjectAL/Actions/OALAudioActions.h
R external/ObjectAL/Actions/OALAudioActions.m
R external/ObjectAL/Actions/OALUtilityActions.h
R external/ObjectAL/Actions/OALUtilityActions.m
R external/ObjectAL/AudioTrack/OALAudioTrack.h
R external/ObjectAL/AudioTrack/OALAudioTrack.m
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.h
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.m
R external/ObjectAL/AudioTrack/OALAudioTracks.h
R external/ObjectAL/AudioTrack/OALAudioTracks.m
R external/ObjectAL/OALSimpleAudio.h
R external/ObjectAL/OALSimpleAudio.m
R external/ObjectAL/ObjectAL.h
R external/ObjectAL/ObjectALConfig.h
R external/ObjectAL/OpenAL/ALBuffer.h
R external/ObjectAL/OpenAL/ALBuffer.m
R external/ObjectAL/OpenAL/ALCaptureDevice.h
R external/ObjectAL/OpenAL/ALCaptureDevice.m
R external/ObjectAL/OpenAL/ALChannelSource.h
R external/ObjectAL/OpenAL/ALChannelSource.m
R external/ObjectAL/OpenAL/ALContext.h
R external/ObjectAL/OpenAL/ALContext.m
R external/ObjectAL/OpenAL/ALDevice.h
R external/ObjectAL/OpenAL/ALDevice.m
R external/ObjectAL/OpenAL/ALListener.h
R external/ObjectAL/OpenAL/ALListener.m
R external/ObjectAL/OpenAL/ALSoundSource.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.m
R external/ObjectAL/OpenAL/ALSource.h
R external/ObjectAL/OpenAL/ALSource.m
R external/ObjectAL/OpenAL/ALTypes.h
R external/ObjectAL/OpenAL/ALWrapper.h
R external/ObjectAL/OpenAL/ALWrapper.m
R external/ObjectAL/OpenAL/OpenALManager.h
R external/ObjectAL/OpenAL/OpenALManager.m
R external/ObjectAL/Session/OALAudioSession.h
R external/ObjectAL/Session/OALAudioSession.m
R external/ObjectAL/Session/OALSuspendHandler.h
R external/ObjectAL/Session/OALSuspendHandler.m
R external/ObjectAL/Support/ALWeakArray.h
R external/ObjectAL/Support/ALWeakArray.m
R external/ObjectAL/Support/ALWeakDictionary.h
R external/ObjectAL/Support/ALWeakDictionary.m
R external/ObjectAL/Support/ALWeakElement.h
R external/ObjectAL/Support/ALWeakElement.m
R external/ObjectAL/Support/ARCSafe_MemMgmt.h
R external/ObjectAL/Support/IOSVersion.h
R external/ObjectAL/Support/IOSVersion.m
R external/ObjectAL/Support/OALAudioFile.h
R external/ObjectAL/Support/OALAudioFile.m
R external/ObjectAL/Support/OALNotifications.h
R external/ObjectAL/Support/OALTools.h
R external/ObjectAL/Support/OALTools.m
R external/ObjectAL/Support/ObjectALMacros.h
R external/ObjectAL/Support/SynthesizeSingleton.h
R external/ObjectAL/Support/mach_timing.c
R external/ObjectAL/Support/mach_timing.h
R external/ogg
R external/tremor
Log Message:
-----------
Merge branch 'develop' of git://github.com/marcsalem/cocos2d-swift into develop
Conflicts:
.gitmodules
cocos2d-ios.xcodeproj/project.pbxproj
Commit: 04802e37815c39a7e967f1634af4c9758bbd8c1b
https://github.com/cocos2d/cocos2d-swift/commit/04802e37815c39a7e967f1634af4c9758bbd8c1b
Author: RobBoluga <r...@boluga.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Fix to make opacity from the parent CCNode cascade to CCNodeColor and CCNodeGradient
Commit: ef651f51f72e3551d2a2a40d434bc239d30753f4
https://github.com/cocos2d/cocos2d-swift/commit/ef651f51f72e3551d2a2a40d434bc239d30753f4
Author: RobBoluga <r...@boluga.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Removed logging from Fix to make opacity from the parent CCNode cascade to CCNodeColor and CCNodeGradient
Commit: f63711125b91eb0960161c533106cc6eb28e8c55
https://github.com/cocos2d/cocos2d-swift/commit/f63711125b91eb0960161c533106cc6eb28e8c55
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNode.h
M cocos2d/CCNode.m
Log Message:
-----------
Merge pull request #958 from AT2014/v3.1
Added alternative reschedule:interval method to CCNode class.
Commit: 398daf201e5188bc288a644e162f44d1a3ab8304
https://github.com/cocos2d/cocos2d-swift/commit/398daf201e5188bc288a644e162f44d1a3ab8304
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
Log Message:
-----------
Merge pull request #962 from programmarchy/patch-1
Fix compiler warning
Commit: 529ac53fc4f7aead4380c8ede8380288912a4298
https://github.com/cocos2d/cocos2d-swift/commit/529ac53fc4f7aead4380c8ede8380288912a4298
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/Support/CCFileUtils.h
Log Message:
-----------
Fix CGFloat error in CCFileUtils.h.
Commit: 6fc7fd7ef08cd2de6ff0aff48266f59ad49e7263
https://github.com/cocos2d/cocos2d-swift/commit/6fc7fd7ef08cd2de6ff0aff48266f59ad49e7263
Author: RobBoluga <r...@boluga.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Removed duplicate method. Already inherited from CCNodeColor.
Commit: 552dcd5e444d54453e9a4bd3b5af0e2b64488338
https://github.com/cocos2d/cocos2d-swift/commit/552dcd5e444d54453e9a4bd3b5af0e2b64488338
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.m
M cocos2d/CCEffectBrightness.m
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
M cocos2d/CCEffectContrast.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffectStack.m
M cocos2d/CCEffect_Private.h
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'develop' of git://github.com/thayerandrews/cocos2d-iphone into 963
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-osx.xcodeproj/project.pbxproj
cocos2d-ui-tests/tests/CCEffectsTest.m
cocos2d/CCEffectBlur.m
external/ObjectAL
Commit: 7094babd0092fa6cd67791e8592869b894197742
https://github.com/cocos2d/cocos2d-swift/commit/7094babd0092fa6cd67791e8592869b894197742
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCEffectBloom.m
Log Message:
-----------
Removing unmatched parenthesis.
Commit: 921e268efbc0b3797917d7fac96252ee6fadd976
https://github.com/cocos2d/cocos2d-swift/commit/921e268efbc0b3797917d7fac96252ee6fadd976
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
Log Message:
-----------
Merge pull request #953 from sarah-j-smith/v3.1
Handle odd line seperators in CCLabelBMFont.
Commit: ab3fe789648c3eb4db5b583865a61c17cd4288a4
https://github.com/cocos2d/cocos2d-swift/commit/ab3fe789648c3eb4db5b583865a61c17cd4288a4
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Merge pull request #946 from sridenour/v3.1
Always stop CCDirector when app is backgrounded
Commit: 5c91c8fe0f3bb43ae36db59b12ab19e5d2defd97
https://github.com/cocos2d/cocos2d-swift/commit/5c91c8fe0f3bb43ae36db59b12ab19e5d2defd97
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.m
M cocos2d/cocos2d.h
Log Message:
-----------
Merge commit '516ef6d' into develop
Conflicts:
.gitmodules
external/ObjectAL
Commit: 5f1270c3efca6d56387432e4c59b45c824856922
https://github.com/cocos2d/cocos2d-swift/commit/5f1270c3efca6d56387432e4c59b45c824856922
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Merge pull request #984 from boluga/CCNodeColor-CascadeOpacity
CcNodeColor cascade opacity
Commit: f7e825878f97ae95bedd5aed834ef7b860207949
https://github.com/cocos2d/cocos2d-swift/commit/f7e825878f97ae95bedd5aed834ef7b860207949
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Log Message:
-----------
Merge branch 'v3.1' into v3.2
Commit: 49b401b8db44458a72f2342ec52626ae20fb1b83
https://github.com/cocos2d/cocos2d-swift/commit/49b401b8db44458a72f2342ec52626ae20fb1b83
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M VERSION
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d/CCRenderTexture.m
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'v3.2' into develop
Conflicts:
VERSION
cocos2d/CCLabelTTF.m
cocos2d/CCRenderer.m
external/ObjectAL
Commit: 426c593180ca5d165a58eca8672af3b1b5ecc499
https://github.com/cocos2d/cocos2d-swift/commit/426c593180ca5d165a58eca8672af3b1b5ecc499
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Merge branch 'v3.1' into v3.2
Commit: c5a9fd79707a1426ec9cf307489bfe91b710e276
https://github.com/cocos2d/cocos2d-swift/commit/c5a9fd79707a1426ec9cf307489bfe91b710e276
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Merge branch 'v3.2' into develop
Conflicts:
external/ObjectAL
Commit: 3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
https://github.com/cocos2d/cocos2d-swift/commit/3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M .gitmodules
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d/CCConfiguration.h
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.m
M cocos2d/CCEffectBrightness.m
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
M cocos2d/CCEffectContrast.m
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffectStack.m
M cocos2d/CCEffect_Private.h
M cocos2d/CCLabelBMFont.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.m
M cocos2d/CCRenderTexture.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/cocos2d.h
A external/ObjectAL
R external/ObjectAL/Actions/OALAction+Private.h
R external/ObjectAL/Actions/OALAction.h
R external/ObjectAL/Actions/OALAction.m
R external/ObjectAL/Actions/OALActionManager.h
R external/ObjectAL/Actions/OALActionManager.m
R external/ObjectAL/Actions/OALAudioActions.h
R external/ObjectAL/Actions/OALAudioActions.m
R external/ObjectAL/Actions/OALUtilityActions.h
R external/ObjectAL/Actions/OALUtilityActions.m
R external/ObjectAL/AudioTrack/OALAudioTrack.h
R external/ObjectAL/AudioTrack/OALAudioTrack.m
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.h
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.m
R external/ObjectAL/AudioTrack/OALAudioTracks.h
R external/ObjectAL/AudioTrack/OALAudioTracks.m
R external/ObjectAL/OALSimpleAudio.h
R external/ObjectAL/OALSimpleAudio.m
R external/ObjectAL/ObjectAL.h
R external/ObjectAL/ObjectALConfig.h
R external/ObjectAL/OpenAL/ALBuffer.h
R external/ObjectAL/OpenAL/ALBuffer.m
R external/ObjectAL/OpenAL/ALCaptureDevice.h
R external/ObjectAL/OpenAL/ALCaptureDevice.m
R external/ObjectAL/OpenAL/ALChannelSource.h
R external/ObjectAL/OpenAL/ALChannelSource.m
R external/ObjectAL/OpenAL/ALContext.h
R external/ObjectAL/OpenAL/ALContext.m
R external/ObjectAL/OpenAL/ALDevice.h
R external/ObjectAL/OpenAL/ALDevice.m
R external/ObjectAL/OpenAL/ALListener.h
R external/ObjectAL/OpenAL/ALListener.m
R external/ObjectAL/OpenAL/ALSoundSource.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.m
R external/ObjectAL/OpenAL/ALSource.h
R external/ObjectAL/OpenAL/ALSource.m
R external/ObjectAL/OpenAL/ALTypes.h
R external/ObjectAL/OpenAL/ALWrapper.h
R external/ObjectAL/OpenAL/ALWrapper.m
R external/ObjectAL/OpenAL/OpenALManager.h
R external/ObjectAL/OpenAL/OpenALManager.m
R external/ObjectAL/Session/OALAudioSession.h
R external/ObjectAL/Session/OALAudioSession.m
R external/ObjectAL/Session/OALSuspendHandler.h
R external/ObjectAL/Session/OALSuspendHandler.m
R external/ObjectAL/Support/ALWeakArray.h
R external/ObjectAL/Support/ALWeakArray.m
R external/ObjectAL/Support/ALWeakDictionary.h
R external/ObjectAL/Support/ALWeakDictionary.m
R external/ObjectAL/Support/ALWeakElement.h
R external/ObjectAL/Support/ALWeakElement.m
R external/ObjectAL/Support/ARCSafe_MemMgmt.h
R external/ObjectAL/Support/IOSVersion.h
R external/ObjectAL/Support/IOSVersion.m
R external/ObjectAL/Support/OALAudioFile.h
R external/ObjectAL/Support/OALAudioFile.m
R external/ObjectAL/Support/OALNotifications.h
R external/ObjectAL/Support/OALTools.h
R external/ObjectAL/Support/OALTools.m
R external/ObjectAL/Support/ObjectALMacros.h
R external/ObjectAL/Support/SynthesizeSingleton.h
R external/ObjectAL/Support/mach_timing.c
R external/ObjectAL/Support/mach_timing.h
R external/ogg
R external/tremor
Log Message:
-----------
Merge branch 'develop' into metal-hacking
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-ui/CCBReader/CCBReader.m
cocos2d/CCRenderTexture.m
cocos2d/cocos2d.h
Commit: c04c5925791a2cb5d0a16f4278a2df2869581079
https://github.com/cocos2d/cocos2d-swift/commit/c04c5925791a2cb5d0a16f4278a2df2869581079
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
Don’t check for GL errors when there is no context set.
Compare: https://github.com/cocos2d/cocos2d-swift/compare/67384fcc6adf...c04c5925791a
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 39b82af5a229b1303a0a0ea4b43836aa75af10ee
https://github.com/cocos2d/cocos2d-swift/commit/39b82af5a229b1303a0a0ea4b43836aa75af10ee
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M cocos2d/CCEffectRenderer.m
Log Message:
-----------
CCEffectRenderer - Fix build warning
GLKMatrix4Invert() takes bool not BOOL as its final argument.
Commit: b1c8eda1a21cfc3aa2497b7d6123ab0b88c3e8c9
https://github.com/cocos2d/cocos2d-swift/commit/b1c8eda1a21cfc3aa2497b7d6123ab0b88c3e8c9
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M README.md
M UnitTests/CCReaderTest.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
R cocos2d-ui-tests/tests/CCEffectPongTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d/cocos2d.h
R install.sh
R installer/build_installer.sh
R installer/install.platypus
R installer/install.sh
R installer/install_icon.png
R templates/CCNode class.xctemplate/CCNode/___FILEBASENAME___.h
R templates/CCNode class.xctemplate/CCNode/___FILEBASENAME___.m
R templates/CCNode class.xctemplate/CCSprite/___FILEBASENAME___.h
R templates/CCNode class.xctemplate/CCSprite/___FILEBASENAME___.m
R templates/CCNode class.xctemplate/TemplateIcon.icns
R templates/CCNode class.xctemplate/TemplateInfo.plist
R templates/Support/Base/base.xctemplate/TemplateInfo.plist
R templates/Support/Base/base_ios.xctemplate/Resources/Defaul...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Default-Landscape~ipad.png
R templates/Support/Base/base_ios.xctemplate/Resources/Default.png
R templates/Support/Base/base_ios.xctemplate/Resources/Def...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-120.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-72.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Ico...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-76.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Ico...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Small-50.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Small.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Spotlight-iOS7.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-Spot...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon-iPad-Sp...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Icon.png
R templates/Support/Base/base_ios.xctemplate/Resources/Icons/Ic...@2x.png
R templates/Support/Base/base_ios.xctemplate/Resources/Info.plist
R templates/Support/Base/base_ios.xctemplate/Resources/angry.png
R templates/Support/Base/base_ios.xctemplate/Resources/iTunesArtwork
R templates/Support/Base/base_ios.xctemplate/Resources/iTunesArtwork@2x
R templates/Support/Base/base_ios.xctemplate/TemplateInfo.plist
R templates/Support/Base/base_osx.xctemplate/Resources/English.lproj/InfoPlist.strings
R templates/Support/Base/base_osx.xctemplate/Resources/English.lproj/MainMenu.xib
R templates/Support/Base/base_osx.xctemplate/Resources/Info.plist
R templates/Support/Base/base_osx.xctemplate/Resources/icon.icns
R templates/Support/Base/base_osx.xctemplate/TemplateInfo.plist
R templates/Support/Bundle/bundle.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_ccbreader.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_chipmunk.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_cocos2d-ui.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_cocos2d.xctemplate/TemplateInfo.plist
R templates/Support/Libraries/lib_objectal.xctemplate/TemplateInfo.plist
R templates/cocos2d OS X.xctemplate/Classes/AppDelegate.h
R templates/cocos2d OS X.xctemplate/Classes/AppDelegate.m
R templates/cocos2d OS X.xctemplate/Classes/HelloWorldLayer.h
R templates/cocos2d OS X.xctemplate/Classes/HelloWorldLayer.m
R templates/cocos2d OS X.xctemplate/Supporting Files/Prefix.pch
R templates/cocos2d OS X.xctemplate/Supporting Files/main.m
R templates/cocos2d OS X.xctemplate/TemplateIcon.icns
R templates/cocos2d OS X.xctemplate/TemplateInfo.plist
R templates/cocos2d iOS Newton.xctemplate/Classes/AppDelegate.h
R templates/cocos2d iOS Newton.xctemplate/Classes/AppDelegate.m
R templates/cocos2d iOS Newton.xctemplate/Classes/HelloWorldScene.h
R templates/cocos2d iOS Newton.xctemplate/Classes/HelloWorldScene.m
R templates/cocos2d iOS Newton.xctemplate/Classes/IntroScene.h
R templates/cocos2d iOS Newton.xctemplate/Classes/IntroScene.m
R templates/cocos2d iOS Newton.xctemplate/Newton/LightBulb.h
R templates/cocos2d iOS Newton.xctemplate/Newton/LightBulb.m
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonConstants.h
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonScene.h
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonScene.m
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonSphere.h
R templates/cocos2d iOS Newton.xctemplate/Newton/NewtonSphere.m
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/fire.off.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/fire.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/left.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.2.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.c.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.d.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.e.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.h.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.highlight.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.l.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.o.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.r.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.s.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.shadow.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/letter.w.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/light.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/reset.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/right.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/Images/rope.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/Newton/newton.tps
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/fire.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/fire.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipad.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipad.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipadhd.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton-ipadhd.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton.plist
R templates/cocos2d iOS Newton.xctemplate/Newton/Resources/newton.png
R templates/cocos2d iOS Newton.xctemplate/Newton/Rope.h
R templates/cocos2d iOS Newton.xctemplate/Newton/Rope.m
R templates/cocos2d iOS Newton.xctemplate/Supporting Files/Prefix.pch
R templates/cocos2d iOS Newton.xctemplate/Supporting Files/main.m
R templates/cocos2d iOS Newton.xctemplate/TemplateIcon.icns
R templates/cocos2d iOS Newton.xctemplate/TemplateInfo.plist
R templates/cocos2d iOS.xctemplate/Classes/AppDelegate.h
R templates/cocos2d iOS.xctemplate/Classes/AppDelegate.m
R templates/cocos2d iOS.xctemplate/Classes/HelloWorldScene.h
R templates/cocos2d iOS.xctemplate/Classes/HelloWorldScene.m
R templates/cocos2d iOS.xctemplate/Classes/IntroScene.h
R templates/cocos2d iOS.xctemplate/Classes/IntroScene.m
R templates/cocos2d iOS.xctemplate/Supporting Files/Prefix.pch
R templates/cocos2d iOS.xctemplate/Supporting Files/main.m
R templates/cocos2d iOS.xctemplate/TemplateIcon.icns
R templates/cocos2d iOS.xctemplate/TemplateInfo.plist
A tools/BuildDistribution.sh
M tools/build_docs.sh
A tools/git-archive-all
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 75077bd51905e83b7fea5ecca714f3f7faeb4bd4
https://github.com/cocos2d/cocos2d-swift/commit/75077bd51905e83b7fea5ecca714f3f7faeb4bd4
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectColorChannelOffset - Initial commit
Commit: 27c3963a84bc0c6e98c6fda16d5186fccf3e01c7
https://github.com/cocos2d/cocos2d-swift/commit/27c3963a84bc0c6e98c6fda16d5186fccf3e01c7
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectColorChannelOffset.h
M cocos2d/CCEffectColorChannelOffset.m
M cocos2d/cocos2d.h
Log Message:
-----------
CCEffectColorChannelOffset - First pass at the implementation
The basics are working though alpha isn't handled yet. This also adds a test to CCEffectsTest.
Commit: 05b9385fac4fd24664be91a03b898599b9e35188
https://github.com/cocos2d/cocos2d-swift/commit/05b9385fac4fd24664be91a03b898599b9e35188
Author: Sean Ridenour <kew...@gmail.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Always stop animating when app is backgrounded
Even if the CCDirector isn't the "visible" view controller, the app will still crash if it gets backgrounded and the CCDirector keeps trying to draw. Make sure CCDirector stops drawing if, say, the GameCenter login screen is showing and the user switches away from the app to look up their password in 1Password or something.
Commit: 975dff55c12b01db9dbd7a4baa21d0e692dafe66
https://github.com/cocos2d/cocos2d-swift/commit/975dff55c12b01db9dbd7a4baa21d0e692dafe66
Author: Sean Ridenour <kew...@gmail.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
More consistent curly braces.
Commit: 86a34fe739450bdaebdf50d0c4d38b369909dcf7
https://github.com/cocos2d/cocos2d-swift/commit/86a34fe739450bdaebdf50d0c4d38b369909dcf7
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectColorChannelOffset - Compute output alpha as the average of the sample alpha values
Commit: 5c1dff3469d41029ac070d535c3151bdce05914a
https://github.com/cocos2d/cocos2d-swift/commit/5c1dff3469d41029ac070d535c3151bdce05914a
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Remove misplaced ' ' character
Commit: 858b6a9f23dea6d905a02b0147aa76e10d7a5cf4
https://github.com/cocos2d/cocos2d-swift/commit/858b6a9f23dea6d905a02b0147aa76e10d7a5cf4
Author: Sarah Smith <s...@storybridge.org>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
Log Message:
-----------
Handle odd line seperators in CCLabelBMFont.
The XCode plist editor and some other editors can create string data
with Unicode line seperators in it, eg: \u2028.
http://en.wikipedia.org/wiki/Newline#Unicode
You can easily enter one using <ctrl>+<enter> in your plist or code
editor. The plist editor will not let you type <enter> as it will just
commit the current cell being edited. To get an actual newline you can
type <option>+<enter>.
Code in CCLabelBMFont correctly tests using NSCharacterSet
newlineCharacterSet in most places, but in two places incorrectly
tests for equality against '\n'.
So strings with one of these "odd" newlines will be rendered with all
the text on one line. Fix this, and make the code consistent.
Commit: c4bc3e040e5aedbc2cca0f3ad1bf2ee070c36866
https://github.com/cocos2d/cocos2d-swift/commit/c4bc3e040e5aedbc2cca0f3ad1bf2ee070c36866
Author: AT2014 <in...@apptyrant.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Changed paths:
M cocos2d/CCNode.m
Log Message:
-----------
Added reschedule:interval method to CCNode.
Added reschedule:interval method to CCNode.m. When you call the reschedule:interval: method using a selector that is already scheduled this method will update the interval. It may be useful to use this method at certain times rather than using the schedule:interval: method (which will unschedule and then reschedule an already scheduled method).
If you call reschedule:interval method and pass in a selector that was never scheduled, this method will schedule the selector for the first time.
Commit: b5c1a11708d9d68e563257d00864608d2f10b709
https://github.com/cocos2d/cocos2d-swift/commit/b5c1a11708d9d68e563257d00864608d2f10b709
Author: AT2014 <in...@apptyrant.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Changed paths:
M cocos2d/CCNode.h
Log Message:
-----------
Added reschedule method to CCNode header
Added reschedule:interval: method to CCNode header file.
Commit: bc53002792f9bf8363f8b7ef20d60abc5f9902f6
https://github.com/cocos2d/cocos2d-swift/commit/bc53002792f9bf8363f8b7ef20d60abc5f9902f6
Author: AT2014 <in...@apptyrant.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Changed paths:
M cocos2d/CCNode.h
Log Message:
-----------
Fixed header comment.
Fixed header comment on reschedule:interval: method.
Commit: 8f4d8c196b2d46d5c8899673e0260dbfb63c68a6
https://github.com/cocos2d/cocos2d-swift/commit/8f4d8c196b2d46d5c8899673e0260dbfb63c68a6
Author: slembcke <slem...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCRenderer.m
Log Message:
-----------
Fixed a bug with render state caching and added unit tests for it.
Commit: 798f3215a05671d68c0db9c3702136a0cd3cbfb8
https://github.com/cocos2d/cocos2d-swift/commit/798f3215a05671d68c0db9c3702136a0cd3cbfb8
Author: Donald Ness <donal...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
Log Message:
-----------
Fix compiler warning
Cast NSUInteger to unsigned long and use %lu format specifier
http://useyourloaf.com/blog/2014/04/13/format-string-issue-using-nsinteger.html
Commit: 314af8a1428649b37d2eb4b34601ddc62d75f144
https://github.com/cocos2d/cocos2d-swift/commit/314af8a1428649b37d2eb4b34601ddc62d75f144
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffect_Private.h
Log Message:
-----------
CCEffect - Add support for effect padding
Fix clipping of effects that expand the visual footprint of the node they're applied to (blur for example).
The user can now specify horizontal and vertical padding that increases the size of the rendered
geometry but adjusts the texture coordinates such that the sprite image stays the same size. By
adding this padding, effects like blur no longer get clipped off by the edge of the sprite geometry.
Unfortunately, for sprites from sprite sheets, individual effects must also be modified to avoid
fetching outside the sprite's footprint within the sheet. Because GLES does not support the
clamp-to-border wrap mode, this must be handled within the shaders.
Commit: 65601a8355ad1f69fa83b689c68109742f6c6844
https://github.com/cocos2d/cocos2d-swift/commit/65601a8355ad1f69fa83b689c68109742f6c6844
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectBlur.m
Log Message:
-----------
CCEffectBlur - Add padding support to CCEffectBlur and add a test for it
Commit: e40c1e35241f7ec27d23f1a29abc9728b3e559ea
https://github.com/cocos2d/cocos2d-swift/commit/e40c1e35241f7ec27d23f1a29abc9728b3e559ea
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M .gitmodules
A CCRendererGLSupport.m
R Resources/Fonts/Abduction.ttf
A Resources/Fonts/RobotoSlab-Bold.ttf
A Resources/Fonts/RobotoSlab-Light.ttf
A Resources/Fonts/RobotoSlab-Regular.ttf
A Resources/Fonts/RobotoSlab-Thin.ttf
A Resources/Fonts/ThisFontIsAbdFont.ttf
A Resources/Images/DistanceFieldX.png
A Resources/Images/Ohm.png
M Resources/Images/fire.pvr
A Resources/Images/test_1021x1024.png
A Resources/Music/CIRCUS.mp3
M Resources/Particles/BoilingFoam.plist
M Resources/Particles/BurstPipe.plist
M Resources/Particles/ExplodingRing.plist
M Resources/Particles/LavaFlow.plist
M Resources/Particles/Phoenix.plist
M Resources/Particles/SmallSun.plist
M Resources/Particles/SpookyPeas.plist
A Resources/Sounds/sound.ogg
M Resources/TileMaps/orthogonal-desert-obscenely-large.tmx
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/appledoc.xcscheme
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/cocos2d.xcscheme
M cocos2d-osx.xcodeproj/project.pbxproj
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties.lock
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileHashes.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileSnapshots.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/outputFileStates.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/taskArtifacts.bin
A cocos2d-tests-android/.idea/.name
A cocos2d-tests-android/.idea/compiler.xml
A cocos2d-tests-android/.idea/copyright/profiles_settings.xml
A cocos2d-tests-android/.idea/dictionaries/phausler.xml
A cocos2d-tests-android/.idea/encodings.xml
A cocos2d-tests-android/.idea/gradle.xml
A cocos2d-tests-android/.idea/libraries/appcompat_v7_19_0_1.xml
A cocos2d-tests-android/.idea/libraries/support_v4_19_0_1.xml
A cocos2d-tests-android/.idea/misc.xml
A cocos2d-tests-android/.idea/modules.xml
A cocos2d-tests-android/.idea/scopes/scope_settings.xml
A cocos2d-tests-android/.idea/vcs.xml
A cocos2d-tests-android/.idea/workspace.xml
A cocos2d-tests-android/Headless.approj/targets/Headless/Debug.overrides.json
A cocos2d-tests-android/Headless.iml
A cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
A cocos2d-tests-android/Headless/Headless-Headless.iml
A cocos2d-tests-android/Headless/Headless-Info.plist
A cocos2d-tests-android/Headless/Headless-Prefix.pch
A cocos2d-tests-android/Headless/HeadlessActivity.h
A cocos2d-tests-android/Headless/HeadlessActivity.m
A cocos2d-tests-android/Headless/SimpleScene.h
A cocos2d-tests-android/Headless/SimpleScene.m
A cocos2d-tests-android/Headless/build.gradle
A cocos2d-tests-android/Headless/en.lproj/InfoPlist.strings
A cocos2d-tests-android/Headless/java/org/cocos2d/demo/HeadlessActivity.java
A cocos2d-tests-android/Headless/proguard-rules.txt
A cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
A cocos2d-tests-android/Headless/src/main/res/drawable-hdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-mdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xxhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/tests/CCBMFontTest.m
A cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
A cocos2d-tests-android/Headless/tests/CCEffectsTest.m
A cocos2d-tests-android/Headless/tests/CCLabelTTFTest.m
A cocos2d-tests-android/Headless/tests/CCLayoutTest.m
A cocos2d-tests-android/Headless/tests/CCPhysicsTest.m
A cocos2d-tests-android/Headless/tests/CCRendererTest.m
A cocos2d-tests-android/Headless/tests/CCResponderTest.m
A cocos2d-tests-android/Headless/tests/CCSchedulerTest.m
A cocos2d-tests-android/Headless/tests/CCScrollViewTest.m
A cocos2d-tests-android/Headless/tests/CCSliderTest.m
A cocos2d-tests-android/Headless/tests/CCSprite9SliceTest.m
A cocos2d-tests-android/Headless/tests/CCTableViewTest.m
A cocos2d-tests-android/Headless/tests/CCTextFieldTest.m
A cocos2d-tests-android/Headless/tests/CCTextureCacheTest.m
A cocos2d-tests-android/Headless/tests/CCTransitionTest.m
A cocos2d-tests-android/Headless/tests/ColorPickerTest.m
A cocos2d-tests-android/Headless/tests/ColorTest.m
A cocos2d-tests-android/Headless/tests/ObjectALTest.m
A cocos2d-tests-android/Headless/tests/ParallaxTest.m
A cocos2d-tests-android/Headless/tests/ParticleTest.m
A cocos2d-tests-android/Headless/tests/PositioningTest.m
A cocos2d-tests-android/Headless/tests/SpritePerformanceTest.m
A cocos2d-tests-android/Headless/tests/TextureTest.m
A cocos2d-tests-android/Headless/tests/TilemapTest.m
A cocos2d-tests-android/Headless/tests/VertexZTest.m
A cocos2d-tests-android/HeadlessTests/HeadlessTests-Info.plist
A cocos2d-tests-android/HeadlessTests/HeadlessTests.m
A cocos2d-tests-android/HeadlessTests/en.lproj/InfoPlist.strings
A cocos2d-tests-android/build.gradle
A cocos2d-tests-android/gradle.properties
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.jar
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.properties
A cocos2d-tests-android/gradlew
A cocos2d-tests-android/gradlew.bat
A cocos2d-tests-android/local.properties
A cocos2d-tests-android/settings.gradle
M cocos2d-tests-ios.xcodeproj/project.pbxproj
A cocos2d-tests-iosAndroid-Info.plist
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/MainMenu.m
M cocos2d-ui-tests/ios/Resources/Info.plist
M cocos2d-ui-tests/osx/Resources/Info.plist
M cocos2d-ui-tests/osx/main.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCLabelTTFTest.m
M cocos2d-ui-tests/tests/CCResponderTest.m
M cocos2d-ui-tests/tests/CCTextFieldTest.m
M cocos2d-ui-tests/tests/ColorTest.m
M cocos2d-ui-tests/tests/ObjectALTest.m
M cocos2d-ui-tests/tests/ParallaxTest.m
M cocos2d-ui-tests/tests/ParticleTest.m
M cocos2d-ui-tests/tests/PositioningTest.m
M cocos2d-ui-tests/tests/TextureTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCButton.h
M cocos2d-ui/CCButton.m
M cocos2d-ui/CCControl.m
M cocos2d-ui/CCControlSubclass.h
M cocos2d-ui/CCScrollView.h
M cocos2d-ui/CCScrollView.m
M cocos2d-ui/CCSlider.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/CCTextField.m
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.h
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m
A cocos2d-ui/Platform/Android/java/CCEditText.h
A cocos2d-ui/Platform/Android/java/CCEditText.m
A cocos2d-ui/Platform/Android/java/org/cocos2d/CCEditText.java
A cocos2d-ui/Platform/CCPlatformTextField.h
A cocos2d-ui/Platform/CCPlatformTextField.m
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.h
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.m
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.h
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.m
M cocos2d/CCActionCatmullRom.m
M cocos2d/CCActionInstant.m
M cocos2d/CCAnimation.h
M cocos2d/CCCache.h
M cocos2d/CCCache.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.h
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
A cocos2d/CCEffectDropShadow.h
A cocos2d/CCEffectDropShadow.m
M cocos2d/CCEffectNode.h
A cocos2d/CCEffectOuterGlow.h
A cocos2d/CCEffectOuterGlow.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCLabelTTF.h
M cocos2d/CCLabelTTF.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.h
M cocos2d/CCNodeColor.m
M cocos2d/CCParticleSystemBase.m
M cocos2d/CCProgressNode.m
M cocos2d/CCProtocols.h
A cocos2d/CCRenderDispatch.h
A cocos2d/CCRenderDispatch.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCResponder.h
M cocos2d/CCResponder.m
M cocos2d/CCResponderManager.h
M cocos2d/CCResponderManager.m
M cocos2d/CCScheduler.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.h
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTexture_Private.h
M cocos2d/CCTiledMapLayer.h
M cocos2d/CCTiledMapLayer.m
A cocos2d/CCTouch.h
A cocos2d/CCTouch.m
A cocos2d/CCTouchEvent.h
A cocos2d/CCTouchEvent.m
M cocos2d/CCTransition.m
A cocos2d/Platforms/Android/CCActivity.h
A cocos2d/Platforms/Android/CCActivity.m
A cocos2d/Platforms/Android/CCDirectorAndroid.h
A cocos2d/Platforms/Android/CCDirectorAndroid.m
A cocos2d/Platforms/Android/CCGLView.h
A cocos2d/Platforms/Android/CCGLView.m
A cocos2d/Platforms/Android/CCGestureListener.h
A cocos2d/Platforms/Android/CCGestureListener.m
A cocos2d/Platforms/Android/CCMathTypesAndroid.h
A cocos2d/Platforms/Android/CCMathUtilsAndroid.h
A cocos2d/Platforms/Android/CCMatrix3.h
A cocos2d/Platforms/Android/CCMatrix3.m
A cocos2d/Platforms/Android/CCMatrix4.h
A cocos2d/Platforms/Android/CCMatrix4.m
A cocos2d/Platforms/Android/CCQuaternion.h
A cocos2d/Platforms/Android/CCQuaternion.m
A cocos2d/Platforms/Android/CCTouchAndroid.h
A cocos2d/Platforms/Android/CCTouchAndroid.m
A cocos2d/Platforms/Android/CCVector2.h
A cocos2d/Platforms/Android/CCVector3.h
A cocos2d/Platforms/Android/CCVector4.h
A cocos2d/Platforms/Android/java/org/cocos2d/CCActivity.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGLView.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGestureListener.java
A cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/CCNS.h
A cocos2d/Platforms/CCRenderDispatch_Private.h
M cocos2d/Platforms/Mac/CCDirectorMac.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/Mac/CCWindow.h
M cocos2d/Platforms/Mac/CCWindow.m
M cocos2d/Platforms/Mac/NSEvent+CC.h
M cocos2d/Platforms/Mac/NSEvent+CC.m
M cocos2d/Platforms/iOS/CCAppDelegate.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.h
M cocos2d/Platforms/iOS/CCDirectorIOS.m
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCES2Renderer.m
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
A cocos2d/Platforms/iOS/CCMetalSupport.m
A cocos2d/Platforms/iOS/CCMetalSupport_Private.h
A cocos2d/Platforms/iOS/CCMetalView.h
A cocos2d/Platforms/iOS/CCMetalView.m
A cocos2d/Platforms/iOS/CCShaders.metal
A cocos2d/Platforms/iOS/CCTouchIOS.h
A cocos2d/Platforms/iOS/CCTouchIOS.m
M cocos2d/Platforms/iOS/UITouch+CC.h
M cocos2d/Platforms/iOS/UITouch+CC.m
M cocos2d/Support/CCColor.h
M cocos2d/Support/CCColor.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
M cocos2d/Support/CGPointExtension.h
M cocos2d/Support/CGPointExtension.m
M cocos2d/Support/NSAttributedString+CCAdditions.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/ccConfig.h
M cocos2d/ccMacros.h
M cocos2d/ccTypes.h
M cocos2d/cocos2d.h
M external/ObjectAL/Actions/OALActionManager.m
M external/ObjectAL/AudioTrack/OALAudioTrack.h
M external/ObjectAL/AudioTrack/OALAudioTrack.m
M external/ObjectAL/AudioTrack/OALAudioTracks.h
M external/ObjectAL/AudioTrack/OALAudioTracks.m
M external/ObjectAL/OALSimpleAudio.h
M external/ObjectAL/OALSimpleAudio.m
A external/ObjectAL/Support/ALWeakArray.h
A external/ObjectAL/Support/ALWeakArray.m
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 8bdd372de770cd183eb76e7f6ccc589589d3544a
https://github.com/cocos2d/cocos2d-swift/commit/8bdd372de770cd183eb76e7f6ccc589589d3544a
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M .gitmodules
A CCRendererGLSupport.m
R Resources/Fonts/Abduction.ttf
A Resources/Fonts/RobotoSlab-Bold.ttf
A Resources/Fonts/RobotoSlab-Light.ttf
A Resources/Fonts/RobotoSlab-Regular.ttf
A Resources/Fonts/RobotoSlab-Thin.ttf
A Resources/Fonts/ThisFontIsAbdFont.ttf
A Resources/Images/DistanceFieldX.png
A Resources/Images/Ohm.png
M Resources/Images/fire.pvr
A Resources/Images/test_1021x1024.png
A Resources/Music/CIRCUS.mp3
M Resources/Particles/BoilingFoam.plist
M Resources/Particles/BurstPipe.plist
M Resources/Particles/ExplodingRing.plist
M Resources/Particles/LavaFlow.plist
M Resources/Particles/Phoenix.plist
M Resources/Particles/SmallSun.plist
M Resources/Particles/SpookyPeas.plist
A Resources/Sounds/sound.ogg
M Resources/TileMaps/orthogonal-desert-obscenely-large.tmx
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/appledoc.xcscheme
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/cocos2d.xcscheme
M cocos2d-osx.xcodeproj/project.pbxproj
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties.lock
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileHashes.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileSnapshots.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/outputFileStates.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/taskArtifacts.bin
A cocos2d-tests-android/.idea/.name
A cocos2d-tests-android/.idea/compiler.xml
A cocos2d-tests-android/.idea/copyright/profiles_settings.xml
A cocos2d-tests-android/.idea/dictionaries/phausler.xml
A cocos2d-tests-android/.idea/encodings.xml
A cocos2d-tests-android/.idea/gradle.xml
A cocos2d-tests-android/.idea/libraries/appcompat_v7_19_0_1.xml
A cocos2d-tests-android/.idea/libraries/support_v4_19_0_1.xml
A cocos2d-tests-android/.idea/misc.xml
A cocos2d-tests-android/.idea/modules.xml
A cocos2d-tests-android/.idea/scopes/scope_settings.xml
A cocos2d-tests-android/.idea/vcs.xml
A cocos2d-tests-android/.idea/workspace.xml
A cocos2d-tests-android/Headless.approj/targets/Headless/Debug.overrides.json
A cocos2d-tests-android/Headless.iml
A cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
A cocos2d-tests-android/Headless/Headless-Headless.iml
A cocos2d-tests-android/Headless/Headless-Info.plist
A cocos2d-tests-android/Headless/Headless-Prefix.pch
A cocos2d-tests-android/Headless/HeadlessActivity.h
A cocos2d-tests-android/Headless/HeadlessActivity.m
A cocos2d-tests-android/Headless/SimpleScene.h
A cocos2d-tests-android/Headless/SimpleScene.m
A cocos2d-tests-android/Headless/build.gradle
A cocos2d-tests-android/Headless/en.lproj/InfoPlist.strings
A cocos2d-tests-android/Headless/java/org/cocos2d/demo/HeadlessActivity.java
A cocos2d-tests-android/Headless/proguard-rules.txt
A cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
A cocos2d-tests-android/Headless/src/main/res/drawable-hdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-mdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xxhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/tests/CCBMFontTest.m
A cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
A cocos2d-tests-android/Headless/tests/CCEffectsTest.m
A cocos2d-tests-android/Headless/tests/CCLabelTTFTest.m
A cocos2d-tests-android/Headless/tests/CCLayoutTest.m
A cocos2d-tests-android/Headless/tests/CCPhysicsTest.m
A cocos2d-tests-android/Headless/tests/CCRendererTest.m
A cocos2d-tests-android/Headless/tests/CCResponderTest.m
A cocos2d-tests-android/Headless/tests/CCSchedulerTest.m
A cocos2d-tests-android/Headless/tests/CCScrollViewTest.m
A cocos2d-tests-android/Headless/tests/CCSliderTest.m
A cocos2d-tests-android/Headless/tests/CCSprite9SliceTest.m
A cocos2d-tests-android/Headless/tests/CCTableViewTest.m
A cocos2d-tests-android/Headless/tests/CCTextFieldTest.m
A cocos2d-tests-android/Headless/tests/CCTextureCacheTest.m
A cocos2d-tests-android/Headless/tests/CCTransitionTest.m
A cocos2d-tests-android/Headless/tests/ColorPickerTest.m
A cocos2d-tests-android/Headless/tests/ColorTest.m
A cocos2d-tests-android/Headless/tests/ObjectALTest.m
A cocos2d-tests-android/Headless/tests/ParallaxTest.m
A cocos2d-tests-android/Headless/tests/ParticleTest.m
A cocos2d-tests-android/Headless/tests/PositioningTest.m
A cocos2d-tests-android/Headless/tests/SpritePerformanceTest.m
A cocos2d-tests-android/Headless/tests/TextureTest.m
A cocos2d-tests-android/Headless/tests/TilemapTest.m
A cocos2d-tests-android/Headless/tests/VertexZTest.m
A cocos2d-tests-android/HeadlessTests/HeadlessTests-Info.plist
A cocos2d-tests-android/HeadlessTests/HeadlessTests.m
A cocos2d-tests-android/HeadlessTests/en.lproj/InfoPlist.strings
A cocos2d-tests-android/build.gradle
A cocos2d-tests-android/gradle.properties
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.jar
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.properties
A cocos2d-tests-android/gradlew
A cocos2d-tests-android/gradlew.bat
A cocos2d-tests-android/local.properties
A cocos2d-tests-android/settings.gradle
M cocos2d-tests-ios.xcodeproj/project.pbxproj
A cocos2d-tests-iosAndroid-Info.plist
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/MainMenu.m
M cocos2d-ui-tests/ios/Resources/Info.plist
M cocos2d-ui-tests/osx/Resources/Info.plist
M cocos2d-ui-tests/osx/main.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCLabelTTFTest.m
M cocos2d-ui-tests/tests/CCResponderTest.m
M cocos2d-ui-tests/tests/CCTextFieldTest.m
M cocos2d-ui-tests/tests/ColorTest.m
M cocos2d-ui-tests/tests/ObjectALTest.m
M cocos2d-ui-tests/tests/ParallaxTest.m
M cocos2d-ui-tests/tests/ParticleTest.m
M cocos2d-ui-tests/tests/PositioningTest.m
M cocos2d-ui-tests/tests/TextureTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCButton.h
M cocos2d-ui/CCButton.m
M cocos2d-ui/CCControl.m
M cocos2d-ui/CCControlSubclass.h
M cocos2d-ui/CCScrollView.h
M cocos2d-ui/CCScrollView.m
M cocos2d-ui/CCSlider.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/CCTextField.m
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.h
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m
A cocos2d-ui/Platform/Android/java/CCEditText.h
A cocos2d-ui/Platform/Android/java/CCEditText.m
A cocos2d-ui/Platform/Android/java/org/cocos2d/CCEditText.java
A cocos2d-ui/Platform/CCPlatformTextField.h
A cocos2d-ui/Platform/CCPlatformTextField.m
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.h
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.m
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.h
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.m
M cocos2d/CCActionCatmullRom.m
M cocos2d/CCActionInstant.m
M cocos2d/CCAnimation.h
M cocos2d/CCCache.h
M cocos2d/CCCache.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.h
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
A cocos2d/CCEffectDropShadow.h
A cocos2d/CCEffectDropShadow.m
M cocos2d/CCEffectNode.h
A cocos2d/CCEffectOuterGlow.h
A cocos2d/CCEffectOuterGlow.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCLabelTTF.h
M cocos2d/CCLabelTTF.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.h
M cocos2d/CCNodeColor.m
M cocos2d/CCParticleSystemBase.m
M cocos2d/CCProgressNode.m
M cocos2d/CCProtocols.h
A cocos2d/CCRenderDispatch.h
A cocos2d/CCRenderDispatch.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCResponder.h
M cocos2d/CCResponder.m
M cocos2d/CCResponderManager.h
M cocos2d/CCResponderManager.m
M cocos2d/CCScheduler.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.h
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTexture_Private.h
M cocos2d/CCTiledMapLayer.h
M cocos2d/CCTiledMapLayer.m
A cocos2d/CCTouch.h
A cocos2d/CCTouch.m
A cocos2d/CCTouchEvent.h
A cocos2d/CCTouchEvent.m
M cocos2d/CCTransition.m
A cocos2d/Platforms/Android/CCActivity.h
A cocos2d/Platforms/Android/CCActivity.m
A cocos2d/Platforms/Android/CCDirectorAndroid.h
A cocos2d/Platforms/Android/CCDirectorAndroid.m
A cocos2d/Platforms/Android/CCGLView.h
A cocos2d/Platforms/Android/CCGLView.m
A cocos2d/Platforms/Android/CCGestureListener.h
A cocos2d/Platforms/Android/CCGestureListener.m
A cocos2d/Platforms/Android/CCMathTypesAndroid.h
A cocos2d/Platforms/Android/CCMathUtilsAndroid.h
A cocos2d/Platforms/Android/CCMatrix3.h
A cocos2d/Platforms/Android/CCMatrix3.m
A cocos2d/Platforms/Android/CCMatrix4.h
A cocos2d/Platforms/Android/CCMatrix4.m
A cocos2d/Platforms/Android/CCQuaternion.h
A cocos2d/Platforms/Android/CCQuaternion.m
A cocos2d/Platforms/Android/CCTouchAndroid.h
A cocos2d/Platforms/Android/CCTouchAndroid.m
A cocos2d/Platforms/Android/CCVector2.h
A cocos2d/Platforms/Android/CCVector3.h
A cocos2d/Platforms/Android/CCVector4.h
A cocos2d/Platforms/Android/java/org/cocos2d/CCActivity.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGLView.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGestureListener.java
A cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/CCNS.h
A cocos2d/Platforms/CCRenderDispatch_Private.h
M cocos2d/Platforms/Mac/CCDirectorMac.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/Mac/CCWindow.h
M cocos2d/Platforms/Mac/CCWindow.m
M cocos2d/Platforms/Mac/NSEvent+CC.h
M cocos2d/Platforms/Mac/NSEvent+CC.m
M cocos2d/Platforms/iOS/CCAppDelegate.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.h
M cocos2d/Platforms/iOS/CCDirectorIOS.m
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCES2Renderer.m
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
A cocos2d/Platforms/iOS/CCMetalSupport.m
A cocos2d/Platforms/iOS/CCMetalSupport_Private.h
A cocos2d/Platforms/iOS/CCMetalView.h
A cocos2d/Platforms/iOS/CCMetalView.m
A cocos2d/Platforms/iOS/CCShaders.metal
A cocos2d/Platforms/iOS/CCTouchIOS.h
A cocos2d/Platforms/iOS/CCTouchIOS.m
M cocos2d/Platforms/iOS/UITouch+CC.h
M cocos2d/Platforms/iOS/UITouch+CC.m
M cocos2d/Support/CCColor.h
M cocos2d/Support/CCColor.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
M cocos2d/Support/CGPointExtension.h
M cocos2d/Support/CGPointExtension.m
M cocos2d/Support/NSAttributedString+CCAdditions.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/ccConfig.h
M cocos2d/ccMacros.h
M cocos2d/ccTypes.h
M cocos2d/cocos2d.h
M external/ObjectAL/Actions/OALActionManager.m
M external/ObjectAL/AudioTrack/OALAudioTrack.h
M external/ObjectAL/AudioTrack/OALAudioTrack.m
M external/ObjectAL/AudioTrack/OALAudioTracks.h
M external/ObjectAL/AudioTrack/OALAudioTracks.m
M external/ObjectAL/OALSimpleAudio.h
M external/ObjectAL/OALSimpleAudio.m
A external/ObjectAL/Support/ALWeakArray.h
A external/ObjectAL/Support/ALWeakArray.m
Log Message:
-----------
Merge branch 'develop' into colorChannelSeparation
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-ui-tests/tests/CCEffectsTest.m
Commit: 0794447d9ec2b22b603d9d9c0de3b3834bc12af2
https://github.com/cocos2d/cocos2d-swift/commit/0794447d9ec2b22b603d9d9c0de3b3834bc12af2
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
Log Message:
-----------
CCEffects - Add CCEffectColorChannelOffset
This was removed while resolving a merge conflict.
Commit: e0cdec386f6c06384dd8fee203efe4dfa573f3da
https://github.com/cocos2d/cocos2d-swift/commit/e0cdec386f6c06384dd8fee203efe4dfa573f3da
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M .gitmodules
A CCRendererGLSupport.m
R Resources/Fonts/Abduction.ttf
A Resources/Fonts/RobotoSlab-Bold.ttf
A Resources/Fonts/RobotoSlab-Light.ttf
A Resources/Fonts/RobotoSlab-Regular.ttf
A Resources/Fonts/RobotoSlab-Thin.ttf
A Resources/Fonts/ThisFontIsAbdFont.ttf
A Resources/Images/DistanceFieldX.png
A Resources/Images/Ohm.png
M Resources/Images/fire.pvr
A Resources/Images/test_1021x1024.png
A Resources/Music/CIRCUS.mp3
M Resources/Particles/BoilingFoam.plist
M Resources/Particles/BurstPipe.plist
M Resources/Particles/ExplodingRing.plist
M Resources/Particles/LavaFlow.plist
M Resources/Particles/Phoenix.plist
M Resources/Particles/SmallSun.plist
M Resources/Particles/SpookyPeas.plist
A Resources/Sounds/sound.ogg
M Resources/TileMaps/orthogonal-desert-obscenely-large.tmx
M UnitTests/CCRendererTests.m
A UnitTests/CCTextureTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/appledoc.xcscheme
R cocos2d-ios.xcodeproj/xcshareddata/xcschemes/cocos2d.xcscheme
M cocos2d-osx.xcodeproj/project.pbxproj
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/cache.properties.lock
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileHashes.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/fileSnapshots.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/outputFileStates.bin
A cocos2d-tests-android/.gradle/1.10/taskArtifacts/taskArtifacts.bin
A cocos2d-tests-android/.idea/.name
A cocos2d-tests-android/.idea/compiler.xml
A cocos2d-tests-android/.idea/copyright/profiles_settings.xml
A cocos2d-tests-android/.idea/dictionaries/phausler.xml
A cocos2d-tests-android/.idea/encodings.xml
A cocos2d-tests-android/.idea/gradle.xml
A cocos2d-tests-android/.idea/libraries/appcompat_v7_19_0_1.xml
A cocos2d-tests-android/.idea/libraries/support_v4_19_0_1.xml
A cocos2d-tests-android/.idea/misc.xml
A cocos2d-tests-android/.idea/modules.xml
A cocos2d-tests-android/.idea/scopes/scope_settings.xml
A cocos2d-tests-android/.idea/vcs.xml
A cocos2d-tests-android/.idea/workspace.xml
A cocos2d-tests-android/Headless.approj/targets/Headless/Debug.overrides.json
A cocos2d-tests-android/Headless.iml
A cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
A cocos2d-tests-android/Headless/Headless-Headless.iml
A cocos2d-tests-android/Headless/Headless-Info.plist
A cocos2d-tests-android/Headless/Headless-Prefix.pch
A cocos2d-tests-android/Headless/HeadlessActivity.h
A cocos2d-tests-android/Headless/HeadlessActivity.m
A cocos2d-tests-android/Headless/SimpleScene.h
A cocos2d-tests-android/Headless/SimpleScene.m
A cocos2d-tests-android/Headless/build.gradle
A cocos2d-tests-android/Headless/en.lproj/InfoPlist.strings
A cocos2d-tests-android/Headless/java/org/cocos2d/demo/HeadlessActivity.java
A cocos2d-tests-android/Headless/proguard-rules.txt
A cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
A cocos2d-tests-android/Headless/src/main/res/drawable-hdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-mdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/src/main/res/drawable-xxhdpi/ic_launcher.png
A cocos2d-tests-android/Headless/tests/CCBMFontTest.m
A cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
A cocos2d-tests-android/Headless/tests/CCEffectsTest.m
A cocos2d-tests-android/Headless/tests/CCLabelTTFTest.m
A cocos2d-tests-android/Headless/tests/CCLayoutTest.m
A cocos2d-tests-android/Headless/tests/CCPhysicsTest.m
A cocos2d-tests-android/Headless/tests/CCRendererTest.m
A cocos2d-tests-android/Headless/tests/CCResponderTest.m
A cocos2d-tests-android/Headless/tests/CCSchedulerTest.m
A cocos2d-tests-android/Headless/tests/CCScrollViewTest.m
A cocos2d-tests-android/Headless/tests/CCSliderTest.m
A cocos2d-tests-android/Headless/tests/CCSprite9SliceTest.m
A cocos2d-tests-android/Headless/tests/CCTableViewTest.m
A cocos2d-tests-android/Headless/tests/CCTextFieldTest.m
A cocos2d-tests-android/Headless/tests/CCTextureCacheTest.m
A cocos2d-tests-android/Headless/tests/CCTransitionTest.m
A cocos2d-tests-android/Headless/tests/ColorPickerTest.m
A cocos2d-tests-android/Headless/tests/ColorTest.m
A cocos2d-tests-android/Headless/tests/ObjectALTest.m
A cocos2d-tests-android/Headless/tests/ParallaxTest.m
A cocos2d-tests-android/Headless/tests/ParticleTest.m
A cocos2d-tests-android/Headless/tests/PositioningTest.m
A cocos2d-tests-android/Headless/tests/SpritePerformanceTest.m
A cocos2d-tests-android/Headless/tests/TextureTest.m
A cocos2d-tests-android/Headless/tests/TilemapTest.m
A cocos2d-tests-android/Headless/tests/VertexZTest.m
A cocos2d-tests-android/HeadlessTests/HeadlessTests-Info.plist
A cocos2d-tests-android/HeadlessTests/HeadlessTests.m
A cocos2d-tests-android/HeadlessTests/en.lproj/InfoPlist.strings
A cocos2d-tests-android/build.gradle
A cocos2d-tests-android/gradle.properties
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.jar
A cocos2d-tests-android/gradle/wrapper/gradle-wrapper.properties
A cocos2d-tests-android/gradlew
A cocos2d-tests-android/gradlew.bat
A cocos2d-tests-android/local.properties
A cocos2d-tests-android/settings.gradle
M cocos2d-tests-ios.xcodeproj/project.pbxproj
A cocos2d-tests-iosAndroid-Info.plist
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/MainMenu.m
M cocos2d-ui-tests/ios/Resources/Info.plist
M cocos2d-ui-tests/osx/Resources/Info.plist
M cocos2d-ui-tests/osx/main.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCLabelTTFTest.m
M cocos2d-ui-tests/tests/CCResponderTest.m
M cocos2d-ui-tests/tests/CCTextFieldTest.m
M cocos2d-ui-tests/tests/ColorTest.m
M cocos2d-ui-tests/tests/ObjectALTest.m
M cocos2d-ui-tests/tests/ParallaxTest.m
M cocos2d-ui-tests/tests/ParticleTest.m
M cocos2d-ui-tests/tests/PositioningTest.m
M cocos2d-ui-tests/tests/TextureTest.m
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCButton.h
M cocos2d-ui/CCButton.m
M cocos2d-ui/CCControl.m
M cocos2d-ui/CCControlSubclass.h
M cocos2d-ui/CCScrollView.h
M cocos2d-ui/CCScrollView.m
M cocos2d-ui/CCSlider.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/CCTextField.m
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.h
A cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m
A cocos2d-ui/Platform/Android/java/CCEditText.h
A cocos2d-ui/Platform/Android/java/CCEditText.m
A cocos2d-ui/Platform/Android/java/org/cocos2d/CCEditText.java
A cocos2d-ui/Platform/CCPlatformTextField.h
A cocos2d-ui/Platform/CCPlatformTextField.m
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.h
A cocos2d-ui/Platform/Mac/CCPlatformTextFieldMac.m
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.h
A cocos2d-ui/Platform/iOS/CCPlatformTextFieldIOS.m
M cocos2d/CCActionCatmullRom.m
M cocos2d/CCActionInstant.m
M cocos2d/CCAnimation.h
M cocos2d/CCCache.h
M cocos2d/CCCache.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.h
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
A cocos2d/CCEffectDropShadow.h
A cocos2d/CCEffectDropShadow.m
M cocos2d/CCEffectNode.h
A cocos2d/CCEffectOuterGlow.h
A cocos2d/CCEffectOuterGlow.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCLabelTTF.h
M cocos2d/CCLabelTTF.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.h
M cocos2d/CCNodeColor.m
M cocos2d/CCParticleSystemBase.m
M cocos2d/CCProgressNode.m
M cocos2d/CCProtocols.h
A cocos2d/CCRenderDispatch.h
A cocos2d/CCRenderDispatch.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCResponder.h
M cocos2d/CCResponder.m
M cocos2d/CCResponderManager.h
M cocos2d/CCResponderManager.m
M cocos2d/CCScheduler.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.h
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTexture_Private.h
M cocos2d/CCTiledMapLayer.h
M cocos2d/CCTiledMapLayer.m
A cocos2d/CCTouch.h
A cocos2d/CCTouch.m
A cocos2d/CCTouchEvent.h
A cocos2d/CCTouchEvent.m
M cocos2d/CCTransition.m
A cocos2d/Platforms/Android/CCActivity.h
A cocos2d/Platforms/Android/CCActivity.m
A cocos2d/Platforms/Android/CCDirectorAndroid.h
A cocos2d/Platforms/Android/CCDirectorAndroid.m
A cocos2d/Platforms/Android/CCGLView.h
A cocos2d/Platforms/Android/CCGLView.m
A cocos2d/Platforms/Android/CCGestureListener.h
A cocos2d/Platforms/Android/CCGestureListener.m
A cocos2d/Platforms/Android/CCMathTypesAndroid.h
A cocos2d/Platforms/Android/CCMathUtilsAndroid.h
A cocos2d/Platforms/Android/CCMatrix3.h
A cocos2d/Platforms/Android/CCMatrix3.m
A cocos2d/Platforms/Android/CCMatrix4.h
A cocos2d/Platforms/Android/CCMatrix4.m
A cocos2d/Platforms/Android/CCQuaternion.h
A cocos2d/Platforms/Android/CCQuaternion.m
A cocos2d/Platforms/Android/CCTouchAndroid.h
A cocos2d/Platforms/Android/CCTouchAndroid.m
A cocos2d/Platforms/Android/CCVector2.h
A cocos2d/Platforms/Android/CCVector3.h
A cocos2d/Platforms/Android/CCVector4.h
A cocos2d/Platforms/Android/java/org/cocos2d/CCActivity.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGLView.java
A cocos2d/Platforms/Android/java/org/cocos2d/CCGestureListener.java
A cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/CCNS.h
A cocos2d/Platforms/CCRenderDispatch_Private.h
M cocos2d/Platforms/Mac/CCDirectorMac.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/Mac/CCWindow.h
M cocos2d/Platforms/Mac/CCWindow.m
M cocos2d/Platforms/Mac/NSEvent+CC.h
M cocos2d/Platforms/Mac/NSEvent+CC.m
M cocos2d/Platforms/iOS/CCAppDelegate.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.h
M cocos2d/Platforms/iOS/CCDirectorIOS.m
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCES2Renderer.m
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
A cocos2d/Platforms/iOS/CCMetalSupport.m
A cocos2d/Platforms/iOS/CCMetalSupport_Private.h
A cocos2d/Platforms/iOS/CCMetalView.h
A cocos2d/Platforms/iOS/CCMetalView.m
A cocos2d/Platforms/iOS/CCShaders.metal
A cocos2d/Platforms/iOS/CCTouchIOS.h
A cocos2d/Platforms/iOS/CCTouchIOS.m
M cocos2d/Platforms/iOS/UITouch+CC.h
M cocos2d/Platforms/iOS/UITouch+CC.m
M cocos2d/Support/CCColor.h
M cocos2d/Support/CCColor.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
M cocos2d/Support/CGPointExtension.h
M cocos2d/Support/CGPointExtension.m
M cocos2d/Support/NSAttributedString+CCAdditions.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/ccConfig.h
M cocos2d/ccMacros.h
M cocos2d/ccTypes.h
M cocos2d/cocos2d.h
M external/ObjectAL/Actions/OALActionManager.m
M external/ObjectAL/AudioTrack/OALAudioTrack.h
M external/ObjectAL/AudioTrack/OALAudioTrack.m
Log Message:
-----------
Merge branch 'develop' into effectPadding
Conflicts:
cocos2d-ui-tests/tests/CCEffectsTest.m
Commit: a6f7bf94333fc3ac05c0c81243365ed04acc399d
https://github.com/cocos2d/cocos2d-swift/commit/a6f7bf94333fc3ac05c0c81243365ed04acc399d
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectsColorChannelOffset - Add support for effect padding
Commit: f7395f571702f490ade73d005d09417b2603fb7d
https://github.com/cocos2d/cocos2d-swift/commit/f7395f571702f490ade73d005d09417b2603fb7d
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCEffect.m
Log Message:
-----------
CCEffects - Don't apply name mangling to the texture coordinate center and extent uniforms
They're CCEffect built-ins (not effect implementation specific) so they are shared between stacked
effects and should not be mangled.
Commit: 7e1c72a20b1918f4b359baed72c306ceb4abf489
https://github.com/cocos2d/cocos2d-swift/commit/7e1c72a20b1918f4b359baed72c306ceb4abf489
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCEffectStack.m
Log Message:
-----------
CCEffectStack - Update the padding of an effect stack from its contained effects
If the padding of any contained effects is greater than the padding set directly on the
stack, use the contained effects value.
Commit: 2677e6e66b4dfe104187d041a8a21cf33a785917
https://github.com/cocos2d/cocos2d-swift/commit/2677e6e66b4dfe104187d041a8a21cf33a785917
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCEffectRenderer.m
Log Message:
-----------
CCEffectRenderer - Fix texture coordinates for intermediate render passes from sprite sheets
We had been using the sprite's original texture coordinates for all render passes which will not
work with sprite sheets. When reading from an intermediate render target we need the texture
coordinates to be lower left (0,0) and upper right (1,1) and this is not going to be the case when
a sprite draws its image from a sprite sheet.
Fix this problem by overwriting the sprite texture coordinates with the required values when reading
from a sprite sheet.
Commit: 8d84523eb61e95b1ff0459cb64909a3f90297ddd
https://github.com/cocos2d/cocos2d-swift/commit/8d84523eb61e95b1ff0459cb64909a3f90297ddd
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Add labels to the sprites in the padding test
Commit: b534ffc82106f3ce98c24ea8643a019d5db383d9
https://github.com/cocos2d/cocos2d-swift/commit/b534ffc82106f3ce98c24ea8643a019d5db383d9
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d-osx.xcodeproj/project.pbxproj
Log Message:
-----------
CCEffects - Add color channel offset, drop shadow, and outer glow to the OSX Xcode project
Commit: f77af86d967b99c8f4313304fbc60ef6492d1bcb
https://github.com/cocos2d/cocos2d-swift/commit/f77af86d967b99c8f4313304fbc60ef6492d1bcb
Author: John Twigg <john....@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCLabelTTF.m
Log Message:
-----------
Approved by @sergey . Hotfix for Label TTF outlines.
Commit: 3a2e6d23938e502b1f49e595a51f4e35900a102f
https://github.com/cocos2d/cocos2d-swift/commit/3a2e6d23938e502b1f49e595a51f4e35900a102f
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d/CCLabelTTF.m
Log Message:
-----------
Merge pull request #959 from jtwigg/v3.2
Hot fix for TTF outlines.
Commit: 1fbebec12907237a6aeda7af8cb14325e15054e2
https://github.com/cocos2d/cocos2d-swift/commit/1fbebec12907237a6aeda7af8cb14325e15054e2
Author: Viktor <viktor...@gmail.com>
Date: 2014-09-04 (Thu, 04 Sep 2014)
Changed paths:
M VERSION
M cocos2d/cocos2d.h
Log Message:
-----------
Updates version to 3.2.1
Commit: 0bda1e734869b762cdd1765c0f114b4ffc577af3
https://github.com/cocos2d/cocos2d-swift/commit/0bda1e734869b762cdd1765c0f114b4ffc577af3
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-04 (Thu, 04 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Switch test image and effect for padding test
I don't want to introduce yet another test image.
Commit: d8ba36eeda5424b270a8a4c54c80d7d472c5e0ae
https://github.com/cocos2d/cocos2d-swift/commit/d8ba36eeda5424b270a8a4c54c80d7d472c5e0ae
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-04 (Thu, 04 Sep 2014)
Changed paths:
M cocos2d/CCEffectHue.m
Log Message:
-----------
CCEffectHue - Remove non-color matrix version of the hue transform
Commit: 7eee45402dc127ecd878e546e68acaf00d1436d3
https://github.com/cocos2d/cocos2d-swift/commit/7eee45402dc127ecd878e546e68acaf00d1436d3
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffect.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffect_Private.h
Log Message:
-----------
CCEffects - Improve padding support
Effects can now inform the effect renderer how they are using the different texture coordinate sets
so the renderer can correctly decide how to transform the texture coordinates when padding is
requested.
Commit: abdb92c824712a2385abaf6cec061c7b8788a374
https://github.com/cocos2d/cocos2d-swift/commit/abdb92c824712a2385abaf6cec061c7b8788a374
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffectBloom.m
Log Message:
-----------
CCEffectBloom - Add support for padding to the bloom effect
Commit: 2b777fd7c2f85cd0b1cf91f26f419c02cc16fd6b
https://github.com/cocos2d/cocos2d-swift/commit/2b777fd7c2f85cd0b1cf91f26f419c02cc16fd6b
Author: ksjogo <jo...@kronberger-spiele.de>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
Log Message:
-----------
fixing CCRenderTexture -clearStencil
Commit: 560ac9c45888b3fca20d15705b0ff7813ab95f0b
https://github.com/cocos2d/cocos2d-swift/commit/560ac9c45888b3fca20d15705b0ff7813ab95f0b
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffect.m
M cocos2d/CCEffectBrightness.m
M cocos2d/CCEffectContrast.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffect_Private.h
Log Message:
-----------
CCEffects - Adapt the default input snippets to effect padding
When effects that do not require padding are stacked with effects that do, their
input snippets need to handle the possibility that they will fetch out of bounds texels.
Commit: 27c0a68a960ab808f58d237d0863774ef5edc1e6
https://github.com/cocos2d/cocos2d-swift/commit/27c0a68a960ab808f58d237d0863774ef5edc1e6
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffectColorChannelOffset.m
Log Message:
-----------
CCEffectColorChannelOffset - Fix effect function name
Commit: ddbf9064dd2ef7f59e71bf09f7dfb33b56a39104
https://github.com/cocos2d/cocos2d-swift/commit/ddbf9064dd2ef7f59e71bf09f7dfb33b56a39104
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/CCEffectBlur.m
Log Message:
-----------
CCEffectBlur - Adapt blur to the recent effect renderer changes
Commit: 43772d215a6aa853a3dc567b687a9dd86a8fb0b9
https://github.com/cocos2d/cocos2d-swift/commit/43772d215a6aa853a3dc567b687a9dd86a8fb0b9
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
Log Message:
-----------
CCEffectsTest - Add more test cases to the padding test, add padding to the bloom test
Commit: a71a439e552b499a70ebdcf19843168425dcc1aa
https://github.com/cocos2d/cocos2d-swift/commit/a71a439e552b499a70ebdcf19843168425dcc1aa
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
Log Message:
-----------
Merge pull request #972 from ksjogo/969
fixing CCRenderTexture -clearStencil
Commit: f6dbb410804371f53df59e1a8e700c7d00597823
https://github.com/cocos2d/cocos2d-swift/commit/f6dbb410804371f53df59e1a8e700c7d00597823
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCBReader/CCBReader_Private.h
M cocos2d/CCPhysicsBody.m
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 066ded1b19513d325581129350e989a22dce7b52
https://github.com/cocos2d/cocos2d-swift/commit/066ded1b19513d325581129350e989a22dce7b52
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d/CCRenderTexture.m
Log Message:
-----------
Fix merge damage affecting android build
Commit: 4f891c86cbf986020264fb463c6de91fc3aeed44
https://github.com/cocos2d/cocos2d-swift/commit/4f891c86cbf986020264fb463c6de91fc3aeed44
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
R external/ObjectAL/Actions/OALAction+Private.h
R external/ObjectAL/Actions/OALAction.h
R external/ObjectAL/Actions/OALAction.m
R external/ObjectAL/Actions/OALActionManager.h
R external/ObjectAL/Actions/OALActionManager.m
R external/ObjectAL/Actions/OALAudioActions.h
R external/ObjectAL/Actions/OALAudioActions.m
R external/ObjectAL/Actions/OALUtilityActions.h
R external/ObjectAL/Actions/OALUtilityActions.m
R external/ObjectAL/AudioTrack/OALAudioTrack.h
R external/ObjectAL/AudioTrack/OALAudioTrack.m
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.h
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.m
R external/ObjectAL/AudioTrack/OALAudioTracks.h
R external/ObjectAL/AudioTrack/OALAudioTracks.m
R external/ObjectAL/OALSimpleAudio.h
R external/ObjectAL/OALSimpleAudio.m
R external/ObjectAL/ObjectAL.h
R external/ObjectAL/ObjectALConfig.h
R external/ObjectAL/OpenAL/ALBuffer.h
R external/ObjectAL/OpenAL/ALBuffer.m
R external/ObjectAL/OpenAL/ALCaptureDevice.h
R external/ObjectAL/OpenAL/ALCaptureDevice.m
R external/ObjectAL/OpenAL/ALChannelSource.h
R external/ObjectAL/OpenAL/ALChannelSource.m
R external/ObjectAL/OpenAL/ALContext.h
R external/ObjectAL/OpenAL/ALContext.m
R external/ObjectAL/OpenAL/ALDevice.h
R external/ObjectAL/OpenAL/ALDevice.m
R external/ObjectAL/OpenAL/ALListener.h
R external/ObjectAL/OpenAL/ALListener.m
R external/ObjectAL/OpenAL/ALSoundSource.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.m
R external/ObjectAL/OpenAL/ALSource.h
R external/ObjectAL/OpenAL/ALSource.m
R external/ObjectAL/OpenAL/ALTypes.h
R external/ObjectAL/OpenAL/ALWrapper.h
R external/ObjectAL/OpenAL/ALWrapper.m
R external/ObjectAL/OpenAL/OpenALManager.h
R external/ObjectAL/OpenAL/OpenALManager.m
R external/ObjectAL/Session/OALAudioSession.h
R external/ObjectAL/Session/OALAudioSession.m
R external/ObjectAL/Session/OALSuspendHandler.h
R external/ObjectAL/Session/OALSuspendHandler.m
R external/ObjectAL/Support/ALWeakArray.h
R external/ObjectAL/Support/ALWeakArray.m
R external/ObjectAL/Support/ALWeakDictionary.h
R external/ObjectAL/Support/ALWeakDictionary.m
R external/ObjectAL/Support/ALWeakElement.h
R external/ObjectAL/Support/ALWeakElement.m
R external/ObjectAL/Support/ARCSafe_MemMgmt.h
R external/ObjectAL/Support/IOSVersion.h
R external/ObjectAL/Support/IOSVersion.m
R external/ObjectAL/Support/OALAudioFile.h
R external/ObjectAL/Support/OALAudioFile.m
R external/ObjectAL/Support/OALNotifications.h
R external/ObjectAL/Support/OALTools.h
R external/ObjectAL/Support/OALTools.m
R external/ObjectAL/Support/ObjectALMacros.h
R external/ObjectAL/Support/SynthesizeSingleton.h
R external/ObjectAL/Support/mach_timing.c
R external/ObjectAL/Support/mach_timing.h
Log Message:
-----------
Remove ObjectAL, will become a submodule
Commit: 8ce94bc842e17ee57adf0f2679875c5a047e6856
https://github.com/cocos2d/cocos2d-swift/commit/8ce94bc842e17ee57adf0f2679875c5a047e6856
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
M .gitmodules
A external/ObjectAL
Log Message:
-----------
Add ObjectAL as a submodule
Commit: 7d1c580f86bdb8e5b042ea1232b35dafaccfa1bf
https://github.com/cocos2d/cocos2d-swift/commit/7d1c580f86bdb8e5b042ea1232b35dafaccfa1bf
Author: Viktor Lidholt <viktor...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M .gitmodules
Log Message:
-----------
Updates submodules to https
Commit: 516ef6d20bd32df40869afad0f6de964f44fd50f
https://github.com/cocos2d/cocos2d-swift/commit/516ef6d20bd32df40869afad0f6de964f44fd50f
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.m
M cocos2d/cocos2d.h
Log Message:
-----------
Added inner glow (using distance fields). Fixed minor bugs with outline effect. Cleaned up comments.
Commit: d46d8ee95bd00434cc578a387fb6bd1fcd4ac02c
https://github.com/cocos2d/cocos2d-swift/commit/d46d8ee95bd00434cc578a387fb6bd1fcd4ac02c
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M .gitmodules
R external/ogg
R external/tremor
Log Message:
-----------
Ogg and Tremor moved into ObjectAL
Commit: 9d3092b350698bc52c9927522f111eaaba199929
https://github.com/cocos2d/cocos2d-swift/commit/9d3092b350698bc52c9927522f111eaaba199929
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M .gitmodules
M external/ObjectAL
Log Message:
-----------
ObjectAL submodule updated for Android
Commit: a2daa58ea4213ec97a83069e9f602c2a57a7155f
https://github.com/cocos2d/cocos2d-swift/commit/a2daa58ea4213ec97a83069e9f602c2a57a7155f
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
Log Message:
-----------
Move ObjectAL into subproject in Xcode
Commit: 9aba7086403282b54a339c58ff2ae0aa1cac07f9
https://github.com/cocos2d/cocos2d-swift/commit/9aba7086403282b54a339c58ff2ae0aa1cac07f9
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M external/ObjectAL
Log Message:
-----------
Fix iOS build
Commit: 6e95c1136fffd04bdc52c8461857e694c9e0773e
https://github.com/cocos2d/cocos2d-swift/commit/6e95c1136fffd04bdc52c8461857e694c9e0773e
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
R external/ObjectAL
Log Message:
-----------
Renaming ObjectAL repo, deleting first
Commit: 079861bed3df8b1d09b98b16a26b36589d4f1f36
https://github.com/cocos2d/cocos2d-swift/commit/079861bed3df8b1d09b98b16a26b36589d4f1f36
Author: Marc Salem <sa...@apportable.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
A external/ObjectAL
Log Message:
-----------
Renaming ObjectAL repo
Commit: 39de916772d2f51422ccfc68c164949515b2161b
https://github.com/cocos2d/cocos2d-swift/commit/39de916772d2f51422ccfc68c164949515b2161b
Author: slembcke <slem...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d-osx.xcodeproj/project.pbxproj
Log Message:
-----------
Mac project fixes
Commit: b53b44e500b8154693a7efc9202a91e20ebb7a5d
https://github.com/cocos2d/cocos2d-swift/commit/b53b44e500b8154693a7efc9202a91e20ebb7a5d
Author: slembcke <slem...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Support/CCFileUtils.h
A external/ObjectAL
R external/ObjectAL/Actions/OALAction+Private.h
R external/ObjectAL/Actions/OALAction.h
R external/ObjectAL/Actions/OALAction.m
R external/ObjectAL/Actions/OALActionManager.h
R external/ObjectAL/Actions/OALActionManager.m
R external/ObjectAL/Actions/OALAudioActions.h
R external/ObjectAL/Actions/OALAudioActions.m
R external/ObjectAL/Actions/OALUtilityActions.h
R external/ObjectAL/Actions/OALUtilityActions.m
R external/ObjectAL/AudioTrack/OALAudioTrack.h
R external/ObjectAL/AudioTrack/OALAudioTrack.m
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.h
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.m
R external/ObjectAL/AudioTrack/OALAudioTracks.h
R external/ObjectAL/AudioTrack/OALAudioTracks.m
R external/ObjectAL/OALSimpleAudio.h
R external/ObjectAL/OALSimpleAudio.m
R external/ObjectAL/ObjectAL.h
R external/ObjectAL/ObjectALConfig.h
R external/ObjectAL/OpenAL/ALBuffer.h
R external/ObjectAL/OpenAL/ALBuffer.m
R external/ObjectAL/OpenAL/ALCaptureDevice.h
R external/ObjectAL/OpenAL/ALCaptureDevice.m
R external/ObjectAL/OpenAL/ALChannelSource.h
R external/ObjectAL/OpenAL/ALChannelSource.m
R external/ObjectAL/OpenAL/ALContext.h
R external/ObjectAL/OpenAL/ALContext.m
R external/ObjectAL/OpenAL/ALDevice.h
R external/ObjectAL/OpenAL/ALDevice.m
R external/ObjectAL/OpenAL/ALListener.h
R external/ObjectAL/OpenAL/ALListener.m
R external/ObjectAL/OpenAL/ALSoundSource.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.m
R external/ObjectAL/OpenAL/ALSource.h
R external/ObjectAL/OpenAL/ALSource.m
R external/ObjectAL/OpenAL/ALTypes.h
R external/ObjectAL/OpenAL/ALWrapper.h
R external/ObjectAL/OpenAL/ALWrapper.m
R external/ObjectAL/OpenAL/OpenALManager.h
R external/ObjectAL/OpenAL/OpenALManager.m
R external/ObjectAL/Session/OALAudioSession.h
R external/ObjectAL/Session/OALAudioSession.m
R external/ObjectAL/Session/OALSuspendHandler.h
R external/ObjectAL/Session/OALSuspendHandler.m
R external/ObjectAL/Support/ALWeakArray.h
R external/ObjectAL/Support/ALWeakArray.m
R external/ObjectAL/Support/ALWeakDictionary.h
R external/ObjectAL/Support/ALWeakDictionary.m
R external/ObjectAL/Support/ALWeakElement.h
R external/ObjectAL/Support/ALWeakElement.m
R external/ObjectAL/Support/ARCSafe_MemMgmt.h
R external/ObjectAL/Support/IOSVersion.h
R external/ObjectAL/Support/IOSVersion.m
R external/ObjectAL/Support/OALAudioFile.h
R external/ObjectAL/Support/OALAudioFile.m
R external/ObjectAL/Support/OALNotifications.h
R external/ObjectAL/Support/OALTools.h
R external/ObjectAL/Support/OALTools.m
R external/ObjectAL/Support/ObjectALMacros.h
R external/ObjectAL/Support/SynthesizeSingleton.h
R external/ObjectAL/Support/mach_timing.c
R external/ObjectAL/Support/mach_timing.h
R external/ogg
R external/tremor
Log Message:
-----------
Merge branch 'develop' of git://github.com/marcsalem/cocos2d-swift into develop
Conflicts:
.gitmodules
cocos2d-ios.xcodeproj/project.pbxproj
Commit: 04802e37815c39a7e967f1634af4c9758bbd8c1b
https://github.com/cocos2d/cocos2d-swift/commit/04802e37815c39a7e967f1634af4c9758bbd8c1b
Author: RobBoluga <r...@boluga.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Fix to make opacity from the parent CCNode cascade to CCNodeColor and CCNodeGradient
Commit: ef651f51f72e3551d2a2a40d434bc239d30753f4
https://github.com/cocos2d/cocos2d-swift/commit/ef651f51f72e3551d2a2a40d434bc239d30753f4
Author: RobBoluga <r...@boluga.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Removed logging from Fix to make opacity from the parent CCNode cascade to CCNodeColor and CCNodeGradient
Commit: f63711125b91eb0960161c533106cc6eb28e8c55
https://github.com/cocos2d/cocos2d-swift/commit/f63711125b91eb0960161c533106cc6eb28e8c55
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNode.h
M cocos2d/CCNode.m
Log Message:
-----------
Merge pull request #958 from AT2014/v3.1
Added alternative reschedule:interval method to CCNode class.
Commit: 398daf201e5188bc288a644e162f44d1a3ab8304
https://github.com/cocos2d/cocos2d-swift/commit/398daf201e5188bc288a644e162f44d1a3ab8304
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
Log Message:
-----------
Merge pull request #962 from programmarchy/patch-1
Fix compiler warning
Commit: 529ac53fc4f7aead4380c8ede8380288912a4298
https://github.com/cocos2d/cocos2d-swift/commit/529ac53fc4f7aead4380c8ede8380288912a4298
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/Support/CCFileUtils.h
Log Message:
-----------
Fix CGFloat error in CCFileUtils.h.
Commit: 6fc7fd7ef08cd2de6ff0aff48266f59ad49e7263
https://github.com/cocos2d/cocos2d-swift/commit/6fc7fd7ef08cd2de6ff0aff48266f59ad49e7263
Author: RobBoluga <r...@boluga.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Removed duplicate method. Already inherited from CCNodeColor.
Commit: 552dcd5e444d54453e9a4bd3b5af0e2b64488338
https://github.com/cocos2d/cocos2d-swift/commit/552dcd5e444d54453e9a4bd3b5af0e2b64488338
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.m
M cocos2d/CCEffectBrightness.m
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
M cocos2d/CCEffectContrast.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffectStack.m
M cocos2d/CCEffect_Private.h
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'develop' of git://github.com/thayerandrews/cocos2d-iphone into 963
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-osx.xcodeproj/project.pbxproj
cocos2d-ui-tests/tests/CCEffectsTest.m
cocos2d/CCEffectBlur.m
external/ObjectAL
Commit: 7094babd0092fa6cd67791e8592869b894197742
https://github.com/cocos2d/cocos2d-swift/commit/7094babd0092fa6cd67791e8592869b894197742
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCEffectBloom.m
Log Message:
-----------
Removing unmatched parenthesis.
Commit: 921e268efbc0b3797917d7fac96252ee6fadd976
https://github.com/cocos2d/cocos2d-swift/commit/921e268efbc0b3797917d7fac96252ee6fadd976
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
Log Message:
-----------
Merge pull request #953 from sarah-j-smith/v3.1
Handle odd line seperators in CCLabelBMFont.
Commit: ab3fe789648c3eb4db5b583865a61c17cd4288a4
https://github.com/cocos2d/cocos2d-swift/commit/ab3fe789648c3eb4db5b583865a61c17cd4288a4
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Merge pull request #946 from sridenour/v3.1
Always stop CCDirector when app is backgrounded
Commit: 5c91c8fe0f3bb43ae36db59b12ab19e5d2defd97
https://github.com/cocos2d/cocos2d-swift/commit/5c91c8fe0f3bb43ae36db59b12ab19e5d2defd97
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.m
M cocos2d/cocos2d.h
Log Message:
-----------
Merge commit '516ef6d' into develop
Conflicts:
.gitmodules
external/ObjectAL
Commit: 5f1270c3efca6d56387432e4c59b45c824856922
https://github.com/cocos2d/cocos2d-swift/commit/5f1270c3efca6d56387432e4c59b45c824856922
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCNodeColor.m
Log Message:
-----------
Merge pull request #984 from boluga/CCNodeColor-CascadeOpacity
CcNodeColor cascade opacity
Commit: f7e825878f97ae95bedd5aed834ef7b860207949
https://github.com/cocos2d/cocos2d-swift/commit/f7e825878f97ae95bedd5aed834ef7b860207949
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Log Message:
-----------
Merge branch 'v3.1' into v3.2
Commit: 49b401b8db44458a72f2342ec52626ae20fb1b83
https://github.com/cocos2d/cocos2d-swift/commit/49b401b8db44458a72f2342ec52626ae20fb1b83
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M VERSION
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d/CCRenderTexture.m
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'v3.2' into develop
Conflicts:
VERSION
cocos2d/CCLabelTTF.m
cocos2d/CCRenderer.m
external/ObjectAL
Commit: 426c593180ca5d165a58eca8672af3b1b5ecc499
https://github.com/cocos2d/cocos2d-swift/commit/426c593180ca5d165a58eca8672af3b1b5ecc499
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Merge branch 'v3.1' into v3.2
Commit: c5a9fd79707a1426ec9cf307489bfe91b710e276
https://github.com/cocos2d/cocos2d-swift/commit/c5a9fd79707a1426ec9cf307489bfe91b710e276
Author: slembcke <slem...@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d/CCLabelBMFont.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Merge branch 'v3.2' into develop
Conflicts:
external/ObjectAL
Commit: 3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
https://github.com/cocos2d/cocos2d-swift/commit/3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M .gitmodules
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d/CCConfiguration.h
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.m
M cocos2d/CCEffectBrightness.m
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
M cocos2d/CCEffectContrast.m
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffectStack.m
M cocos2d/CCEffect_Private.h
M cocos2d/CCLabelBMFont.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.m
M cocos2d/CCRenderTexture.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/cocos2d.h
A external/ObjectAL
R external/ObjectAL/Actions/OALAction+Private.h
R external/ObjectAL/Actions/OALAction.h
R external/ObjectAL/Actions/OALAction.m
R external/ObjectAL/Actions/OALActionManager.h
R external/ObjectAL/Actions/OALActionManager.m
R external/ObjectAL/Actions/OALAudioActions.h
R external/ObjectAL/Actions/OALAudioActions.m
R external/ObjectAL/Actions/OALUtilityActions.h
R external/ObjectAL/Actions/OALUtilityActions.m
R external/ObjectAL/AudioTrack/OALAudioTrack.h
R external/ObjectAL/AudioTrack/OALAudioTrack.m
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.h
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.m
R external/ObjectAL/AudioTrack/OALAudioTracks.h
R external/ObjectAL/AudioTrack/OALAudioTracks.m
R external/ObjectAL/OALSimpleAudio.h
R external/ObjectAL/OALSimpleAudio.m
R external/ObjectAL/ObjectAL.h
R external/ObjectAL/ObjectALConfig.h
R external/ObjectAL/OpenAL/ALBuffer.h
R external/ObjectAL/OpenAL/ALBuffer.m
R external/ObjectAL/OpenAL/ALCaptureDevice.h
R external/ObjectAL/OpenAL/ALCaptureDevice.m
R external/ObjectAL/OpenAL/ALChannelSource.h
R external/ObjectAL/OpenAL/ALChannelSource.m
R external/ObjectAL/OpenAL/ALContext.h
R external/ObjectAL/OpenAL/ALContext.m
R external/ObjectAL/OpenAL/ALDevice.h
R external/ObjectAL/OpenAL/ALDevice.m
R external/ObjectAL/OpenAL/ALListener.h
R external/ObjectAL/OpenAL/ALListener.m
R external/ObjectAL/OpenAL/ALSoundSource.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.m
R external/ObjectAL/OpenAL/ALSource.h
R external/ObjectAL/OpenAL/ALSource.m
R external/ObjectAL/OpenAL/ALTypes.h
R external/ObjectAL/OpenAL/ALWrapper.h
R external/ObjectAL/OpenAL/ALWrapper.m
R external/ObjectAL/OpenAL/OpenALManager.h
R external/ObjectAL/OpenAL/OpenALManager.m
R external/ObjectAL/Session/OALAudioSession.h
R external/ObjectAL/Session/OALAudioSession.m
R external/ObjectAL/Session/OALSuspendHandler.h
R external/ObjectAL/Session/OALSuspendHandler.m
R external/ObjectAL/Support/ALWeakArray.h
R external/ObjectAL/Support/ALWeakArray.m
R external/ObjectAL/Support/ALWeakDictionary.h
R external/ObjectAL/Support/ALWeakDictionary.m
R external/ObjectAL/Support/ALWeakElement.h
R external/ObjectAL/Support/ALWeakElement.m
R external/ObjectAL/Support/ARCSafe_MemMgmt.h
R external/ObjectAL/Support/IOSVersion.h
R external/ObjectAL/Support/IOSVersion.m
R external/ObjectAL/Support/OALAudioFile.h
R external/ObjectAL/Support/OALAudioFile.m
R external/ObjectAL/Support/OALNotifications.h
R external/ObjectAL/Support/OALTools.h
R external/ObjectAL/Support/OALTools.m
R external/ObjectAL/Support/ObjectALMacros.h
R external/ObjectAL/Support/SynthesizeSingleton.h
R external/ObjectAL/Support/mach_timing.c
R external/ObjectAL/Support/mach_timing.h
R external/ogg
R external/tremor
Log Message:
-----------
Merge branch 'develop' into metal-hacking
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-ui/CCBReader/CCBReader.m
cocos2d/CCRenderTexture.m
cocos2d/cocos2d.h
Commit: c04c5925791a2cb5d0a16f4278a2df2869581079
https://github.com/cocos2d/cocos2d-swift/commit/c04c5925791a2cb5d0a16f4278a2df2869581079
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
Don’t check for GL errors when there is no context set.
Compare: https://github.com/cocos2d/cocos2d-swift/compare/67384fcc6adf...c04c5925791a
Reply all
Reply to author
Forward
0 new messages