Permalink
Browse files

use cocoapods 2.1 dev

  • Loading branch information...
siuying committed Aug 17, 2012
1 parent 9dc8c0f commit 5d77c8fe43a4c7a98507b225167af683f1362f1c
Showing with 5,763 additions and 3,726 deletions.
  1. +5 −1 Gemfile
  2. +8 −0 Gemfile.lock
  3. +2 −3 Rakefile
  4. +1 −0 vendor/Pods/BuildHeaders/cocos2d/CCDrawNode.h
  5. +1 −0 vendor/Pods/BuildHeaders/cocos2d/ccShader_PositionColorLengthTexture_frag.h
  6. +1 −0 vendor/Pods/BuildHeaders/cocos2d/ccShader_PositionColorLengthTexture_vert.h
  7. +1 −0 vendor/Pods/Headers/cocos2d/CCDrawNode.h
  8. +1 −0 vendor/Pods/Headers/cocos2d/ccShader_PositionColorLengthTexture_frag.h
  9. +1 −0 vendor/Pods/Headers/cocos2d/ccShader_PositionColorLengthTexture_vert.h
  10. +2,903 −2,903 vendor/Pods/Pods.bridgesupport
  11. +7 −0 vendor/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  12. BIN vendor/Pods/build-iPhoneSimulator/libPods.a
  13. +2 −0 vendor/Pods/cocos2d/cocos2d/CCActionCamera.h
  14. +11 −1 vendor/Pods/cocos2d/cocos2d/CCActionCatmullRom.h
  15. +102 −19 vendor/Pods/cocos2d/cocos2d/CCActionEase.h
  16. +2 −1 vendor/Pods/cocos2d/cocos2d/CCActionGrid3D.h
  17. +8 −0 vendor/Pods/cocos2d/cocos2d/CCActionInstant.h
  18. +40 −8 vendor/Pods/cocos2d/cocos2d/CCActionInterval.h
  19. +89 −29 vendor/Pods/cocos2d/cocos2d/CCActionInterval.m
  20. +3 −2 vendor/Pods/cocos2d/cocos2d/CCDirector.m
  21. +65 −0 vendor/Pods/cocos2d/cocos2d/CCDrawNode.h
  22. +377 −0 vendor/Pods/cocos2d/cocos2d/CCDrawNode.m
  23. +11 −0 vendor/Pods/cocos2d/cocos2d/CCDrawingPrimitives.h
  24. +20 −9 vendor/Pods/cocos2d/cocos2d/CCDrawingPrimitives.m
  25. +35 −15 vendor/Pods/cocos2d/cocos2d/CCGLProgram.h
  26. +121 −64 vendor/Pods/cocos2d/cocos2d/CCGLProgram.m
  27. +2 −2 vendor/Pods/cocos2d/cocos2d/CCGrid.m
  28. +31 −17 vendor/Pods/cocos2d/cocos2d/CCLabelBMFont.h
  29. +104 −120 vendor/Pods/cocos2d/cocos2d/CCLabelBMFont.m
  30. +9 −9 vendor/Pods/cocos2d/cocos2d/CCLabelTTF.h
  31. +41 −31 vendor/Pods/cocos2d/cocos2d/CCLabelTTF.m
  32. +1 −1 vendor/Pods/cocos2d/cocos2d/CCLayer.m
  33. +6 −4 vendor/Pods/cocos2d/cocos2d/CCMenu.h
  34. +47 −34 vendor/Pods/cocos2d/cocos2d/CCMenu.m
  35. +8 −3 vendor/Pods/cocos2d/cocos2d/CCMenuItem.h
  36. +34 −19 vendor/Pods/cocos2d/cocos2d/CCMenuItem.m
  37. +13 −6 vendor/Pods/cocos2d/cocos2d/CCNode.h
  38. +45 −16 vendor/Pods/cocos2d/cocos2d/CCNode.m
  39. +22 −0 vendor/Pods/cocos2d/cocos2d/CCParticleExamples.h
  40. +6 −0 vendor/Pods/cocos2d/cocos2d/CCParticleSystem.h
  41. +7 −2 vendor/Pods/cocos2d/cocos2d/CCParticleSystem.m
  42. +4 −6 vendor/Pods/cocos2d/cocos2d/CCParticleSystemQuad.m
  43. +1 −1 vendor/Pods/cocos2d/cocos2d/CCProgressTimer.m
  44. +8 −1 vendor/Pods/cocos2d/cocos2d/CCProtocols.h
  45. +4 −0 vendor/Pods/cocos2d/cocos2d/CCScene.h
  46. +63 −27 vendor/Pods/cocos2d/cocos2d/CCScheduler.h
  47. +259 −95 vendor/Pods/cocos2d/cocos2d/CCScheduler.m
  48. +17 −0 vendor/Pods/cocos2d/cocos2d/CCShaderCache.m
  49. +13 −1 vendor/Pods/cocos2d/cocos2d/CCSprite.m
  50. +1 −1 vendor/Pods/cocos2d/cocos2d/CCSpriteFrame.h
  51. +4 −12 vendor/Pods/cocos2d/cocos2d/CCTexture2D.h
  52. +5 −23 vendor/Pods/cocos2d/cocos2d/CCTexture2D.m
  53. +1 −1 vendor/Pods/cocos2d/cocos2d/CCTextureAtlas.h
  54. +11 −4 vendor/Pods/cocos2d/cocos2d/CCTextureAtlas.m
  55. +4 −7 vendor/Pods/cocos2d/cocos2d/CCTextureCache.m
  56. +12 −1 vendor/Pods/cocos2d/cocos2d/CCTexturePVR.h
  57. +261 −66 vendor/Pods/cocos2d/cocos2d/CCTexturePVR.m
  58. +39 −0 vendor/Pods/cocos2d/cocos2d/CCTransition.h
  59. +34 −2 vendor/Pods/cocos2d/cocos2d/CCTransition.m
  60. +22 −0 vendor/Pods/cocos2d/cocos2d/CCTransitionProgress.h
  61. +4 −1 vendor/Pods/cocos2d/cocos2d/Platforms/Mac/CCGLView.m
  62. +7 −0 vendor/Pods/cocos2d/cocos2d/Platforms/iOS/CCDirectorIOS.h
  63. +25 −0 vendor/Pods/cocos2d/cocos2d/Platforms/iOS/CCDirectorIOS.m
  64. +5 −2 vendor/Pods/cocos2d/cocos2d/Platforms/iOS/CCGLView.m
  65. +53 −15 vendor/Pods/cocos2d/cocos2d/Support/CCFileUtils.h
  66. +95 −34 vendor/Pods/cocos2d/cocos2d/Support/CCFileUtils.m
  67. +4 −2 vendor/Pods/cocos2d/cocos2d/Support/CGPointExtension.h
  68. +6 −0 vendor/Pods/cocos2d/cocos2d/ccDeprecated.h
  69. +25 −7 vendor/Pods/cocos2d/cocos2d/ccDeprecated.m
  70. +20 −14 vendor/Pods/cocos2d/cocos2d/ccGLStateCache.h
  71. +56 −42 vendor/Pods/cocos2d/cocos2d/ccGLStateCache.m
  72. +1 −1 vendor/Pods/cocos2d/cocos2d/ccMacros.h
  73. +41 −0 vendor/Pods/cocos2d/cocos2d/ccShader_PositionColorLengthTexture_frag.h
  74. +47 −0 vendor/Pods/cocos2d/cocos2d/ccShader_PositionColorLengthTexture_vert.h
  75. +25 −0 vendor/Pods/cocos2d/cocos2d/ccShader_PositionColor_frag.h
  76. +26 −3 vendor/Pods/cocos2d/cocos2d/ccShader_PositionColor_vert.h
  77. +27 −2 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTextureA8Color_frag.h
  78. +26 −2 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTextureA8Color_vert.h
  79. +29 −5 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTextureColorAlphaTest_frag.h
  80. +27 −2 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTextureColor_frag.h
  81. +26 −3 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTextureColor_vert.h
  82. +27 −2 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTexture_frag.h
  83. +27 −2 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTexture_uColor_frag.h
  84. +26 −3 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTexture_uColor_vert.h
  85. +26 −2 vendor/Pods/cocos2d/cocos2d/ccShader_PositionTexture_vert.h
  86. +25 −0 vendor/Pods/cocos2d/cocos2d/ccShader_Position_uColor_frag.h
  87. +26 −2 vendor/Pods/cocos2d/cocos2d/ccShader_Position_uColor_vert.h
  88. +11 −0 vendor/Pods/cocos2d/cocos2d/ccShaders.h
  89. +8 −0 vendor/Pods/cocos2d/cocos2d/ccShaders.m
  90. +40 −10 vendor/Pods/cocos2d/cocos2d/ccTypes.h
  91. +15 −2 vendor/Pods/cocos2d/cocos2d/cocos2d.h
  92. +1 −1 vendor/Pods/cocos2d/cocos2d/cocos2d.m
