Merge https://github.com/cocos2d/cocos2d-html5 into webgl20

Author: linshun

AUTHORS.txt

@@ -15,8 +15,34 @@ Core Developers:
     Ricardo Quesada
 
 
-Developers:
-   
+Contributors:
+Name                GithubID    Main contribution
+
+Dali Kilani         @dadilcool  added instruction to read me
+
+Chris               @hannon235	added node.js api for box2d
+
+Jason Aeschliman    @jaeschliman  fix cc.Node setposition
+
+Sun Zhuoshi(Intel)  @sunzhuoshi	engine loader fix
+
+Alejandro Reyero    @KaTXi      fix error message
+
+Long Xiang          @seanlong   resource loader count
+
+Timm Drevensek(Zynga)  @timmjd  cc.Class fix
+                                add CCScale9Sprite test
+
+Lzzy Chen           @czizzy     audio engine fix
+			                    cleanup comments
+
+Mcscooter           @mcscooter  tilempapxml fix
+
+Roed                @roed       mouse rightclick api
+
+Surith Thekkiam(Zynga)  @folecr  match Cocos2dx api
+
+Robert Boyd         @rboyd       fix stackable actions
 
 
 Cocos2d-x and cocos2d-html5 can not grow so fast without the active community.

CHANGELOG.txt

@@ -1,44 +1,54 @@
+Cocos2d-html5-v2.1.1 @ Jan.28, 2013
+* Fixed bugs
+* Added mouse button to MouseDispatcher, supports right-click
+* Changed  preload audio type from "bgm" and "effect" to "sound"
+* Added "Sys" class for system capabilities
+* Improved cc.BuilderReader to support .ccbi extension auto-completion
+* Improved TMXXMLParser to support XML, CSV and zlib compression
+* Changed cc.Time.gettimeofdayCocos2d to Date.now which is more javascript friendly.
+* Added support for stackable actions
+
 Cocos2d-html5-v2.1.0 @ Dec.4, 2012
-* Improved cc.Class and add Release Mode.
-* All tests and games can now be run on Cocos2d-html5, Cocos2d-iPhone and Cocos2d-x.
-* Added support for google.base.
-* Added support for CocosBuilder and Bone Animation.
-* Updated API for Javascript Binding.
-* Integrated Chipmunk physical engine and chipmunk tests.
-* Added physicsDebugNode, physicsSprite, drawNode.
-* Built cocos2d-js-tests repo for tests.
-* Fixed support for mouse/touch/keyboard.
-* Fixed bugs.
-* Added WaterMelon with me and CocosDragon games for sample.
-* Added Edit Box for input.
+* Improved cc.Class and add Release Mode
+* All tests and games can now be run on Cocos2d-html5, Cocos2d-iPhone and Cocos2d-x
+* Added support for google.base
+* Added support for CocosBuilder and Bone Animation
+* Updated API for Javascript Binding
+* Integrated Chipmunk physical engine and chipmunk tests
+* Added physicsDebugNode, physicsSprite, drawNode
+* Built cocos2d-js-tests repo for tests
+* Fixed support for mouse/touch/keyboard
+* Fixed bugs
+* Added WaterMelon with me and CocosDragon games for sample
+* Added Edit Box for input
 
 Cocos2d-html5-v2.0.0 @ Aug.28, 2012
-* Updated API to Cocos2d-x V2.0.
-* Updated template and directory name.
-* Improved JS files loader.
-* Added support for Dom rendering.
-* Updated JSDoc comments and shell.
-* Added TileMap property process and flip.
-* Improved BMFont.
-* Added Actions spline paths and cc.AnimationFrame.
-* Added support for multi-touch.
-* Added mini-framework for Dom manipulation.
-* Changed cc.Animation, cc.AudioEngine, cc.LableTTF and cc.Sprite API.
+* Updated API to Cocos2d-x V2.0
+* Updated template and directory name
+* Improved JS files loader
+* Added support for Dom rendering
+* Updated JSDoc comments and shell
+* Added TileMap property process and flip
+* Improved BMFont
+* Added Actions spline paths and cc.AnimationFrame
+* Added support for multi-touch
+* Added mini-framework for Dom manipulation
+* Changed cc.Animation, cc.AudioEngine, cc.LableTTF and cc.Sprite API
 
 
 Cocos2d-html5-v0.5.0-alpha2 @ Jun.18, 2012
