cocos2d · JerryWong0119 · Jan 24, 2013 · Jan 25, 2013 · Jan 25, 2013 · Jan 25, 2013
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,5 @@ Backup[ ]of[ ]*.numbers/
 *priv.pem
 
 *.ccbresourcelog
-CocosPlayer/CocosPlayer.xcodeproj/xcshareddata/xcschemes/CocosPlayer.xcscheme
+CocosPlayer/CocosPlayer.xcodeproj/xcshareddata/xcschemes/CocosPlayer.xcscheme
+Version.txt
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "CocosBuilder/libs/cocos2d-iphone"]
 	path = CocosBuilder/libs/cocos2d-iphone
 	url = https://github.com/cocos2d/cocos2d-iphone.git
-[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
 [submodule "CocosBuilder/libs/Fragaria"]
 	path = CocosBuilder/libs/Fragaria
 	url = https://github.com/vlidholt/Fragaria.git
+[submodule "Examples/CocosBuilderExample/libs/CCBReader"]
+	path = Examples/CocosBuilderExample/libs/CCBReader
+	url = git://github.com/cocos2d/CCBReader.git
diff --git a/AUTHORS b/AUTHORS
@@ -5,22 +5,28 @@ Lead developer:
 
 People/companies who were/are contributing code to CocosBuilder (alphabetically ordered):
 
+* Stacey Abshire (http://www.4haks.net)
+    Bug fix in sprite sheet generation
+
 * Martin Côté (http://loopycube.com/)
     Bug fixes to how CCLabelBMFont is displayed in the editor
     Fixed memory leak in CCBReader
 
 * Trey Davis (http://www.drixel.com)
     Added disclosure triangles to property inpector
 
+* Rohan Kuruvilla
+    Added support for running in CocosPlayer Android
+
+* Donald Alan Morrison (http://wikileaks.org/)
+    Fixed memory leaks
+
 * Ian Oliver (http://www.trivialtechnology.com/)
     Made the help menu working
 
 * Mark Onyschuk
     Added support for ignoring directories in resource manager
 
-* Donald Alan Morrison (http://wikileaks.org/)
-    Fixed memory leaks
-
 * Joel Petersen (http://www.zynga.com/)
     Fixed crash in CCBReader
     Added support for CCAnimations
@@ -31,7 +37,18 @@ People/companies who were/are contributing code to CocosBuilder (alphabetically
 
 * Ricardo Quesada (http://www.cocos2d-iphone.org/)
     Updated CocosBuilder to work with cocos2d-iphone version 2
+    Lots of major and minor bug fixes related to compatibility with cocos2d
 
 * Gwynne Raskind (URL http://blog.darkrainfall.org/)
     Added command line tool for publishing files
+
+* Aris Tzoumas
+    Bug fixes
+    Fixed memory leaks
+    Added smoother zooming in canvas and timeline
+    Show/Hide functionality for Resources & Inspector Panels
+    Frame skipping for playback
+    Added padding to start/end of timline view
+    Speedup mousewheel scrolling for timeline
+    Added support for delegating interpolation frame drawing to the node-plugin
 
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBAnimationManager.h b/Add to Your Project/cocos2d-iphone/CCBReader/CCBAnimationManager.h
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBAnimationManager.m b/Add to Your Project/cocos2d-iphone/CCBReader/CCBAnimationManager.m
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBKeyframe.h b/Add to Your Project/cocos2d-iphone/CCBReader/CCBKeyframe.h
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBKeyframe.m b/Add to Your Project/cocos2d-iphone/CCBReader/CCBKeyframe.m
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBReader.h b/Add to Your Project/cocos2d-iphone/CCBReader/CCBReader.h
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBReader.m b/Add to Your Project/cocos2d-iphone/CCBReader/CCBReader.m
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBSequence.h b/Add to Your Project/cocos2d-iphone/CCBReader/CCBSequence.h
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBSequenceProperty.h b/Add to Your Project/cocos2d-iphone/CCBReader/CCBSequenceProperty.h
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBSequenceProperty.m b/Add to Your Project/cocos2d-iphone/CCBReader/CCBSequenceProperty.m
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCBsequence.m b/Add to Your Project/cocos2d-iphone/CCBReader/CCBsequence.m
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCNode+CCBRelativePositioning.h b/Add to Your Project/cocos2d-iphone/CCBReader/CCNode+CCBRelativePositioning.h
diff --git a/Add to Your Project/cocos2d-iphone/CCBReader/CCNode+CCBRelativePositioning.m b/Add to Your Project/cocos2d-iphone/CCBReader/CCNode+CCBRelativePositioning.m
diff --git a/Add to Your Project/cocos2d-iphone/CCControlExtension b/Add to Your Project/cocos2d-iphone/CCControlExtension
diff --git a/Add to Your Project/cocos2d-iphone/CCScrollView b/Add to Your Project/cocos2d-iphone/CCScrollView
diff --git a/Add to Your Project/cocos2d-iphone/SSZipArchive/LICENSE b/Add to Your Project/cocos2d-iphone/SSZipArchive/LICENSE
diff --git a/Add to Your Project/cocos2d-iphone/SSZipArchive/SSZipArchive.h b/Add to Your Project/cocos2d-iphone/SSZipArchive/SSZipArchive.h
diff --git a/Add to Your Project/cocos2d-iphone/SSZipArchive/SSZipArchive.m b/Add to Your Project/cocos2d-iphone/SSZipArchive/SSZipArchive.m
diff --git a/Add to Your Project/cocos2d-iphone/SSZipArchive/minizip b/Add to Your Project/cocos2d-iphone/SSZipArchive/minizip
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,43 @@
+version 3.0-alpha4 1-May-2012
+. [NEW] Publish and run in browser
+. [NEW] Improved autocomplete in text editor
+. [NEW] Improved syntax coloring in text editor
+. [NEW] Live syntax checks in text editor
+. [NEW] Visual debugger for JS projects
+. [FIX] Improved CocosPlayer for cocos2d-x
+. [NEW] Publisher will ask to save files before publishing
+. [NEW] New smart sprite sheet options for Android and web
+
+version 3.0-alpha3 20-Mar-2013
+. [NEW] Improved default project structure
+. [NEW] Support for sound playback from timeline
+. [NEW] Support for callbacks from timeline
+. [FIX] Better JS support
+. [NEW] Skew properties can now be animated on timeline
+
+version 3.0-alpha2 7-Feb-2013
+. [NEW] Much improved JS support
+. [NEW] CocosPlayer support for Android (in cocos2d-x)
+. [NEW] Support for PVR & PVRTC when exporting sprite sheets
+
+version 3.0-alpha1 30-Jan-2013
+. [NEW] Built in texture packer
+. [NEW] Automatic scaling of assets
+. [NEW] Sound conversions for different target platforms
+. [NEW] Improved support for cocos2d-x
+. [NEW] Improved publishing for Android
+. [NEW] CocosPlayer
+
+version 3.0-alpha0 12-Dec-2012
+. [NEW] Added support for Javascript
+. [NEW] Added smoother zooming in canvas and timeline
+. [NEW] Show/Hide functionality for Resources & Inspector Panels
+. [FIX] Fixed memory leaks in CCBReader and CocosBuilder
+. [NEW] Frame skipping for playback
+. [NEW] Added padding to start/end of timline view
+. [NEW] Speedup mousewheel scrolling for timeline
+. [NEW] Added support for delegating interpolation frame drawing to the node-plugin
+
 version 2.1-rc2 2-Oct-2012
 . [FIX] Fixed crashing bug when publishing
 . [FIX] Nodes' visibility is now correctly saved

diff --git a/CocosBuilder/CCLabelBMFont/CCBPProperties.plist b/CocosBuilder/CCLabelBMFont/CCBPProperties.plist
@@ -86,6 +86,11 @@
 			<string>color</string>
 		</dict>
 		<dict>
+			<key>default</key>
+			<array>
+				<integer>1</integer>
+				<integer>771</integer>
+			</array>
 			<key>defaultSerialization</key>
 			<array>
 				<integer>1</integer>

diff --git a/CocosBuilder/CCLayer/CCBPProperties.plist b/CocosBuilder/CCLayer/CCBPProperties.plist
@@ -36,7 +36,7 @@
 			<key>type</key>
 			<string>Check</string>
 			<key>name</key>
-			<string>isTouchEnabled</string>
+			<string>touchEnabled</string>
 		</dict>
 		<dict>
 			<key>defaultSerialization</key>
@@ -52,7 +52,7 @@
 			<key>type</key>
 			<string>Check</string>
 			<key>name</key>
-			<string>isAccelerometerEnabled</string>
+			<string>accelerometerEnabled</string>
 		</dict>
 		<dict>
 			<key>defaultSerialization</key>
@@ -68,7 +68,7 @@
 			<key>type</key>
 			<string>Check</string>
 			<key>name</key>
-			<string>isMouseEnabled</string>
+			<string>mouseEnabled</string>
 		</dict>
 		<dict>
 			<key>defaultSerialization</key>
@@ -84,7 +84,7 @@
 			<key>type</key>
 			<string>Check</string>
 			<key>name</key>
-			<string>isKeyboardEnabled</string>
+			<string>keyboardEnabled</string>
 		</dict>
 	</array>
 	<key>editorClassName</key>

diff --git a/CocosBuilder/CCLayerColor/CCBPProperties.plist b/CocosBuilder/CCLayerColor/CCBPProperties.plist
@@ -37,8 +37,6 @@
 			<string>color</string>
 		</dict>
 		<dict>
-			<key>defaultSerialization</key>
-			<integer>255</integer>
 			<key>animatable</key>
 			<true/>
 			<key>default</key>

diff --git a/CocosBuilder/CCMenu/CCBPMenu.h b/CocosBuilder/CCMenu/CCBPMenu.h
@@ -26,4 +26,6 @@
 
 @interface CCBPMenu : CCMenu
 
+@property (nonatomic,assign) BOOL isMouseEnabled;
+
 @end
diff --git a/CocosBuilder/CCMenu/CCBPMenu.m b/CocosBuilder/CCMenu/CCBPMenu.m
@@ -23,6 +23,7 @@
  */
 
 #import "CCBPMenu.h"
+#import "CCNode+NodeInfo.h"
 
 @implementation CCBPMenu
 
@@ -31,9 +32,20 @@ - (id) init
     self = [super init];
     if (!self) return NULL;
 
-    self.isMouseEnabled = NO;
+    self.mouseEnabled = NO;
 
     return self;
 }
 
+/*
+- (void) setIsMouseEnabled:(BOOL)isMouseEnabled
+{
+    self.mouseEnabled = isMouseEnabled;
+}
+
+- (BOOL) isMouseEnabled
+{
+    return self.mouseEnabled;
+}*/
+
 @end
diff --git a/CocosBuilder/CCMenu/CCBPProperties.plist b/CocosBuilder/CCMenu/CCBPProperties.plist
@@ -37,7 +37,7 @@
 			<key>type</key>
 			<string>Check</string>
 			<key>name</key>
-			<string>isTouchEnabled</string>
+			<string>touchEnabled</string>
 		</dict>
 		<dict>
 			<key>default</key>

diff --git a/CocosBuilder/CCNode/CCBPProperties.plist b/CocosBuilder/CCNode/CCBPProperties.plist
@@ -29,6 +29,18 @@
 			<key>name</key>
 			<string>CCNode</string>
 		</dict>
+		<dict>
+			<key>animatable</key>
+			<true/>
+			<key>defaultSerialization</key>
+			<true/>
+			<key>type</key>
+			<string>Check</string>
+			<key>name</key>
+			<string>visible</string>
+			<key>displayName</key>
+			<string>Visible</string>
+		</dict>
 		<dict>
 			<key>defaultSerialization</key>
 			<array>
@@ -102,31 +114,60 @@
 		</dict>
 		<dict>
 			<key>defaultSerialization</key>
-			<integer>-1</integer>
+			<integer>0</integer>
+			<key>animatable</key>
+			<true/>
 			<key>type</key>
-			<string>Integer</string>
+			<string>Degrees</string>
 			<key>name</key>
-			<string>tag</string>
+			<string>rotationX</string>
 			<key>displayName</key>
-			<string>Tag</string>
+			<string>RotationX</string>
 		</dict>
 		<dict>
+			<key>defaultSerialization</key>
+			<integer>0</integer>
+			<key>animatable</key>
+			<true/>
 			<key>type</key>
-			<string>Check</string>
+			<string>Degrees</string>
 			<key>name</key>
-			<string>ignoreAnchorPointForPosition</string>
+			<string>rotationY</string>
 			<key>displayName</key>
-			<string>Ignore anchor point</string>
+			<string>RotationY</string>
 		</dict>
 		<dict>
-			<key>defaultSerialization</key>
+			<key>animatable</key>
 			<true/>
+			<key>defaultSerialization</key>
+			<array>
+				<integer>0</integer>
+				<integer>0</integer>
+			</array>
+			<key>type</key>
+			<string>FloatXY</string>
+			<key>name</key>
+			<string>skew</string>
+			<key>displayName</key>
+			<string>Skew</string>
+		</dict>
+		<dict>
+			<key>defaultSerialization</key>
+			<integer>-1</integer>
+			<key>type</key>
+			<string>Integer</string>
+			<key>name</key>
+			<string>tag</string>
+			<key>displayName</key>
+			<string>Tag</string>
+		</dict>
+		<dict>
 			<key>type</key>
 			<string>Check</string>
 			<key>name</key>
-			<string>visible</string>
+			<string>ignoreAnchorPointForPosition</string>
 			<key>displayName</key>
-			<string>Visible</string>
+			<string>Ignore anchor point</string>
 		</dict>
 	</array>
 	<key>propertiesOverridden</key>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,6 @@

		@interface CCBPMenu : CCMenu

		@property (nonatomic,assign) BOOL isMouseEnabled;

		@end