View
@@ -1,4 +1,8 @@
source :rubygems
gem 'motion-cocoapods'
-gem 'bubble-wrap'
+gem 'bubble-wrap', :require => 'bubble-wrap/core'
+
+group :development do
+ gem 'pry'
+end
View
@@ -16,6 +16,7 @@ GEM
open4 (~> 1.3.0)
rake (~> 0.9.0)
xcodeproj (>= 0.3.0)
+ coderay (1.0.7)
colored (1.2)
escape (0.0.4)
faraday (0.8.4)
@@ -25,6 +26,7 @@ GEM
hashie (1.2.0)
i18n (0.6.0)
json (1.7.4)
+ method_source (0.7.1)
motion-cocoapods (1.1.0)
cocoapods (>= 0.9.1)
multi_json (1.3.6)
@@ -36,7 +38,12 @@ GEM
hashie (~> 1.2)
multi_json (~> 1.3)
open4 (1.3.0)
+ pry (0.9.9.6)
+ coderay (~> 1.0.5)
+ method_source (~> 0.7.1)
+ slop (>= 2.4.4, < 3)
rake (0.9.2.2)
+ slop (2.4.4)
xcodeproj (0.3.1)
activesupport (~> 3.2.6)
@@ -46,3 +53,4 @@ PLATFORMS
DEPENDENCIES
bubble-wrap
motion-cocoapods
+ pry
View
@@ -5,7 +5,6 @@ require 'rubygems'
require 'bundler'
Bundler.require :default
-
Motion::Project::App.setup do |app|
app.name = 'blocks'
app.files_dependencies "app/app_delegate.rb" => ["app/commons/cocos2d_app_delegate.rb", "app/commons/touch_sprite.rb"]
@@ -14,14 +13,14 @@ Motion::Project::App.setup do |app|
pod do |s|
s.name = 'cocos2d'
s.license = 'MIT'
- s.version = '2.0.0'
+ s.version = '2.1.0.pre'
s.summary = 'cocos2d for iPhone is a framework for building 2D games, demos, and other graphical/interactive applications for iPod Touch, iPhone, iPad and Mac. It is based on the cocos2d design but instead of using python it, uses objective-c.'
s.homepage = 'http://www.cocos2d-iphone.org'
s.author = {
'Ricardo Quesada' => 'ricardoquesada@gmail.com',
'Zynga Inc.' => 'https://zynga.com/'
}
- s.source = {:git => 'https://github.com/cocos2d/cocos2d-iphone.git', :tag => 'release-2.0'}
+ s.source = {:git => 'https://github.com/cocos2d/cocos2d-iphone.git', :commit => '04d1ad21487de8624243f7905d113c6715537d21'}
s.source_files = ['cocos2d/**/*.{h,m,c}', 'external/kazmath/src/**/*.{c,h}', 'external/kazmath/include/**/*.{c,h}'] +
FileList['external/libpng/*.{h,c}'].exclude(/pngtest/)
s.xcconfig = {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Binary file not shown.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 5d77c8f

Please sign in to comment.