-* Changed API, use "create" to construct all objects.
-* Fixed naming of variables.
-* Added JSDoc comments and shell.
-* Fixed Dom Menu flicker bug.
-* Changed code for closure compiler Advance optional.
-* Added version control.
+* Changed API, use "create" to construct all objects
+* Fixed naming of variables
+* Added JSDoc comments and shell
+* Fixed Dom Menu flicker bug
+* Changed code for closure compiler Advance optional
+* Added version control
 
 Cocos2d-html5-v0.5.0-alpha @ May.28, 2012
-* supports canvas and Dom Menu.
-* part of test cases were added and tested in chrome.
-* porting from cocos2d-x is not finished.
-* files must load from http server.
+* supports canvas and Dom Menu
+* part of test cases were added and tested in chrome
+* porting from cocos2d-x is not finished
+* files must load from http server
 
 Cocos2d-html5-v0.1.0 @ Jan.29, 2012
 * Build the directory structure of Engine

Demo/NativeClientDemo/cocos2d.js

@@ -27,7 +27,6 @@
 (function () {
     var d = document;
     var c = {
-        menuType:'canvas', //whether to use canvas mode menu or dom menu
         COCOS2D_DEBUG:2, //0 to turn debug off, 1 for basic debug, and 2 for full debug
         box2d:false,
         chipmunk:false,

HelloHTML5World/build.xml

@@ -6,40 +6,74 @@
 
     <target name="compile">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="myApp-v0.1.js">
+                debug="false" output="myApp-HelloWorld.js">
             <sources dir="${basedir}/../cocos2d">
                 <file name="platform/CCClass.js"/>
                 <file name="platform/CCCommon.js"/>
-                <file name="platform/platform.js"/>
                 <file name="platform/miniFramework.js"/>
+                <file name="platform/ZipUtils.js"/>
+                <file name="platform/base64.js"/>
+                <file name="platform/gzip.js"/>
+                <file name="platform/CCMacro.js"/>
+                <file name="platform/CCFileUtils.js"/>
+                <file name="platform/CCTypes.js"/>
+                <file name="platform/zlib.min.js"/>
                 <file name="cocoa/CCGeometry.js"/>
-                <file name="cocoa/CCSet.js"/>
+                <file name="platform/Sys.js"/>
+                <file name="platform/CCConfig.js"/>
                 <file name="cocoa/CCNS.js"/>
-                <file name="platform/CCTypes.js"/>
+                <file name="cocoa/CCSet.js"/>
                 <file name="cocoa/CCAffineTransform.js"/>
                 <file name="support/CCPointExtension.js"/>
+                <file name="support/CCUserDefault.js"/>
                 <file name="base_nodes/CCNode.js"/>
                 <file name="base_nodes/CCdomNode.js"/>
-                <file name="platform/CCMacro.js"/>
-                <file name="platform/CCConfig.js"/>
+                <file name="base_nodes/CCAtlasNode.js"/>
                 <file name="textures/CCTexture2D.js"/>
                 <file name="textures/CCTextureCache.js"/>
+                <file name="textures/CCTextureAtlas.js"/>
+                <file name="misc_nodes/CCRenderTexture.js"/>
+                <file name="misc_nodes/CCProgressTimer.js"/>
+                <file name="effects/CCGrid.js"/>
+                <file name="effects/CCGrabber.js"/>
                 <file name="actions/CCAction.js"/>
                 <file name="actions/CCActionInterval.js"/>
+                <file name="actions/CCActionInstant.js"/>
                 <file name="actions/CCActionManager.js"/>
+                <file name="actions/CCActionProgressTimer.js"/>
+                <file name="actions/CCActionCamera.js"/>
                 <file name="actions/CCActionEase.js"/>
+                <file name="actions/CCActionGrid.js"/>
+                <file name="actions/CCActionTiledGrid.js"/>
+                <file name="actions/CCActionCatmullRom.js"/>
                 <file name="layers_scenes_transitions_nodes/CCScene.js"/>
                 <file name="layers_scenes_transitions_nodes/CCLayer.js"/>
                 <file name="layers_scenes_transitions_nodes/CCTransition.js"/>
+                <file name="layers_scenes_transitions_nodes/CCTransitionProgress.js"/>
+                <file name="layers_scenes_transitions_nodes/CCTransitionPageTurn.js"/>
                 <file name="sprite_nodes/CCSprite.js"/>
+                <file name="sprite_nodes/CCAnimation.js"/>
+                <file name="sprite_nodes/CCAnimationCache.js"/>
+                <file name="sprite_nodes/CCSpriteFrame.js"/>
+                <file name="sprite_nodes/CCSpriteFrameCache.js"/>
+                <file name="sprite_nodes/CCSpriteBatchNode.js"/>
+                <file name="label_nodes/CCLabelAtlas.js"/>
                 <file name="label_nodes/CCLabelTTF.js"/>
-                <file name="text_input_node/CCIMEDispatcher.js"/>
+                <file name="label_nodes/CCLabelBMFont.js"/>
+                <file name="particle_nodes/CCParticleSystem.js"/>
+                <file name="particle_nodes/CCParticleBatchNode.js"/>
+                <file name="particle_nodes/CCParticleSystemQuad.js"/>
+                <file name="particle_nodes/CCParticleExamples.js"/>
                 <file name="touch_dispatcher/CCTouchDelegateProtocol.js"/>
                 <file name="touch_dispatcher/CCTouchHandler.js"/>
                 <file name="touch_dispatcher/CCTouchDispatcher.js"/>
-                <file name="keypad_dispatcher/CCKeypadDelegate.js"/>
-                <file name="keypad_dispatcher/CCKeypadDispatcher.js"/>
+                <file name="touch_dispatcher/CCMouseDispatcher.js"/>
+                <file name="keyboard_dispatcher/CCKeyboardDelegate.js"/>
+                <file name="keyboard_dispatcher/CCKeyboardDispatcher.js"/>
+                <file name="text_input_node/CCIMEDispatcher.js"/>
+                <file name="text_input_node/CCTextFieldTTF.js"/>
                 <file name="CCDirector.js"/>
+                <file name="CCCamera.js"/>
                 <file name="CCScheduler.js"/>
                 <file name="CCLoader.js"/>
                 <file name="CCDrawingPrimitives.js"/>
@@ -48,10 +82,47 @@
                 <file name="platform/AppControl.js"/>
                 <file name="menu_nodes/CCMenuItem.js"/>
                 <file name="menu_nodes/CCMenu.js"/>
+                <file name="tileMap_parallax_nodes/CCTMXTiledMap.js"/>
+                <file name="tileMap_parallax_nodes/CCTMXXMLParser.js"/>
+                <file name="tileMap_parallax_nodes/CCTMXObjectGroup.js"/>
+                <file name="tileMap_parallax_nodes/CCTMXLayer.js"/>
+                <file name="tileMap_parallax_nodes/CCParallaxNode.js"/>
+                <file name="Draw_Nodes/CCDrawNode.js"/>
+                <file name="physics_nodes/CCPhysicsDebugNode.js"/>
+                <file name="physics_nodes/CCPhysicsSprite.js"/>
             </sources>
             <sources dir="${basedir}/../CocosDenshion">
                 <file name="SimpleAudioEngine.js"/>
             </sources>
+            <!-- extensions -->
+            <sources dir="${basedir}/../extensions">
+                <file name="CCBReader/CCBReaderUtil.js"/>
+                <file name="CCBReader/CCBValue.js"/>
+                <file name="CCBReader/CCBKeyframe.js"/>
+                <file name="CCBReader/CCBSequence.js"/>
+                <file name="CCBReader/CCNodeLoader.js"/>
+                <file name="CCBReader/CCBReader.js"/>
+                <file name="CCBReader/CCControlLoader.js"/>
+                <file name="CCBReader/CCSpriteLoader.js"/>
+                <file name="CCBReader/CCNodeLoaderLibrary.js"/>
+                <file name="CCBReader/CCBRelativePositioning.js"/>
+                <file name="CCBReader/CCBAnimationManager.js"/>
+                <file name="GUI/CCControlExtension/CCControl.js"/>
+                <file name="GUI/CCControlExtension/CCControlButton.js"/>
+                <file name="GUI/CCControlExtension/CCControlUtils.js"/>
+                <file name="GUI/CCControlExtension/CCInvocation.js"/>
+                <file name="GUI/CCControlExtension/CCScale9Sprite.js"/>
+                <file name="GUI/CCControlExtension/CCControlSlider.js"/>
+                <file name="GUI/CCControlExtension/CCControlSwitch.js"/>
+                <file name="GUI/CCControlExtension/CCControlColourPicker.js"/>
+                <file name="GUI/CCControlExtension/CCControlHuePicker.js"/>
+                <file name="GUI/CCControlExtension/CCControlSaturationBrightnessPicker.js"/>
+                <file name="GUI/CCControlExtension/CCMenuPassive.js"/>
+                <file name="GUI/CCScrollView/CCSorting.js"/>
+                <file name="GUI/CCScrollView/CCScrollView.js"/>
+                <file name="GUI/CCScrollView/CCTableView.js"/>
+                <file name="CCControlEditBox.js"/>
+            </sources>
             <sources dir="${basedir}">
                 <file name="src/resource.js"/>
                 <file name="src/myApp.js"/>

chipmunk/chipmunk.js

@@ -27,13 +27,12 @@
     };
 
 //var VERSION = CP_VERSION_MAJOR + "." + CP_VERSION_MINOR + "." + CP_VERSION_RELEASE;
-
     var cp;
     if(typeof exports === 'undefined'){
         cp = {};
 
         if(typeof window === 'object'){
-            window.cp = cp;
+            window["cp"] = cp;
         }
     } else {
         cp = exports;
@@ -3370,7 +3369,7 @@
 
     SegmentShape.prototype.collisionTable = [
         null,
-        function(seg, seg) { return NONE; }, // seg2seg
+        function(seg, seg2) { return NONE; }, // seg2seg
         seg2poly
     ];
 

cocos2d/CCDirector.js

@@ -169,25 +169,23 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     _watcherFun:null,
     _watcherSender:null,
 
-    _currTimeValue:null,
     _isBlur:false,
 
     /**
      * Constructor
      */
     ctor:function () {
-        this._currTimeValue = new cc.timeval();
-        this._lastUpdate = new cc.timeval();
+        this._lastUpdate = Date.now();
         if(!cc.isAddedHiddenEvent){
             var selfPointer = this;
             window.addEventListener("focus",function(){
-                selfPointer._lastUpdate = cc.Time.gettimeofdayCocos2d(selfPointer._lastUpdate);
+                selfPointer._lastUpdate = Date.now();
             }, false);
         }
     },
 
     _resetLastUpdate:function(){
-        this._lastUpdate = cc.Time.gettimeofdayCocos2d(this._lastUpdate);
+        this._lastUpdate = Date.now();
     },
 
     /**
@@ -213,7 +211,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         this._frameRate = 0;
         this._displayStats = false;//can remove
         this._totalFrames = this._frames = 0;
-        this._lastUpdate = new cc.timeval();
+        this._lastUpdate = Date.now();
 
         //Paused?
         this._paused = false;
@@ -255,29 +253,22 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
      * calculates delta time since last time it was called
      */
     calculateDeltaTime:function () {
-        var now = cc.Time.gettimeofdayCocos2d(this._currTimeValue);
-        if (!now) {
-            cc.log("error in gettimeofday");
-            this._deltaTime = 0;
-            return;
-        }
+        var now = Date.now();
 
         // new delta time.
         if (this._nextDeltaTimeZero) {
             this._deltaTime = 0;
             this._nextDeltaTimeZero = false;
         } else {
-            this._deltaTime = (now.tv_sec - this._lastUpdate.tv_sec) + (now.tv_usec - this._lastUpdate.tv_usec) / 1000000.0;
-            this._deltaTime = Math.max(0, this._deltaTime);
+            this._deltaTime = (now-this._lastUpdate) / 1000;
         }
 
         if (cc.DEBUG) {
             if (this._deltaTime > 0.2) {
                 this._deltaTime = 1 / 60.0;
             }
         }
-        this._lastUpdate.tv_sec = now.tv_sec;
-        this._lastUpdate.tv_usec = now.tv_usec;
+        this._lastUpdate = now;
     },
 
     /**
@@ -668,7 +659,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         //this.addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
 
         this.setAnimationInterval(this._oldAnimationInterval);
-        this._lastUpdate = cc.Time.gettimeofdayCocos2d();
+        this._lastUpdate = Date.now();
         if (!this._lastUpdate) {
             cc.log("cocos2d: Director: Error in gettimeofday");
         }
@@ -1143,9 +1134,8 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     },
 
     _calculateMPF:function () {
-        var now = cc.Time.gettimeofdayCocos2d();
-
-        this._secondsPerFrame = (now.tv_sec - this._lastUpdate.tv_sec) + (now.tv_usec - this._lastUpdate.tv_usec) / 1000000.0;
+        var now = Date.now();
+        this._secondsPerFrame = (now-this._lastUpdate)/1000;
     }
 });
 
@@ -1173,7 +1163,7 @@ cc.DisplayLinkDirector = cc.Director.extend(/** @lends cc.DisplayLinkDirector# *
      * start Animation
      */
     startAnimation:function () {
-        this._lastUpdate = cc.Time.gettimeofdayCocos2d();
+        this._nextDeltaTimeZero = true;
         this.invalid = false;
         cc.Application.sharedApplication().setAnimationInterval(this._animationInterval);
     },