Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 83e95e8 + 6eb341d commit d96f1bd4e00ddc024da2f82c1e74b69a351b448b Viktor Lidholt committed May 17, 2012
Showing with 5,383 additions and 6,474 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 Add to Your Project/cocos2d-iphone/SSZipArchive/LICENSE
  3. +1 −0 Add to Your Project/cocos2d-iphone/SSZipArchive/SSZipArchive.h
  4. +1 −0 Add to Your Project/cocos2d-iphone/SSZipArchive/SSZipArchive.m
  5. +1 −0 Add to Your Project/cocos2d-iphone/SSZipArchive/minizip
  6. +3 −0 CHANGELOG
  7. +0 −2 CocosBuilder/CCLabelTTF/CCBPProperties.plist
  8. +112 −14 CocosBuilder/CocosBuilder.xcodeproj/project.pbxproj
  9. +0 −2 CocosBuilder/ccBuilder/CCBDocument.h
  10. +1 −6 CocosBuilder/ccBuilder/CCBDocument.m
  11. +45 −0 CocosBuilder/ccBuilder/CCBPublisher.h
  12. +287 −0 CocosBuilder/ccBuilder/CCBPublisher.m
  13. +49 −0 CocosBuilder/ccBuilder/CCBWarnings.h
  14. +83 −0 CocosBuilder/ccBuilder/CCBWarnings.m
  15. +31 −2 CocosBuilder/ccBuilder/CocosBuilderAppDelegate.h
  16. +235 −119 CocosBuilder/ccBuilder/CocosBuilderAppDelegate.m
  17. +0 −1 CocosBuilder/ccBuilder/InspectorBlockCCControl.xib
  18. +9 −7 CocosBuilder/ccBuilder/InspectorByte.xib
  19. +7 −6 CocosBuilder/ccBuilder/InspectorDegrees.xib
  20. +7 −6 CocosBuilder/ccBuilder/InspectorFloat.xib
  21. +7 −6 CocosBuilder/ccBuilder/InspectorFloatScale.xib
  22. +9 −7 CocosBuilder/ccBuilder/InspectorFloatVar.xib
  23. +7 −6 CocosBuilder/ccBuilder/InspectorInteger.xib
  24. +9 −7 CocosBuilder/ccBuilder/InspectorPoint.xib
  25. +9 −7 CocosBuilder/ccBuilder/InspectorPointLock.xib
  26. +9 −8 CocosBuilder/ccBuilder/InspectorPosition.xib
  27. +9 −7 CocosBuilder/ccBuilder/InspectorScaleLock.xib
  28. +9 −7 CocosBuilder/ccBuilder/InspectorSize.xib
  29. +2 −0 CocosBuilder/ccBuilder/PlugInExport.h
  30. +4 −2 CocosBuilder/ccBuilder/PlugInExport.m
  31. +1 −1 CocosBuilder/ccBuilder/PositionPropertySetter.m
  32. +53 −0 CocosBuilder/ccBuilder/ProjectSettings.h
  33. +152 −0 CocosBuilder/ccBuilder/ProjectSettings.m
  34. +38 −0 CocosBuilder/ccBuilder/ProjectSettingsWindow.h
  35. +99 −0 CocosBuilder/ccBuilder/ProjectSettingsWindow.m
  36. +1,213 −0 CocosBuilder/ccBuilder/ProjectSettingsWindow.xib
  37. +3 −0 CocosBuilder/ccBuilder/ResourceManager.h
  38. +39 −3 CocosBuilder/ccBuilder/ResourceManager.m
  39. +46 −0 CocosBuilder/ccBuilder/ResourceManagerOutlineHandler.h
  40. +351 −0 CocosBuilder/ccBuilder/ResourceManagerOutlineHandler.m
  41. +5 −3 CocosBuilder/ccBuilder/ResourceManagerPanel.h
  42. +11 −261 CocosBuilder/ccBuilder/ResourceManagerPanel.m
  43. +36 −0 CocosBuilder/ccBuilder/SavePanelLimiter.h
  44. +72 −0 CocosBuilder/ccBuilder/SavePanelLimiter.m
  45. +3 −0 CocosBuilder/ccBuilder/StickyNote.m
  46. +20 −0 CocosBuilder/ccBuilder/TaskStatusWindow.h
  47. +32 −0 CocosBuilder/ccBuilder/TaskStatusWindow.m
  48. +332 −0 CocosBuilder/ccBuilder/TaskStatusWindow.xib
  49. +36 −0 CocosBuilder/ccBuilder/WarningsWindow.h
  50. +57 −0 CocosBuilder/ccBuilder/WarningsWindow.m
  51. +481 −0 CocosBuilder/ccBuilder/WarningsWindow.xib
  52. +926 −368 CocosBuilder/ccBuilder/en.lproj/MainMenu.xib
  53. +52 −0 CocosBuilder/libs/HashValue/HashValue.h
  54. +157 −0 CocosBuilder/libs/HashValue/HashValue.m
  55. +1 −1 CocosBuilder/libs/cocos2d-iphone
  56. +1 −0 CocosBuilder/libs/ssziparchive
  57. +29 −0 CocosBuilderExample/CocosBuilder Files (start here)/Project/CocosBuilderExample.ccbproj
  58. 0 ...e/{CocosBuilderExample/Resources → CocosBuilder Files (start here)/Project}/HelloCocosBuilder.ccb
  59. 0 ...e/{CocosBuilderExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestButtons.ccb
  60. 0 ...le/{CocosBuilderExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestHeader.ccb
  61. 0 ...le/{CocosBuilderExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestLabels.ccb
  62. 0 ...ple/{CocosBuilderExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestMenus.ccb
  63. 0 ...BuilderExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestParticleSystems.ccb
  64. 0 ...ocosBuilderExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestScrollViews.ccb
  65. 0 ...derExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestScrollViewsContentA.ccb
  66. 0 ...e/{CocosBuilderExample/Resources → CocosBuilder Files (start here)/Project/Tests}/TestSprites.ccb
  67. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-a-0.png
  68. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-a-1.png
  69. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-a-2.png
  70. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-b-0.png
  71. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-b-1.png
  72. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-b-2.png
  73. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-back-0.png
  74. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-back-1.png
  75. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-test-0.png
  76. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-test-1.png
  77. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/btn-test-2.png
  78. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/burst-hd.png
  79. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/burst-ipad.png
  80. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/burst.png
  81. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/comic andy.ttf
  82. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/flower.jpg
  83. 0 ...rExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/grossini-generic.plist
  84. BIN ...derExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/grossini-generic.png
  85. BIN ...derExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/jungle-left-ipad.png
  86. BIN ...sBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/jungle-left.png
  87. BIN ...erExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/jungle-right-ipad.png
  88. BIN ...BuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/jungle-right.png
  89. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/jungle.png
  90. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/logo-icon.png
  91. BIN CocosBuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/logo.png
  92. 0 ...rExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/markerfelt24shadow.fnt
  93. BIN ...rExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/markerfelt24shadow.png
  94. BIN ...uilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/particle-fire.png
  95. BIN ...ilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/particle-smoke.png
  96. BIN ...uilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/particle-snow.png
  97. BIN ...ilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/particle-stars.png
  98. BIN ...BuilderExample/{CocosBuilderExample → CocosBuilder Files (start here)}/Resources/scale-9-demo.png
  99. +71 −160 CocosBuilderExample/CocosBuilderExample.xcodeproj/project.pbxproj
  100. +7 −1 CocosBuilderExample/CocosBuilderExample/AppDelegate.m
  101. +11 −0 CocosBuilderExample/CocosBuilderExample/CCBReader.h
  102. +80 −0 CocosBuilderExample/CocosBuilderExample/CCBReader.m
  103. BIN CocosBuilderExample/CocosBuilderExample/Resources/HelloCocosBuilder.ccbi
  104. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestButtons.ccbi
  105. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestHeader.ccbi
  106. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestLabels.ccbi
  107. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestMenus.ccbi
  108. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestParticleSystems.ccbi
  109. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestScrollViews.ccbi
  110. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestScrollViewsContentA.ccbi
  111. BIN CocosBuilderExample/CocosBuilderExample/Resources/TestSprites.ccbi
  112. BIN CocosBuilderExample/CocosBuilderExample/Resources/ccb.zip
  113. +0 −5,448 CocosBuilderExample/CocosBuilderExample/Resources/missing-font.fnt
  114. BIN CocosBuilderExample/CocosBuilderExample/Resources/missing-font.png
  115. +1 −0 CocosBuilderExample/CocosBuilderExample/libs/ssziparchive
  116. +17 −6 Documentation/1. User Guide.md
View
@@ -4,3 +4,6 @@
[submodule "CocosBuilder/libs/CCControlExtension"]
path = CocosBuilder/libs/CCControlExtension
url = https://github.com/vlidholt/CCControlExtension.git
+[submodule "CocosBuilder/libs/ssziparchive"]
+ path = CocosBuilder/libs/ssziparchive
+ url = https://github.com/vlidholt/ssziparchive
View
@@ -5,6 +5,9 @@ version 1.1-beta2 XX-May-2012
. [NEW] Improved support for CCControlButton
. [NEW] Command line tool for publishing files
. [NEW] Added examples/test cases
+. [NEW] CocosBuilder is now project based, with the capability to publish a complete project with a single click
+. [NEW] Support for multiple resource directories
+. [NEW] Support for publishing to zip-files
. [FIX] Various bug fixes, prevent crash when opening ccb files in directories with many sub directories
. [FIX] Snapping to pixels now work in Lion when dragging objects
@@ -50,8 +50,6 @@
<array>
<string>contentSize</string>
</array>
- <key>default</key>
- <integer>12</integer>
<key>displayName</key>
<string>Font size</string>
<key>type</key>

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -37,7 +37,6 @@
BOOL isDirty;
CGPoint stageScrollOffset;
float stageZoom;
- NSDictionary* project;
NSMutableArray* resolutions;
int currentResolution;
@@ -55,7 +54,6 @@
@property (nonatomic,assign) float stageZoom;
@property (nonatomic,readonly) NSString* rootPath;
- (NSString*) formattedName;
-@property (nonatomic,readonly) NSDictionary* project;
@property (nonatomic,retain) NSMutableArray* resolutions;
@property (nonatomic,assign) int currentResolution;
@end
@@ -28,7 +28,7 @@
@implementation CCBDocument
-@synthesize fileName,docData,undoManager, lastEditedProperty, isDirty, stageScrollOffset, stageZoom, exportPath, exportPlugIn,exportFlattenPaths, project, resolutions, currentResolution;
+@synthesize fileName,docData,undoManager, lastEditedProperty, isDirty, stageScrollOffset, stageZoom, exportPath, exportPlugIn,exportFlattenPaths, resolutions, currentResolution;
- (id)init
{
@@ -46,7 +46,6 @@ - (id)init
- (void)dealloc
{
- [project release];
self.exportPath = NULL;
self.exportPlugIn = NULL;
self.lastEditedProperty = NULL;
@@ -74,10 +73,6 @@ - (void) setFileName:(NSString *)fn
[fileName release];
fileName = [fn retain];
}
- // Check for project file
- NSString* projPath = [[fileName stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"Project.ccbproj"];
- project = [NSDictionary dictionaryWithContentsOfFile:projPath];
- [project retain];
}
@end
@@ -0,0 +1,45 @@
+/*
+ * CocosBuilder: http://www.cocosbuilder.com
+ *
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class ProjectSettings;
+@class CCBWarnings;
+
+@interface CCBPublisher : NSObject
+{
+ ProjectSettings* projectSettings;
+ CCBWarnings* warnings;
+ NSString* outputDir;
+ NSArray* copyExtensions;
+ NSString* publishFormat;
+}
+
+@property (nonatomic,copy) NSString* publishFormat;
+
+- (id) initWithProjectSettings:(ProjectSettings*)settings warnings:(CCBWarnings*)w;
+- (void) publish;
++ (void) cleanAllCacheDirectories;
+
+@end
Oops, something went wrong.

0 comments on commit d96f1bd

Please sign in to comment.