From 8d79cb338f2025397dfe1fd08e326de237f7b63b Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Tue, 9 Jan 2018 09:50:33 +0800 Subject: [PATCH 01/74] fix __ctor__ api for fireball/issues/6806 --- cocos2d/core/platform/CCClass.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/platform/CCClass.js b/cocos2d/core/platform/CCClass.js index c6b8941c26..22a9c0a245 100644 --- a/cocos2d/core/platform/CCClass.js +++ b/cocos2d/core/platform/CCClass.js @@ -832,7 +832,7 @@ function declareProperties (cls, className, properties, baseClass, mixins, es6) * @param {String} [options.name] - The class name used for serialization. * @param {Function} [options.extends] - The base class. * @param {Function} [options.ctor] - The constructor. - * @param {Function} [options.__ctor__] - The same as ctor, but less encapsulated. + * @param {Function} [options.__ctor__] - The same as ctor, but less encapsulated. * @param {Object} [options.properties] - The property definitions. * @param {Object} [options.statics] - The static members. * @param {Function[]} [options.mixins] From 4e45ea985cd50efa08a99f898ea2d7be482e672f Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Thu, 11 Jan 2018 10:01:13 +0800 Subject: [PATCH 02/74] improve api --- cocos2d/core/platform/js.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/platform/js.js b/cocos2d/core/platform/js.js index 3c99593e6f..d318d12a6e 100644 --- a/cocos2d/core/platform/js.js +++ b/cocos2d/core/platform/js.js @@ -574,7 +574,7 @@ var REGEXP_STR = /%s/; /** * A string tool to construct a string with format string. * @method formatStr - * @param {String|any} msg - A JavaScript string containing zero or more substitution strings. + * @param {String|any} msg - A JavaScript string containing zero or more substitution strings (%s). * @param {any} ...subst - JavaScript objects with which to replace substitution strings within msg. This gives you additional control over the format of the output. * @returns {String} * @example From 73d6435de54af3576f1fd129cd52fecf0cace026 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Fri, 12 Jan 2018 15:56:38 +0800 Subject: [PATCH 03/74] improve setLineHeight warning --- jsb/jsb-label.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsb/jsb-label.js b/jsb/jsb-label.js index 65d219183e..89173f65f1 100644 --- a/jsb/jsb-label.js +++ b/jsb/jsb-label.js @@ -113,7 +113,10 @@ jsbLabel.prototype.setLineHeight = function (height) { this._setLineHeight(height); } else { - cc.warnID(4013); + // Todo support setLineHeight for Native + if (40 !== height) { + cc.warnID(4013); + } } }; From 935eea691ee68af8cccb3c41e1eb179920e48952 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Mon, 15 Jan 2018 17:04:18 +0800 Subject: [PATCH 04/74] fix dragonbones api --- extensions/dragonbones/ArmatureDisplay.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index 7ed4f345fa..3a05c9aaf7 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -481,13 +481,14 @@ dragonBones.ArmatureDisplay = cc.Class({ * !#zh * 添加 DragonBones 事件监听器。 * @method addEventListener - * @param {dragonBones.EventObject} eventType - * @param {function} listener - * @param {Object} target + * @param {String} type - A string representing the event type to listen for. + * @param {Function} listener - The callback that will be invoked when the event is dispatched. + * @param {Event} listener.event event + * @param {Object} [target] - The target (this object) to invoke the callback, can be null */ - addEventListener: function (eventType, listener, target) { + addEventListener: function (type, listener, target) { if (this._sgNode) { - this._sgNode.addEvent(eventType, listener, target); + this._sgNode.addEvent(type, listener, target); } }, @@ -497,9 +498,9 @@ dragonBones.ArmatureDisplay = cc.Class({ * !#zh * 移除 DragonBones 事件监听器。 * @method removeEventListener - * @param {dragonBones.EventObject} eventType - * @param {function} listener - * @param {Object} target + * @param {String} type - A string representing the event type to listen for. + * @param {Function} [listener] + * @param {Object} [target] */ removeEventListener: function (eventType, listener, target) { if (this._sgNode) { From 3afa2c76eb40b5d08c0eb6cbeccbb58b46e12939 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 17 Jan 2018 13:36:55 +0800 Subject: [PATCH 05/74] Adds empty implementation of cc.Device.getBatteryLevel/getNetworkType for web. --- cocos2d/core/platform/CCDevice.js | 18 ++++++++++++++++++ cocos2d/core/platform/index.js | 1 + gulp/tasks/engine.js | 1 + 3 files changed, 20 insertions(+) create mode 100644 cocos2d/core/platform/CCDevice.js diff --git a/cocos2d/core/platform/CCDevice.js b/cocos2d/core/platform/CCDevice.js new file mode 100644 index 0000000000..04f27614da --- /dev/null +++ b/cocos2d/core/platform/CCDevice.js @@ -0,0 +1,18 @@ +var cc = cc || {}; + +cc.NetworkType = { + NONE: 0, + LAN: 1, + WWAN: 2 +}; + +cc.Device = { + getBatteryLevel: function() { + // TODO: need to implement this for mobile phones. + return 1.0; + }, + getNetworkType: function() { + // TODO: need to implement this for mobile phones. + return cc.NetworkType.LAN; + } +}; diff --git a/cocos2d/core/platform/index.js b/cocos2d/core/platform/index.js index 34c0523e28..0480f9e3f0 100644 --- a/cocos2d/core/platform/index.js +++ b/cocos2d/core/platform/index.js @@ -35,6 +35,7 @@ require('./instantiate'); require('./instantiate-jit'); require('./requiring-frame'); require('./CCSys'); +require('./CCDevice'); require('./CCMacro'); if (!(CC_EDITOR && Editor.isMainProcess)) { diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index 57c662777f..cdc01f981a 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -52,6 +52,7 @@ var jsbSkipModules = [ '../../cocos2d/core/physics/platform/CCPhysicsContactListner.js', '../../cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js', '../../cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js', + '../../cocos2d/core/platform/CCDevice.js', '../../cocos2d/core/platform/CCInputManager.js', '../../cocos2d/core/platform/CCVisibleRect.js', '../../cocos2d/core/camera/CCSGCameraNode.js', From 1d88af11ed0ce7bd220bc594849edf323d773109 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 17 Jan 2018 14:22:19 +0800 Subject: [PATCH 06/74] Adds comments --- cocos2d/core/platform/CCDevice.js | 62 ++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/cocos2d/core/platform/CCDevice.js b/cocos2d/core/platform/CCDevice.js index 04f27614da..ed7308ec3f 100644 --- a/cocos2d/core/platform/CCDevice.js +++ b/cocos2d/core/platform/CCDevice.js @@ -1,16 +1,76 @@ -var cc = cc || {}; +/** + * !#en + * Network type enumeration + * !#zh + * 网络类型枚举 + * + * @enum NetworkType + */ cc.NetworkType = { + /** + * !#en + * Network is unreachable. + * !#zh + * 网络不通 + * + * @property {Number} NONE + */ NONE: 0, + /** + * !#en + * Network is reachable via WiFi or cable. + * !#zh + * 通过无线或者有线本地网络连接因特网 + * + * @property {Number} LAN + */ LAN: 1, + /** + * !#en + * Network is reachable via Wireless Wide Area Network + * !#zh + * 通过蜂窝移动网络连接因特网 + * + * @property {Number} WWAN + */ WWAN: 2 }; +/** + * !#en + * cc.Device is used for getting hardware status of current device. + * !#zh + * cc.Device 用于获取当前设备的系统信息 + * + * @class Device + */ cc.Device = { + /** + * !#en + * Gets the battery level of current device + * !#zh + * 获取当前设备的电池电量 + * + * @method getBatteryLevel + * @return {Number} - 0.0 ~ 1.0 + * @static + */ getBatteryLevel: function() { // TODO: need to implement this for mobile phones. return 1.0; }, + + /** + * !#en + * Gets the network type of current device + * !#zh + * 获取当前设备的网络类型 + * + * @method getNetworkType + * @return {NetworkType} + * @static + */ getNetworkType: function() { // TODO: need to implement this for mobile phones. return cc.NetworkType.LAN; From 67ae8dbf4beb19762412e39feeacaefe49d3bd67 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 17 Jan 2018 14:35:34 +0800 Subject: [PATCH 07/74] update comments. --- cocos2d/core/platform/CCDevice.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/platform/CCDevice.js b/cocos2d/core/platform/CCDevice.js index ed7308ec3f..05bbbe1857 100644 --- a/cocos2d/core/platform/CCDevice.js +++ b/cocos2d/core/platform/CCDevice.js @@ -48,9 +48,9 @@ cc.NetworkType = { cc.Device = { /** * !#en - * Gets the battery level of current device + * Get the battery level of current device, return 1.0 if failure. * !#zh - * 获取当前设备的电池电量 + * 获取当前设备的电池电量,如果电量无法获取,默认将返回 1 * * @method getBatteryLevel * @return {Number} - 0.0 ~ 1.0 @@ -63,9 +63,9 @@ cc.Device = { /** * !#en - * Gets the network type of current device + * Get the network type of current device, return cc.NetworkType.LAN if failure. * !#zh - * 获取当前设备的网络类型 + * 获取当前设备的网络类型, 如果网络类型无法获取,默认将返回 cc.NetworkType.LAN * * @method getNetworkType * @return {NetworkType} From 8a35363eaa3cb4a5e25eda7ae735032aec38a1bf Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Wed, 17 Jan 2018 15:57:50 +0800 Subject: [PATCH 08/74] add keyCode api to EventCustom --- cocos2d/core/event/event.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cocos2d/core/event/event.js b/cocos2d/core/event/event.js index 0669fb4cb7..1378199339 100644 --- a/cocos2d/core/event/event.js +++ b/cocos2d/core/event/event.js @@ -326,6 +326,21 @@ EventCustom.prototype.getUserData = function () { EventCustom.prototype.getEventName = cc.Event.prototype.getType; +/** + * !#en + * The keyCode read-only property represents a system and implementation dependent numerical code identifying the unmodified value of the pressed key.
+ * This is usually the decimal ASCII (RFC 20) or Windows 1252 code corresponding to the key.
+ * If the key can't be identified, this value is 0.
+ * + * !#zh + * keyCode 是只读属性它表示一个系统和依赖于实现的数字代码,可以识别按键的未修改值。
+ * 这通常是十进制 ASCII (RFC20) 或者 Windows 1252 代码,所对应的密钥。
+ * 如果无法识别该键,则该值为 0。 + * + * @property keyCode + * @type {Number} + */ + var MAX_POOL_SIZE = 10; var _eventPool = new JS.Pool(MAX_POOL_SIZE); EventCustom.put = function (event) { From 715086e3a7082c2dfe59d387b675617bed6d19f8 Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 18 Jan 2018 11:59:45 +0800 Subject: [PATCH 09/74] Resolve a FIXME in AramatureDisplay.js, CCFactory is a singlton for JSB either now. --- extensions/dragonbones/ArmatureDisplay.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index 1485ddeaae..29333cbd9c 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -285,10 +285,7 @@ dragonBones.ArmatureDisplay = cc.Class({ // IMPLEMENT ctor: function () { if (CC_JSB) { - // TODO Fix me - // If using the getFactory in JSB. - // There may be throw errors when close the application. - this._factory = new dragonBones.CCFactory(); + this._factory = dragonBones.CCFactory.getInstance(); } else { this._factory = dragonBones.CCFactory.getFactory(); From bba9299dbbceff18310c17d791654ce63d914893 Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 18 Jan 2018 14:18:35 +0800 Subject: [PATCH 10/74] Rename CCFactory.getFactory to CCFactory.getInstance. --- cocos2d/deprecated.js | 4 ++++ extensions/dragonbones/ArmatureDisplay.js | 7 +------ extensions/dragonbones/CCFactory.js | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cocos2d/deprecated.js b/cocos2d/deprecated.js index 4f479f781c..15d45e6c39 100644 --- a/cocos2d/deprecated.js +++ b/cocos2d/deprecated.js @@ -682,4 +682,8 @@ if (CC_DEV) { }, }); + if (dragonBones !== undefined) { + js.obsolete(dragonBones.CCFactory, 'dragonBones.CCFactory.getFactory', 'getInstance'); + } + } diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index 29333cbd9c..e1a4b294e6 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -284,12 +284,7 @@ dragonBones.ArmatureDisplay = cc.Class({ // IMPLEMENT ctor: function () { - if (CC_JSB) { - this._factory = dragonBones.CCFactory.getInstance(); - } - else { - this._factory = dragonBones.CCFactory.getFactory(); - } + this._factory = dragonBones.CCFactory.getInstance(); }, __preload: function () { diff --git a/extensions/dragonbones/CCFactory.js b/extensions/dragonbones/CCFactory.js index 5cdea5abfa..ee71ee2ab1 100644 --- a/extensions/dragonbones/CCFactory.js +++ b/extensions/dragonbones/CCFactory.js @@ -154,7 +154,7 @@ dragonBones.CCFactory = cc.Class({ }); dragonBones.CCFactory._factory = null; -dragonBones.CCFactory.getFactory = function() { +dragonBones.CCFactory.getInstance = function() { if (!dragonBones.CCFactory._factory) { dragonBones.CCFactory._factory = new dragonBones.CCFactory(); } From 585c80a68e7dd85f76fc74922c4929f8c0baa689 Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 18 Jan 2018 14:27:47 +0800 Subject: [PATCH 11/74] if check fix in deprecated.js --- cocos2d/deprecated.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/deprecated.js b/cocos2d/deprecated.js index 15d45e6c39..b13842d746 100644 --- a/cocos2d/deprecated.js +++ b/cocos2d/deprecated.js @@ -682,7 +682,7 @@ if (CC_DEV) { }, }); - if (dragonBones !== undefined) { + if (typeof dragonBones !== 'undefined') { js.obsolete(dragonBones.CCFactory, 'dragonBones.CCFactory.getFactory', 'getInstance'); } From 4e6d645f971735c5966123f9541954cff8849ef1 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Thu, 18 Jan 2018 17:21:13 +0800 Subject: [PATCH 12/74] fix cc.path.dirname bug --- cocos2d/core/utils/CCPath.js | 4 +++- test/qunit/unit-es5/test-path.js | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 test/qunit/unit-es5/test-path.js diff --git a/cocos2d/core/utils/CCPath.js b/cocos2d/core/utils/CCPath.js index 89888cc9b2..9afc849814 100644 --- a/cocos2d/core/utils/CCPath.js +++ b/cocos2d/core/utils/CCPath.js @@ -26,6 +26,7 @@ require('../platform/CCSys'); var EXTNAME_RE = /(\.[^\.\/\?\\]*)(\?.*)?$/; +var DIRNAME_RE = /((.*)(\/|\\|\\\\))?(.*?\..*$)?/; var NORMALIZE_RE = /[^\.\/]+\/\.\.\//; /** @@ -104,7 +105,8 @@ cc.path = /** @lends cc.path# */{ * @returns {*} */ dirname: function (pathStr) { - return pathStr.replace(/((.*)(\/|\\|\\\\))?(.*?\..*$)?/, '$2'); + var temp = DIRNAME_RE.exec(pathStr); + return temp ? temp[2] : ''; }, /** diff --git a/test/qunit/unit-es5/test-path.js b/test/qunit/unit-es5/test-path.js new file mode 100644 index 0000000000..62b9f7a21d --- /dev/null +++ b/test/qunit/unit-es5/test-path.js @@ -0,0 +1,12 @@ +module('cc.path', SetupEngine); + +test('dirname', function () { + + ok(cc.path.dirname('aa/bb/cc') === 'aa/bb', 'get success'); + ok(cc.path.dirname('aa/bb/cc.png') === 'aa/bb', 'get success'); + ok(cc.path.dirname('aa/bb/cc/') === 'aa/bb/cc', 'get success'); + ok(cc.path.dirname('aa/bb/cc.png/ee.png') === 'aa/bb/cc.png', 'get success'); + ok(cc.path.dirname('D:\\aa\\bb') === 'D:\\aa', 'get success'); + ok(cc.path.dirname('aa/bb/.github/.gitignore') === 'aa/bb/.github', 'get success'); + +}); From cc1c03248bfd0e4ea42042274cca62d32cb0c471 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 18 Jan 2018 18:34:10 +0800 Subject: [PATCH 13/74] Fix hit test on rotated nodes --- cocos2d/core/CCNode.js | 21 +++++++++++-------- cocos2d/core/base-nodes/CCSGNode.js | 2 +- cocos2d/core/value-types/CCAffineTransform.js | 13 ++++++++++++ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index dde008c0cb..cc4f473103 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1357,20 +1357,23 @@ var Node = cc.Class({ _hitTest (point, listener) { var w = this.width, - h = this.height; - var rect = cc.rect(0, 0, w, h); + h = this.height, + pt = point; var Camera = cc.Camera; if (Camera && Camera.main && Camera.main.containsNode(this)) { - point = Camera.main.getCameraToWorldPoint(point); + pt = Camera.main.getCameraToWorldPoint(pt); } - var trans = this.getNodeToWorldTransform(); - cc._rectApplyAffineTransformIn(rect, trans); - var left = point.x - rect.x, - right = rect.x + rect.width - point.x, - bottom = point.y - rect.y, - top = rect.y + rect.height - point.y; + var trans = this.getWorldToNodeTransform(); + pt = cc.pointApplyAffineTransform(pt, trans); + pt.x += this._anchorPoint.x * w; + pt.y += this._anchorPoint.y * h; + + var left = pt.x, + right = w - pt.x, + bottom = pt.y, + top = h - pt.y; if (left >= 0 && right >= 0 && top >= 0 && bottom >= 0) { if (listener && listener.mask) { var mask = listener.mask; diff --git a/cocos2d/core/base-nodes/CCSGNode.js b/cocos2d/core/base-nodes/CCSGNode.js index 452643fe77..3905a7e4f1 100644 --- a/cocos2d/core/base-nodes/CCSGNode.js +++ b/cocos2d/core/base-nodes/CCSGNode.js @@ -1716,7 +1716,7 @@ _ccsg.Node = cc.Class({ * @return {cc.AffineTransform} */ getWorldToNodeTransform: function () { - return cc.affineTransformInvert(this.getNodeToWorldTransform()); + return cc.affineTransformInvertIn(this.getNodeToWorldTransform()); }, /** diff --git a/cocos2d/core/value-types/CCAffineTransform.js b/cocos2d/core/value-types/CCAffineTransform.js index 27c2c4fdf5..feb0b74370 100644 --- a/cocos2d/core/value-types/CCAffineTransform.js +++ b/cocos2d/core/value-types/CCAffineTransform.js @@ -374,6 +374,19 @@ cc.affineTransformInvert = function (t) { tx: determinant * (t.c * t.ty - t.d * t.tx), ty: determinant * (t.b * t.tx - t.a * t.ty)}; }; +cc.affineTransformInvertIn = function (t) { + var a = t.a, b = t.b, c = t.c, d = t.d; + var determinant = 1 / (a * d - b * c); + var tx = t.tx, ty = t.ty; + t.a = determinant * d; + t.b = -determinant * b; + t.c = -determinant * c; + t.d = determinant * a; + t.tx = determinant * (c * ty - d * tx); + t.ty = determinant * (b * tx - a * ty); + return t; +}; + /** * !#en Put the invert transform of an AffineTransform object into the out AffineTransform object. * !#zh 求逆矩阵并存入用户传入的矩阵对象参数。 From a9d0a08271c50aed0e9cfb13b103f0b0d321974f Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 17 Jan 2018 14:52:15 +0800 Subject: [PATCH 14/74] Fix recursive schedule task issue --- cocos2d/core/CCScheduler.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js index 6000748f9a..9c3ec89076 100644 --- a/cocos2d/core/CCScheduler.js +++ b/cocos2d/core/CCScheduler.js @@ -160,6 +160,7 @@ HashTimerEntry.put = function (entry) { * @extends cc.Class */ function CallbackTimer () { + this._lock = false; this._scheduler = null; this._elapsed = -1; this._runForever = false; @@ -176,6 +177,7 @@ function CallbackTimer () { var proto = CallbackTimer.prototype; proto.initWithCallback = function (scheduler, callback, target, seconds, repeat, delay) { + this._lock = false; this._scheduler = scheduler; this._target = target; this._callback = callback; @@ -241,8 +243,10 @@ proto.getCallback = function(){ }; proto.trigger = function () { - if (this._target && this._callback){ + if (this._target && this._callback) { + this._lock = true; this._callback.call(this._target, this._elapsed); + this._lock = false; } }; @@ -256,7 +260,7 @@ CallbackTimer.get = function () { return _timers.pop() || new CallbackTimer(); }; CallbackTimer.put = function (timer) { - if (_timers.length < MAX_POOL_SIZE) { + if (_timers.length < MAX_POOL_SIZE && !timer._lock) { timer._scheduler = timer._target = timer._callback = null; _timers.push(timer); } @@ -572,6 +576,10 @@ cc.Scheduler = cc._Class.extend({ timer = CallbackTimer.get(); timer.initWithCallback(this, callback, target, interval, repeat, delay); element.timers.push(timer); + + if (this._currentTarget === element && this._currentTargetSalvaged) { + this._currentTargetSalvaged = false; + } }, /** From 7e6161594156c55b21aab5d206cd4c96cd59ca88 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Tue, 23 Jan 2018 10:28:02 +0800 Subject: [PATCH 15/74] update deserialize code and add autoReleaseAssets type --- cocos2d/core/CCScene.js | 5 ++++- cocos2d/core/platform/deserialize.js | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/CCScene.js b/cocos2d/core/CCScene.js index 6c044f80f3..413ac5eca8 100644 --- a/cocos2d/core/CCScene.js +++ b/cocos2d/core/CCScene.js @@ -46,7 +46,10 @@ cc.Scene = cc.Class({ * @property {Boolean} autoReleaseAssets * @default false */ - autoReleaseAssets: undefined, + autoReleaseAssets: { + default: undefined, + type: cc.Boolean + }, }, diff --git a/cocos2d/core/platform/deserialize.js b/cocos2d/core/platform/deserialize.js index 1fb1b89d04..11a739e182 100644 --- a/cocos2d/core/platform/deserialize.js +++ b/cocos2d/core/platform/deserialize.js @@ -550,6 +550,7 @@ var _Deserializer = (function () { }; var compileDeserialize = CC_SUPPORT_JIT ? function (self, klass) { + var TYPE = Attr.DELIMETER + 'type'; var RAW_TYPE = Attr.DELIMETER + 'rawType'; var EDITOR_ONLY = Attr.DELIMETER + 'editorOnly'; var SERIALIZABLE = Attr.DELIMETER + 'serializable'; @@ -607,10 +608,21 @@ var _Deserializer = (function () { // function undefined object(null) string boolean number var defaultValue = CCClass.getDefault(attrs[propName + DEFAULT]); if (fastMode) { - var defaultType = typeof defaultValue; - var isPrimitiveType = (defaultType === 'string' && !attrs[propName + SAVE_URL_AS_ASSET]) || - defaultType === 'number' || - defaultType === 'boolean'; + var isPrimitiveType; + var userType = attrs[propName + TYPE]; + if (defaultValue === undefined && userType) { + isPrimitiveType = userType === cc.String || + userType === cc.Integer || + userType === cc.Float || + userType === cc.Boolean; + } + else { + var defaultType = typeof defaultValue; + isPrimitiveType = (defaultType === 'string' && !attrs[propName + SAVE_URL_AS_ASSET]) || + defaultType === 'number' || + defaultType === 'boolean'; + } + if (isPrimitiveType) { sources.push(`o${accessorToSet}=prop;`); } From 8c0a7a013c6b6320161f6028f306f463e49fb224 Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 23 Jan 2018 11:49:54 +0800 Subject: [PATCH 16/74] The problem that the audio in load cannot play --- cocos2d/audio/CCAudio.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index d7e1b4e892..86de73b2a2 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -104,7 +104,7 @@ Audio.State = { } // If the resource does not exist - if (!item) { + if (!item || !item.complete) { return cc.loader.load(src, function (error) { if (!error) { var item = cc.loader.getItem(src); @@ -112,7 +112,7 @@ Audio.State = { audio.emit('load'); } }); - } else if (item.complete) { + } else { audio.mount(item.element || item.buffer); audio.emit('load'); } From 890efb443b9a7815373856f8b58c02c66ac71efa Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Tue, 23 Jan 2018 14:36:01 +0800 Subject: [PATCH 17/74] fix gizmo error --- cocos2d/core/CCNode.js | 2 +- cocos2d/core/base-nodes/CCSGNode.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index cc4f473103..0ce9b497ea 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1365,7 +1365,7 @@ var Node = cc.Class({ pt = Camera.main.getCameraToWorldPoint(pt); } - var trans = this.getWorldToNodeTransform(); + var trans = cc.affineTransformInvertIn(this._sgNode.getNodeToWorldTransform()); pt = cc.pointApplyAffineTransform(pt, trans); pt.x += this._anchorPoint.x * w; pt.y += this._anchorPoint.y * h; diff --git a/cocos2d/core/base-nodes/CCSGNode.js b/cocos2d/core/base-nodes/CCSGNode.js index 3905a7e4f1..452643fe77 100644 --- a/cocos2d/core/base-nodes/CCSGNode.js +++ b/cocos2d/core/base-nodes/CCSGNode.js @@ -1716,7 +1716,7 @@ _ccsg.Node = cc.Class({ * @return {cc.AffineTransform} */ getWorldToNodeTransform: function () { - return cc.affineTransformInvertIn(this.getNodeToWorldTransform()); + return cc.affineTransformInvert(this.getNodeToWorldTransform()); }, /** From 781efe4ab682e8b11121e33d99da8fe34e76f2fb Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 23 Jan 2018 15:00:51 +0800 Subject: [PATCH 18/74] Use setTargetAtTime --- cocos2d/audio/CCAudio.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 86de73b2a2..62b59ed33f 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -282,9 +282,17 @@ var WebAudioElement = function (buffer, audio) { this._audio = audio; this._context = sys.__audioSupport.context; this._buffer = buffer; - this._volume = this._context['createGain'](); - this._volume['gain'].value = 1; - this._volume['connect'](this._context['destination']); + + this._gainObj = this._context['createGain'](); + this._volume = 1; + // https://www.chromestatus.com/features/5287995770929152 + if (this._gainObj['gain'].setTargetAtTime) { + this._gainObj['gain'].setTargetAtTime(this._volume, this._context.currentTime, 0.01); + } else { + this._gainObj['gain'].value = 1; + } + this._gainObj['connect'](this._context['destination']); + this._loop = false; // The time stamp on the audio time axis when the recording begins to play. this._startTime = -1; @@ -313,7 +321,7 @@ var WebAudioElement = function (buffer, audio) { var audio = this._context["createBufferSource"](); audio.buffer = this._buffer; - audio["connect"](this._volume); + audio["connect"](this._gainObj); audio.loop = this._loop; this._startTime = this._context.currentTime; @@ -398,9 +406,16 @@ var WebAudioElement = function (buffer, audio) { return this._loop = bool; }); - proto.__defineGetter__('volume', function () { return this._volume['gain'].value; }); + proto.__defineGetter__('volume', function () { + return this._volume; + }); proto.__defineSetter__('volume', function (num) { - this._volume['gain'].value = num; + this._volume = num; + if (this._gainObj['gain'].setTargetAtTime) { + this._gainObj['gain'].setTargetAtTime(this._volume, this._context.currentTime, 0.01); + } else { + this._volume['gain'].value = num; + } if (sys.os === sys.OS_IOS && !this.paused && this._currentSource) { // IOS must be stop webAudio this._currentSource.onended = null; From 63dc008ebbc958e22fb3fd4dcb4753379f9746a5 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 19 Jan 2018 00:00:35 +0800 Subject: [PATCH 19/74] uglify: disable negate_iife --- gulp/util/utils.js | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/gulp/util/utils.js b/gulp/util/utils.js index 136a8025ef..886f923c0c 100644 --- a/gulp/util/utils.js +++ b/gulp/util/utils.js @@ -47,38 +47,46 @@ exports.getUglifyOptions = function (platform, flags) { var optimizeForJSC = releaseMode && global_defs['CC_JSB']; if (optimizeForJSC) { return { - output: { - beautify: true, // really preserve_lines - indent_level: 0, // reduce jsc file size + parse: { + bare_returns: true }, + toplevel: false, compress: { global_defs: global_defs, + negate_iife: false, sequences: false, keep_infinity: true, // reduce jsc file size typeofs: false, + }, + output: { + beautify: true, // really preserve_lines + indent_level: 0, // reduce jsc file size } }; } if (releaseMode) { return { + parse: { + bare_returns: true + }, + toplevel: false, compress: { global_defs: global_defs, + negate_iife: false, } }; } else { return { - mangle: false, - //preserveComments: 'all', - output: { - // http://lisperator.net/uglifyjs/codegen - beautify: true, - indent_level: 2, + parse: { + bare_returns: true }, + toplevel: false, compress: { // https://github.com/mishoo/UglifyJS2#compressor-options global_defs: global_defs, + negate_iife: false, sequences: false, // join consecutive statements with the “comma operator” properties: false, // optimize property access: a["foo"] → a.foo //dead_code: true, // discard unreachable code @@ -99,7 +107,6 @@ exports.getUglifyOptions = function (platform, flags) { collapse_vars: false, // Collapse single-use non-constant variables - side effects permitting. reduce_vars: false, // Improve optimization on variables assigned with and used as constant values. //warnings: true, - negate_iife: false, pure_getters: false, pure_funcs: null, drop_console: false, @@ -108,7 +115,14 @@ exports.getUglifyOptions = function (platform, flags) { keep_fnames: true, keep_infinity: true, // Pass true to prevent Infinity from being compressed into 1/0, which may cause performance issues on Chrome. side_effects: false // drop side-effect-free statements - } + }, + mangle: false, + //preserveComments: 'all', + output: { + // http://lisperator.net/uglifyjs/codegen + beautify: true, + indent_level: 2, + }, }; } }; From d953ace2a44ac6deb69503b9bf0b33fbbd274c40 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Wed, 24 Jan 2018 13:49:07 +0800 Subject: [PATCH 20/74] workaround mishoo/UglifyJS2#2821 --- gulp/util/utils.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gulp/util/utils.js b/gulp/util/utils.js index 886f923c0c..4806be4d73 100644 --- a/gulp/util/utils.js +++ b/gulp/util/utils.js @@ -61,7 +61,8 @@ exports.getUglifyOptions = function (platform, flags) { output: { beautify: true, // really preserve_lines indent_level: 0, // reduce jsc file size - } + }, + rename: false, // workaround mishoo/UglifyJS2#2821 }; } @@ -74,7 +75,8 @@ exports.getUglifyOptions = function (platform, flags) { compress: { global_defs: global_defs, negate_iife: false, - } + }, + rename: false, // workaround mishoo/UglifyJS2#2821 }; } else { @@ -123,6 +125,7 @@ exports.getUglifyOptions = function (platform, flags) { beautify: true, indent_level: 2, }, + rename: false, // workaround mishoo/UglifyJS2#2821 }; } }; From d7e197c09572215f7517972173df23bd943672e7 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Thu, 25 Jan 2018 11:31:02 +0800 Subject: [PATCH 21/74] Revert "workaround mishoo/UglifyJS2#2821" This reverts commit d953ace2a44ac6deb69503b9bf0b33fbbd274c40. --- gulp/util/utils.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gulp/util/utils.js b/gulp/util/utils.js index 4806be4d73..886f923c0c 100644 --- a/gulp/util/utils.js +++ b/gulp/util/utils.js @@ -61,8 +61,7 @@ exports.getUglifyOptions = function (platform, flags) { output: { beautify: true, // really preserve_lines indent_level: 0, // reduce jsc file size - }, - rename: false, // workaround mishoo/UglifyJS2#2821 + } }; } @@ -75,8 +74,7 @@ exports.getUglifyOptions = function (platform, flags) { compress: { global_defs: global_defs, negate_iife: false, - }, - rename: false, // workaround mishoo/UglifyJS2#2821 + } }; } else { @@ -125,7 +123,6 @@ exports.getUglifyOptions = function (platform, flags) { beautify: true, indent_level: 2, }, - rename: false, // workaround mishoo/UglifyJS2#2821 }; } }; From 253b972d19945b6f10c7eb6bd9e9098f4ea569b5 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Thu, 25 Jan 2018 15:10:29 +0800 Subject: [PATCH 22/74] lock uglify-es --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92d1416749..184e3f282e 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "jshint-stylish": "2.1.0", "multipipe": "0.3.0", "persistify": "^1.1.1", - "uglify-es": "~3.3.3", + "uglify-es": "3.3.7", "vinyl": "1.1.0", "vinyl-buffer": "1.0.0", "vinyl-source-stream": "1.0.0", From 03671db549c921acf02bbc19b23eb21c0e7e0da3 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 26 Jan 2018 11:57:47 +0800 Subject: [PATCH 23/74] lock uglify-es for 1.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1998722077..165c85010e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "multipipe": "0.3.0", "persistify": "^1.1.1", "require-dir": "0.3.0", - "uglify-es": "^3.0.26", + "uglify-es": "~3.2.2", "vinyl": "1.1.0", "vinyl-buffer": "1.0.0", "vinyl-source-stream": "1.0.0", From eb3745c317bc9b1e08d208cf150c813b569b0d5f Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 29 Jan 2018 11:15:14 +0800 Subject: [PATCH 24/74] Reverts dragonBones CCFactory change to avoid assert. --- extensions/dragonbones/ArmatureDisplay.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index e1a4b294e6..c8e41e8f6a 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -284,7 +284,14 @@ dragonBones.ArmatureDisplay = cc.Class({ // IMPLEMENT ctor: function () { - this._factory = dragonBones.CCFactory.getInstance(); + if (CC_JSB) { + // TODO Fix me + // If using the getFactory in JSB. + // There may be throw errors when close the application. + this._factory = new dragonBones.CCFactory(); + } else { + this._factory = dragonBones.CCFactory.getInstance(); + } }, __preload: function () { From 46f2c794d0fbaa438b95b029c531362aed355575 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 29 Jan 2018 14:13:31 +0800 Subject: [PATCH 25/74] Put to cc.sys namepsace. --- cocos2d/core/platform/CCDevice.js | 78 ------------------------------- cocos2d/core/platform/CCSys.js | 66 ++++++++++++++++++++++++++ cocos2d/core/platform/index.js | 1 - gulp/tasks/engine.js | 1 - 4 files changed, 66 insertions(+), 80 deletions(-) delete mode 100644 cocos2d/core/platform/CCDevice.js diff --git a/cocos2d/core/platform/CCDevice.js b/cocos2d/core/platform/CCDevice.js deleted file mode 100644 index 05bbbe1857..0000000000 --- a/cocos2d/core/platform/CCDevice.js +++ /dev/null @@ -1,78 +0,0 @@ - -/** - * !#en - * Network type enumeration - * !#zh - * 网络类型枚举 - * - * @enum NetworkType - */ -cc.NetworkType = { - /** - * !#en - * Network is unreachable. - * !#zh - * 网络不通 - * - * @property {Number} NONE - */ - NONE: 0, - /** - * !#en - * Network is reachable via WiFi or cable. - * !#zh - * 通过无线或者有线本地网络连接因特网 - * - * @property {Number} LAN - */ - LAN: 1, - /** - * !#en - * Network is reachable via Wireless Wide Area Network - * !#zh - * 通过蜂窝移动网络连接因特网 - * - * @property {Number} WWAN - */ - WWAN: 2 -}; - -/** - * !#en - * cc.Device is used for getting hardware status of current device. - * !#zh - * cc.Device 用于获取当前设备的系统信息 - * - * @class Device - */ -cc.Device = { - /** - * !#en - * Get the battery level of current device, return 1.0 if failure. - * !#zh - * 获取当前设备的电池电量,如果电量无法获取,默认将返回 1 - * - * @method getBatteryLevel - * @return {Number} - 0.0 ~ 1.0 - * @static - */ - getBatteryLevel: function() { - // TODO: need to implement this for mobile phones. - return 1.0; - }, - - /** - * !#en - * Get the network type of current device, return cc.NetworkType.LAN if failure. - * !#zh - * 获取当前设备的网络类型, 如果网络类型无法获取,默认将返回 cc.NetworkType.LAN - * - * @method getNetworkType - * @return {NetworkType} - * @static - */ - getNetworkType: function() { - // TODO: need to implement this for mobile phones. - return cc.NetworkType.LAN; - } -}; diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index 5c6e603cf5..b4820c10a9 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -489,6 +489,72 @@ sys.BROWSER_TYPE_SOUGOU = "sogou"; */ sys.BROWSER_TYPE_UNKNOWN = "unknown"; +/** + * !#en + * Network type enumeration + * !#zh + * 网络类型枚举 + * + * @enum NetworkType + */ +sys.NetworkType = { + /** + * !#en + * Network is unreachable. + * !#zh + * 网络不通 + * + * @property {Number} NONE + */ + NONE: 0, + /** + * !#en + * Network is reachable via WiFi or cable. + * !#zh + * 通过无线或者有线本地网络连接因特网 + * + * @property {Number} LAN + */ + LAN: 1, + /** + * !#en + * Network is reachable via Wireless Wide Area Network + * !#zh + * 通过蜂窝移动网络连接因特网 + * + * @property {Number} WWAN + */ + WWAN: 2 +}; + +/** + * !#en + * Get the battery level of current device, return 1.0 if failure. + * !#zh + * 获取当前设备的电池电量,如果电量无法获取,默认将返回 1 + * + * @method getBatteryLevel + * @return {Number} - 0.0 ~ 1.0 + */ +sys.getBatteryLevel = function() { + // TODO: need to implement this for mobile phones. + return 1.0; +}; + +/** + * !#en + * Get the network type of current device, return cc.sys.NetworkType.LAN if failure. + * !#zh + * 获取当前设备的网络类型, 如果网络类型无法获取,默认将返回 cc.sys.NetworkType.LAN + * + * @method getNetworkType + * @return {NetworkType} + */ +sys.getNetworkType = function() { + // TODO: need to implement this for mobile phones. + return sys.NetworkType.LAN; +}; + /** * Is native ? This is set to be true in jsb auto. diff --git a/cocos2d/core/platform/index.js b/cocos2d/core/platform/index.js index 0480f9e3f0..34c0523e28 100644 --- a/cocos2d/core/platform/index.js +++ b/cocos2d/core/platform/index.js @@ -35,7 +35,6 @@ require('./instantiate'); require('./instantiate-jit'); require('./requiring-frame'); require('./CCSys'); -require('./CCDevice'); require('./CCMacro'); if (!(CC_EDITOR && Editor.isMainProcess)) { diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index cdc01f981a..57c662777f 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -52,7 +52,6 @@ var jsbSkipModules = [ '../../cocos2d/core/physics/platform/CCPhysicsContactListner.js', '../../cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js', '../../cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js', - '../../cocos2d/core/platform/CCDevice.js', '../../cocos2d/core/platform/CCInputManager.js', '../../cocos2d/core/platform/CCVisibleRect.js', '../../cocos2d/core/camera/CCSGCameraNode.js', From bd15543093231d693a57f0178f26ecbcb47ce4d0 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Wed, 31 Jan 2018 17:51:49 +0800 Subject: [PATCH 26/74] updating license: Chukong Aipu -> Xiamen Yaji --- CCBoot.js | 4 ++-- CCDebugger.js | 4 ++-- cocos2d/animation/animation-state.js | 2 +- cocos2d/core/CCDrawingPrimitives.js | 4 ++-- cocos2d/core/CCGame.js | 4 ++-- cocos2d/core/CCScheduler.js | 4 ++-- cocos2d/core/assets/CCAsset.js | 4 ++-- cocos2d/core/assets/CCAudioClip.js | 4 ++-- cocos2d/core/assets/CCBitmapFont.js | 4 ++-- cocos2d/core/assets/CCFont.js | 4 ++-- cocos2d/core/assets/CCLabelAtlas.js | 4 ++-- cocos2d/core/assets/CCPrefab.js | 4 ++-- cocos2d/core/assets/CCRawAsset.js | 4 ++-- cocos2d/core/assets/CCSceneAsset.js | 4 ++-- cocos2d/core/assets/CCScripts.js | 4 ++-- cocos2d/core/assets/CCSpriteAtlas.js | 4 ++-- cocos2d/core/assets/CCTTFFont.js | 4 ++-- cocos2d/core/assets/CCTextAsset.js | 4 ++-- cocos2d/core/assets/index.js | 4 ++-- cocos2d/core/base-ui/CCWidgetManager.js | 4 ++-- cocos2d/core/camera/CCCamera.js | 4 ++-- cocos2d/core/collider/CCBoxCollider.js | 4 ++-- cocos2d/core/collider/CCCircleCollider.js | 4 ++-- cocos2d/core/collider/CCCollider.js | 4 ++-- cocos2d/core/collider/CCPolygonCollider.js | 4 ++-- cocos2d/core/component-scheduler.js | 4 ++-- cocos2d/core/components/CCAnimation.js | 4 ++-- cocos2d/core/components/CCAudioSource.js | 4 ++-- cocos2d/core/components/CCBlockInputEvents.js | 4 ++-- cocos2d/core/components/CCButton.js | 4 ++-- cocos2d/core/components/CCCanvas.js | 4 ++-- cocos2d/core/components/CCComponent.js | 4 ++-- cocos2d/core/components/CCComponentEventHandler.js | 4 ++-- cocos2d/core/components/CCEditBox.js | 4 ++-- cocos2d/core/components/CCLabel.js | 4 ++-- cocos2d/core/components/CCLabelOutline.js | 4 ++-- cocos2d/core/components/CCLayout.js | 4 ++-- cocos2d/core/components/CCMask.js | 4 ++-- cocos2d/core/components/CCPageView.js | 4 ++-- cocos2d/core/components/CCPageViewIndicator.js | 4 ++-- cocos2d/core/components/CCProgressBar.js | 4 ++-- cocos2d/core/components/CCRendererInSG.js | 4 ++-- cocos2d/core/components/CCRendererUnderSG.js | 4 ++-- cocos2d/core/components/CCRichText.js | 4 ++-- cocos2d/core/components/CCSGComponent.js | 4 ++-- cocos2d/core/components/CCScrollBar.js | 4 ++-- cocos2d/core/components/CCScrollView.js | 4 ++-- cocos2d/core/components/CCSlider.js | 4 ++-- cocos2d/core/components/CCSprite.js | 4 ++-- cocos2d/core/components/CCSpriteDistortion.js | 4 ++-- cocos2d/core/components/CCToggle.js | 4 ++-- cocos2d/core/components/CCToggleContainer.js | 4 ++-- cocos2d/core/components/CCToggleGroup.js | 4 ++-- cocos2d/core/components/CCVideoPlayer.js | 4 ++-- cocos2d/core/components/CCViewGroup.js | 4 ++-- cocos2d/core/components/CCWebView.js | 4 ++-- cocos2d/core/components/CCWidget.js | 4 ++-- cocos2d/core/components/index.js | 4 ++-- cocos2d/core/components/missing-script.js | 4 ++-- cocos2d/core/event-manager/CCEvent.js | 4 ++-- cocos2d/core/event-manager/CCEventListener.js | 4 ++-- cocos2d/core/event-manager/CCEventManager.js | 4 ++-- cocos2d/core/event-manager/CCTouch.js | 4 ++-- cocos2d/core/event-manager/index.js | 4 ++-- cocos2d/core/event/event-listeners.js | 4 ++-- cocos2d/core/event/event-target.js | 4 ++-- cocos2d/core/event/event.js | 4 ++-- cocos2d/core/event/index.js | 4 ++-- cocos2d/core/event/system-event.js | 4 ++-- cocos2d/core/graphics/graphics-node.js | 4 ++-- cocos2d/core/graphics/graphics-webgl-cmd.js | 4 ++-- cocos2d/core/graphics/graphics.js | 4 ++-- cocos2d/core/graphics/index.js | 4 ++-- cocos2d/core/graphics/types.js | 4 ++-- cocos2d/core/index.js | 4 ++-- cocos2d/core/label/CCTextUtils.js | 4 ++-- cocos2d/core/load-pipeline/CCLoader.js | 4 ++-- cocos2d/core/load-pipeline/asset-loader.js | 4 ++-- cocos2d/core/load-pipeline/asset-table.js | 4 ++-- cocos2d/core/load-pipeline/audio-downloader.js | 4 ++-- cocos2d/core/load-pipeline/auto-release-utils.js | 4 ++-- cocos2d/core/load-pipeline/binary-downloader.js | 4 ++-- cocos2d/core/load-pipeline/downloader.js | 4 ++-- cocos2d/core/load-pipeline/index.js | 4 ++-- cocos2d/core/load-pipeline/loader.js | 4 ++-- cocos2d/core/load-pipeline/loading-items.js | 4 ++-- cocos2d/core/load-pipeline/md5-pipe.js | 4 ++-- cocos2d/core/load-pipeline/pack-downloader.js | 4 ++-- cocos2d/core/load-pipeline/pipeline.js | 4 ++-- cocos2d/core/load-pipeline/released-asset-checker.js | 4 ++-- cocos2d/core/load-pipeline/unpackers.js | 4 ++-- cocos2d/core/load-pipeline/uuid-loader.js | 4 ++-- cocos2d/core/node-activator.js | 4 ++-- cocos2d/core/physics/CCPhysicsManager.js | 4 ++-- cocos2d/core/physics/CCRigidBody.js | 4 ++-- cocos2d/core/physics/collider/CCPhysicsBoxCollider.js | 4 ++-- cocos2d/core/physics/collider/CCPhysicsChainCollider.js | 4 ++-- cocos2d/core/physics/collider/CCPhysicsCircleCollider.js | 4 ++-- cocos2d/core/physics/collider/CCPhysicsCollider.js | 4 ++-- cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js | 4 ++-- cocos2d/core/physics/joint/CCDistanceJoint.js | 4 ++-- cocos2d/core/physics/joint/CCJoint.js | 4 ++-- cocos2d/core/physics/joint/CCMotorJoint.js | 4 ++-- cocos2d/core/physics/joint/CCMouseJoint.js | 4 ++-- cocos2d/core/physics/joint/CCPrismaticJoint.js | 4 ++-- cocos2d/core/physics/joint/CCRevoluteJoint.js | 4 ++-- cocos2d/core/physics/joint/CCRopeJoint.js | 4 ++-- cocos2d/core/physics/joint/CCWeldJoint.js | 4 ++-- cocos2d/core/physics/joint/CCWheelJoint.js | 4 ++-- cocos2d/core/platform/CCAssetLibrary.js | 4 ++-- cocos2d/core/platform/CCClass.js | 4 ++-- cocos2d/core/platform/CCClassDecorator.js | 4 ++-- cocos2d/core/platform/CCEnum.js | 4 ++-- cocos2d/core/platform/CCSys.js | 4 ++-- cocos2d/core/platform/_CCClass.js | 4 ++-- cocos2d/core/platform/attribute.js | 4 ++-- cocos2d/core/platform/callbacks-invoker.js | 4 ++-- cocos2d/core/platform/compiler.js | 4 ++-- cocos2d/core/platform/deserialize.js | 4 ++-- cocos2d/core/platform/id-generater.js | 4 ++-- cocos2d/core/platform/index.js | 4 ++-- cocos2d/core/platform/instantiate-jit.js | 4 ++-- cocos2d/core/platform/instantiate.js | 4 ++-- cocos2d/core/platform/preprocess-class.js | 4 ++-- cocos2d/core/platform/requiring-frame.js | 4 ++-- cocos2d/core/platform/url.js | 4 ++-- cocos2d/core/platform/utils.js | 4 ++-- cocos2d/core/predefine.js | 4 ++-- cocos2d/core/renderer/RendererCanvas.js | 4 ++-- cocos2d/core/renderer/RendererWebGL.js | 2 +- cocos2d/core/renderer/index.js | 4 ++-- cocos2d/core/scenes/CCSGScene.js | 4 ++-- cocos2d/core/textures/CCTexture2D.js | 4 ++-- cocos2d/core/textures/CCTextureCache.js | 4 ++-- cocos2d/core/textures/index.js | 4 ++-- cocos2d/core/utils/CCPath.js | 4 ++-- cocos2d/core/utils/CCProfiler.js | 4 ++-- cocos2d/core/utils/base-node.js | 4 ++-- cocos2d/core/utils/binary-search.js | 4 ++-- cocos2d/core/utils/decode-uuid.js | 4 ++-- cocos2d/core/utils/find.js | 4 ++-- cocos2d/core/utils/index.js | 4 ++-- cocos2d/core/utils/misc.js | 4 ++-- cocos2d/core/utils/mutable-forward-iterator.js | 4 ++-- cocos2d/core/utils/prefab-helper.js | 4 ++-- cocos2d/core/utils/scene-graph-helper.js | 4 ++-- cocos2d/core/value-types/CCColor.js | 4 ++-- cocos2d/core/value-types/CCRect.js | 4 ++-- cocos2d/core/value-types/CCSize.js | 4 ++-- cocos2d/core/value-types/CCValueType.js | 4 ++-- cocos2d/core/value-types/CCVec2.js | 4 ++-- cocos2d/core/value-types/index.js | 4 ++-- cocos2d/core/videoplayer/CCSGVideoPlayer.js | 4 ++-- cocos2d/core/webview/CCSGWebView.js | 4 ++-- cocos2d/motion-streak/CCMotionStreak.js | 4 ++-- cocos2d/particle/CCParticleAsset.js | 4 ++-- cocos2d/particle/CCParticleSystem.js | 4 ++-- cocos2d/shaders/index.js | 4 ++-- cocos2d/tilemap/CCSGTMXObject.js | 4 ++-- cocos2d/tilemap/CCTiledLayer.js | 4 ++-- cocos2d/tilemap/CCTiledMap.js | 4 ++-- cocos2d/tilemap/CCTiledMapAsset.js | 4 ++-- cocos2d/tilemap/CCTiledObjectGroup.js | 4 ++-- extends.js | 4 ++-- extensions/anysdk/jsb_anysdk.js | 4 ++-- extensions/dragonbones/ArmatureDisplay.js | 4 ++-- extensions/dragonbones/DragonBonesAsset.js | 4 ++-- extensions/dragonbones/DragonBonesAtlasAsset.js | 4 ++-- extensions/dragonbones/editor/dragonbones-atlas-meta.js | 4 ++-- extensions/dragonbones/editor/dragonbones-meta.js | 4 ++-- extensions/spine/Skeleton.js | 4 ++-- extensions/spine/SkeletonData.js | 4 ++-- gulp/tasks/engine.js | 4 ++-- gulp/tasks/test.js | 4 ++-- gulp/util/handleErrors.js | 4 ++-- gulpfile.js | 4 ++-- index.js | 4 ++-- jsb/index.js | 4 ++-- jsb/jsb-action.js | 4 ++-- jsb/jsb-apis.js | 4 ++-- jsb/jsb-audio.js | 4 ++-- jsb/jsb-director.js | 4 ++-- jsb/jsb-editbox.js | 4 ++-- jsb/jsb-enums.js | 4 ++-- jsb/jsb-etc.js | 4 ++-- jsb/jsb-event.js | 4 ++-- jsb/jsb-game.js | 4 ++-- jsb/jsb-label.js | 4 ++-- jsb/jsb-loader.js | 4 ++-- jsb/jsb-particle.js | 4 ++-- jsb/jsb-scale9sprite.js | 4 ++-- jsb/jsb-tex-sprite-frame.js | 4 ++-- jsb/jsb-tiledmap.js | 4 ++-- jsb/jsb-videoplayer.js | 4 ++-- jsb/jsb-webview.js | 4 ++-- licenses/LICENSE | 4 ++-- 196 files changed, 390 insertions(+), 390 deletions(-) diff --git a/CCBoot.js b/CCBoot.js index e06066efeb..24aca4ba1c 100644 --- a/CCBoot.js +++ b/CCBoot.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/CCDebugger.js b/CCDebugger.js index e538769256..fc87d6abd2 100644 --- a/CCDebugger.js +++ b/CCDebugger.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/animation/animation-state.js b/cocos2d/animation/animation-state.js index 97a58064f1..b2b5fa3d0d 100644 --- a/cocos2d/animation/animation-state.js +++ b/cocos2d/animation/animation-state.js @@ -230,7 +230,7 @@ function process () { this.stop(); this.emit('finished', this); } -}; +} function simpleProcess () { var time = this.time; diff --git a/cocos2d/core/CCDrawingPrimitives.js b/cocos2d/core/CCDrawingPrimitives.js index f0918b4132..7bffc2bb4b 100644 --- a/cocos2d/core/CCDrawingPrimitives.js +++ b/cocos2d/core/CCDrawingPrimitives.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index d8d11cb39c..cb47718cff 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js index 9c3ec89076..23af974ea9 100644 --- a/cocos2d/core/CCScheduler.js +++ b/cocos2d/core/CCScheduler.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCAsset.js b/cocos2d/core/assets/CCAsset.js index 96655a46ee..fc804a5e52 100644 --- a/cocos2d/core/assets/CCAsset.js +++ b/cocos2d/core/assets/CCAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCAudioClip.js b/cocos2d/core/assets/CCAudioClip.js index 68b48f23a5..b61fcfbc66 100644 --- a/cocos2d/core/assets/CCAudioClip.js +++ b/cocos2d/core/assets/CCAudioClip.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCBitmapFont.js b/cocos2d/core/assets/CCBitmapFont.js index 20c2f0df02..3c6471e3d7 100644 --- a/cocos2d/core/assets/CCBitmapFont.js +++ b/cocos2d/core/assets/CCBitmapFont.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCFont.js b/cocos2d/core/assets/CCFont.js index b8c0d747ed..c399a13881 100644 --- a/cocos2d/core/assets/CCFont.js +++ b/cocos2d/core/assets/CCFont.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCLabelAtlas.js b/cocos2d/core/assets/CCLabelAtlas.js index 08c5311916..0d91dc6c4c 100644 --- a/cocos2d/core/assets/CCLabelAtlas.js +++ b/cocos2d/core/assets/CCLabelAtlas.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCPrefab.js b/cocos2d/core/assets/CCPrefab.js index 30c2a897a4..9635b42cd8 100644 --- a/cocos2d/core/assets/CCPrefab.js +++ b/cocos2d/core/assets/CCPrefab.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCRawAsset.js b/cocos2d/core/assets/CCRawAsset.js index 1ad6a8f458..867bc0154e 100644 --- a/cocos2d/core/assets/CCRawAsset.js +++ b/cocos2d/core/assets/CCRawAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCSceneAsset.js b/cocos2d/core/assets/CCSceneAsset.js index 783aa56502..51880e4741 100644 --- a/cocos2d/core/assets/CCSceneAsset.js +++ b/cocos2d/core/assets/CCSceneAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCScripts.js b/cocos2d/core/assets/CCScripts.js index 76876a1a1c..b0c285c9ab 100644 --- a/cocos2d/core/assets/CCScripts.js +++ b/cocos2d/core/assets/CCScripts.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCSpriteAtlas.js b/cocos2d/core/assets/CCSpriteAtlas.js index 0d65529fe7..11d33630f6 100644 --- a/cocos2d/core/assets/CCSpriteAtlas.js +++ b/cocos2d/core/assets/CCSpriteAtlas.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCTTFFont.js b/cocos2d/core/assets/CCTTFFont.js index c496679846..22d4433256 100644 --- a/cocos2d/core/assets/CCTTFFont.js +++ b/cocos2d/core/assets/CCTTFFont.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCTextAsset.js b/cocos2d/core/assets/CCTextAsset.js index 4a5627c342..b44fdb3b86 100644 --- a/cocos2d/core/assets/CCTextAsset.js +++ b/cocos2d/core/assets/CCTextAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/index.js b/cocos2d/core/assets/index.js index c26eb37368..db3a81a7eb 100644 --- a/cocos2d/core/assets/index.js +++ b/cocos2d/core/assets/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index 867d8516a9..ce4f6081e2 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/camera/CCCamera.js b/cocos2d/core/camera/CCCamera.js index 777d0660e4..36ee87e425 100644 --- a/cocos2d/core/camera/CCCamera.js +++ b/cocos2d/core/camera/CCCamera.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/CCBoxCollider.js b/cocos2d/core/collider/CCBoxCollider.js index baa52ab7e2..f8e54da11e 100644 --- a/cocos2d/core/collider/CCBoxCollider.js +++ b/cocos2d/core/collider/CCBoxCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/CCCircleCollider.js b/cocos2d/core/collider/CCCircleCollider.js index e5264225da..e039ca3afb 100644 --- a/cocos2d/core/collider/CCCircleCollider.js +++ b/cocos2d/core/collider/CCCircleCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/CCCollider.js b/cocos2d/core/collider/CCCollider.js index 7e8cfd1e91..88a63a877d 100644 --- a/cocos2d/core/collider/CCCollider.js +++ b/cocos2d/core/collider/CCCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/CCPolygonCollider.js b/cocos2d/core/collider/CCPolygonCollider.js index d7b12c7337..750b227820 100644 --- a/cocos2d/core/collider/CCPolygonCollider.js +++ b/cocos2d/core/collider/CCPolygonCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/component-scheduler.js b/cocos2d/core/component-scheduler.js index b910c23c70..7d7371f93d 100644 --- a/cocos2d/core/component-scheduler.js +++ b/cocos2d/core/component-scheduler.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCAnimation.js b/cocos2d/core/components/CCAnimation.js index fbd2a466a1..28ffef1c5b 100644 --- a/cocos2d/core/components/CCAnimation.js +++ b/cocos2d/core/components/CCAnimation.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCAudioSource.js b/cocos2d/core/components/CCAudioSource.js index a92e6505f8..602fcb5a53 100644 --- a/cocos2d/core/components/CCAudioSource.js +++ b/cocos2d/core/components/CCAudioSource.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCBlockInputEvents.js b/cocos2d/core/components/CCBlockInputEvents.js index a3b2e56ed3..7658aa12af 100644 --- a/cocos2d/core/components/CCBlockInputEvents.js +++ b/cocos2d/core/components/CCBlockInputEvents.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index cb161d7bf3..5240454dae 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCCanvas.js b/cocos2d/core/components/CCCanvas.js index 280442c533..8f2bc4c940 100644 --- a/cocos2d/core/components/CCCanvas.js +++ b/cocos2d/core/components/CCCanvas.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCComponent.js b/cocos2d/core/components/CCComponent.js index eca392761a..34950d4471 100644 --- a/cocos2d/core/components/CCComponent.js +++ b/cocos2d/core/components/CCComponent.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCComponentEventHandler.js b/cocos2d/core/components/CCComponentEventHandler.js index f4319ac9ee..e70478837a 100644 --- a/cocos2d/core/components/CCComponentEventHandler.js +++ b/cocos2d/core/components/CCComponentEventHandler.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCEditBox.js b/cocos2d/core/components/CCEditBox.js index 72a187fe95..59209f3458 100644 --- a/cocos2d/core/components/CCEditBox.js +++ b/cocos2d/core/components/CCEditBox.js @@ -7,14 +7,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 419e9c22eb..edfa09f938 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCLabelOutline.js b/cocos2d/core/components/CCLabelOutline.js index 1baf226591..4a289db2a1 100644 --- a/cocos2d/core/components/CCLabelOutline.js +++ b/cocos2d/core/components/CCLabelOutline.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCLayout.js b/cocos2d/core/components/CCLayout.js index 7315b320d4..61304a7b01 100644 --- a/cocos2d/core/components/CCLayout.js +++ b/cocos2d/core/components/CCLayout.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCMask.js b/cocos2d/core/components/CCMask.js index 37eb61f655..42c41d3907 100644 --- a/cocos2d/core/components/CCMask.js +++ b/cocos2d/core/components/CCMask.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCPageView.js b/cocos2d/core/components/CCPageView.js index 947e9ab73b..1088708f0a 100644 --- a/cocos2d/core/components/CCPageView.js +++ b/cocos2d/core/components/CCPageView.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCPageViewIndicator.js b/cocos2d/core/components/CCPageViewIndicator.js index 1e941b638c..d7bed5cc84 100644 --- a/cocos2d/core/components/CCPageViewIndicator.js +++ b/cocos2d/core/components/CCPageViewIndicator.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCProgressBar.js b/cocos2d/core/components/CCProgressBar.js index fd9aefd381..77c392430e 100644 --- a/cocos2d/core/components/CCProgressBar.js +++ b/cocos2d/core/components/CCProgressBar.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCRendererInSG.js b/cocos2d/core/components/CCRendererInSG.js index 0c5e2b836f..403763acc0 100644 --- a/cocos2d/core/components/CCRendererInSG.js +++ b/cocos2d/core/components/CCRendererInSG.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCRendererUnderSG.js b/cocos2d/core/components/CCRendererUnderSG.js index 2f74c16b97..38d131e748 100644 --- a/cocos2d/core/components/CCRendererUnderSG.js +++ b/cocos2d/core/components/CCRendererUnderSG.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCRichText.js b/cocos2d/core/components/CCRichText.js index 50b775a546..ce2cf842f8 100644 --- a/cocos2d/core/components/CCRichText.js +++ b/cocos2d/core/components/CCRichText.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSGComponent.js b/cocos2d/core/components/CCSGComponent.js index 5d1e5f9a20..8fc92835ac 100644 --- a/cocos2d/core/components/CCSGComponent.js +++ b/cocos2d/core/components/CCSGComponent.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCScrollBar.js b/cocos2d/core/components/CCScrollBar.js index 9991a52b6c..9d01f25a51 100644 --- a/cocos2d/core/components/CCScrollBar.js +++ b/cocos2d/core/components/CCScrollBar.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index 83268bc67d..bcfcb743ef 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSlider.js b/cocos2d/core/components/CCSlider.js index 674307b49e..440fdb7346 100644 --- a/cocos2d/core/components/CCSlider.js +++ b/cocos2d/core/components/CCSlider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index 9724918949..a9694c8d2d 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSpriteDistortion.js b/cocos2d/core/components/CCSpriteDistortion.js index d673c19e36..23277e20f3 100644 --- a/cocos2d/core/components/CCSpriteDistortion.js +++ b/cocos2d/core/components/CCSpriteDistortion.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCToggle.js b/cocos2d/core/components/CCToggle.js index abe95d41eb..3d71c883ec 100644 --- a/cocos2d/core/components/CCToggle.js +++ b/cocos2d/core/components/CCToggle.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCToggleContainer.js b/cocos2d/core/components/CCToggleContainer.js index 601a94f992..88d9bde93a 100644 --- a/cocos2d/core/components/CCToggleContainer.js +++ b/cocos2d/core/components/CCToggleContainer.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCToggleGroup.js b/cocos2d/core/components/CCToggleGroup.js index 114e2b37b1..de68fbbcac 100644 --- a/cocos2d/core/components/CCToggleGroup.js +++ b/cocos2d/core/components/CCToggleGroup.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCVideoPlayer.js b/cocos2d/core/components/CCVideoPlayer.js index 12f59d5465..44840f87d9 100644 --- a/cocos2d/core/components/CCVideoPlayer.js +++ b/cocos2d/core/components/CCVideoPlayer.js @@ -5,13 +5,13 @@ http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/core/components/CCViewGroup.js b/cocos2d/core/components/CCViewGroup.js index 0d5430d4d3..2788440c0d 100644 --- a/cocos2d/core/components/CCViewGroup.js +++ b/cocos2d/core/components/CCViewGroup.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCWebView.js b/cocos2d/core/components/CCWebView.js index 71073d3fbd..99ec40daae 100644 --- a/cocos2d/core/components/CCWebView.js +++ b/cocos2d/core/components/CCWebView.js @@ -5,13 +5,13 @@ http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index f245e43ff0..cc25ec392d 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/index.js b/cocos2d/core/components/index.js index 80067c0aa2..99b4905db2 100644 --- a/cocos2d/core/components/index.js +++ b/cocos2d/core/components/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/missing-script.js b/cocos2d/core/components/missing-script.js index 05a1c20da7..aa8da65e79 100644 --- a/cocos2d/core/components/missing-script.js +++ b/cocos2d/core/components/missing-script.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/CCEvent.js b/cocos2d/core/event-manager/CCEvent.js index 4fd4f0f692..256638e5f4 100644 --- a/cocos2d/core/event-manager/CCEvent.js +++ b/cocos2d/core/event-manager/CCEvent.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/CCEventListener.js b/cocos2d/core/event-manager/CCEventListener.js index 4da7586717..21f90265dd 100644 --- a/cocos2d/core/event-manager/CCEventListener.js +++ b/cocos2d/core/event-manager/CCEventListener.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/CCEventManager.js b/cocos2d/core/event-manager/CCEventManager.js index aadd316e9e..8bdf8aeb2e 100644 --- a/cocos2d/core/event-manager/CCEventManager.js +++ b/cocos2d/core/event-manager/CCEventManager.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/CCTouch.js b/cocos2d/core/event-manager/CCTouch.js index d052c0228c..f8798c30f6 100644 --- a/cocos2d/core/event-manager/CCTouch.js +++ b/cocos2d/core/event-manager/CCTouch.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/index.js b/cocos2d/core/event-manager/index.js index a90e2c50b5..b8d6a430c2 100644 --- a/cocos2d/core/event-manager/index.js +++ b/cocos2d/core/event-manager/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/event-listeners.js b/cocos2d/core/event/event-listeners.js index 67b316da99..a53c83de84 100644 --- a/cocos2d/core/event/event-listeners.js +++ b/cocos2d/core/event/event-listeners.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/event-target.js b/cocos2d/core/event/event-target.js index 9475583110..ba08fbb08b 100644 --- a/cocos2d/core/event/event-target.js +++ b/cocos2d/core/event/event-target.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/event.js b/cocos2d/core/event/event.js index 1378199339..fb13cdbfbd 100644 --- a/cocos2d/core/event/event.js +++ b/cocos2d/core/event/event.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/index.js b/cocos2d/core/event/index.js index 1c946a8fef..f63cf24695 100644 --- a/cocos2d/core/event/index.js +++ b/cocos2d/core/event/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/system-event.js b/cocos2d/core/event/system-event.js index e2301fae37..75e615c246 100644 --- a/cocos2d/core/event/system-event.js +++ b/cocos2d/core/event/system-event.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/graphics-node.js b/cocos2d/core/graphics/graphics-node.js index 85a543f956..548eeaa9d9 100644 --- a/cocos2d/core/graphics/graphics-node.js +++ b/cocos2d/core/graphics/graphics-node.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/graphics-webgl-cmd.js b/cocos2d/core/graphics/graphics-webgl-cmd.js index 20f8aa664e..bdf3078b8f 100644 --- a/cocos2d/core/graphics/graphics-webgl-cmd.js +++ b/cocos2d/core/graphics/graphics-webgl-cmd.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/graphics.js b/cocos2d/core/graphics/graphics.js index 66920c60fc..eb718ea522 100644 --- a/cocos2d/core/graphics/graphics.js +++ b/cocos2d/core/graphics/graphics.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/index.js b/cocos2d/core/graphics/index.js index 22540071ed..9191f81159 100644 --- a/cocos2d/core/graphics/index.js +++ b/cocos2d/core/graphics/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/types.js b/cocos2d/core/graphics/types.js index 1067feaa83..e5916dba9f 100644 --- a/cocos2d/core/graphics/types.js +++ b/cocos2d/core/graphics/types.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/index.js b/cocos2d/core/index.js index 2e5f351c44..c35524c26d 100644 --- a/cocos2d/core/index.js +++ b/cocos2d/core/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/label/CCTextUtils.js b/cocos2d/core/label/CCTextUtils.js index 83679d63c1..41e0dd832e 100644 --- a/cocos2d/core/label/CCTextUtils.js +++ b/cocos2d/core/label/CCTextUtils.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index 841eac5b94..ea1383be73 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/asset-loader.js b/cocos2d/core/load-pipeline/asset-loader.js index b4a6ab0cf5..62938c81d7 100644 --- a/cocos2d/core/load-pipeline/asset-loader.js +++ b/cocos2d/core/load-pipeline/asset-loader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/asset-table.js b/cocos2d/core/load-pipeline/asset-table.js index 2191350f99..3273611714 100644 --- a/cocos2d/core/load-pipeline/asset-table.js +++ b/cocos2d/core/load-pipeline/asset-table.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/audio-downloader.js b/cocos2d/core/load-pipeline/audio-downloader.js index b6d536433f..7d714bd7de 100644 --- a/cocos2d/core/load-pipeline/audio-downloader.js +++ b/cocos2d/core/load-pipeline/audio-downloader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/auto-release-utils.js b/cocos2d/core/load-pipeline/auto-release-utils.js index 0958e1988c..f27641da10 100644 --- a/cocos2d/core/load-pipeline/auto-release-utils.js +++ b/cocos2d/core/load-pipeline/auto-release-utils.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/binary-downloader.js b/cocos2d/core/load-pipeline/binary-downloader.js index 287e434528..b6ff262620 100644 --- a/cocos2d/core/load-pipeline/binary-downloader.js +++ b/cocos2d/core/load-pipeline/binary-downloader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/downloader.js b/cocos2d/core/load-pipeline/downloader.js index b433c84f1f..364788cc3c 100644 --- a/cocos2d/core/load-pipeline/downloader.js +++ b/cocos2d/core/load-pipeline/downloader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/index.js b/cocos2d/core/load-pipeline/index.js index eb05db7209..5829c96fed 100644 --- a/cocos2d/core/load-pipeline/index.js +++ b/cocos2d/core/load-pipeline/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/loader.js b/cocos2d/core/load-pipeline/loader.js index 7a7a2ec70a..110294820d 100644 --- a/cocos2d/core/load-pipeline/loader.js +++ b/cocos2d/core/load-pipeline/loader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/loading-items.js b/cocos2d/core/load-pipeline/loading-items.js index 1aaf32e566..32c118d208 100644 --- a/cocos2d/core/load-pipeline/loading-items.js +++ b/cocos2d/core/load-pipeline/loading-items.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/md5-pipe.js b/cocos2d/core/load-pipeline/md5-pipe.js index 62d91170fc..f98c937ec6 100644 --- a/cocos2d/core/load-pipeline/md5-pipe.js +++ b/cocos2d/core/load-pipeline/md5-pipe.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/pack-downloader.js b/cocos2d/core/load-pipeline/pack-downloader.js index 0dbd87ff13..b002eb788b 100644 --- a/cocos2d/core/load-pipeline/pack-downloader.js +++ b/cocos2d/core/load-pipeline/pack-downloader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/pipeline.js b/cocos2d/core/load-pipeline/pipeline.js index 325d1e0402..ee98436473 100644 --- a/cocos2d/core/load-pipeline/pipeline.js +++ b/cocos2d/core/load-pipeline/pipeline.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/released-asset-checker.js b/cocos2d/core/load-pipeline/released-asset-checker.js index 85ce5feb08..9d4b6e3ec2 100644 --- a/cocos2d/core/load-pipeline/released-asset-checker.js +++ b/cocos2d/core/load-pipeline/released-asset-checker.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/unpackers.js b/cocos2d/core/load-pipeline/unpackers.js index 3cacbd4e6d..f69a4a05db 100644 --- a/cocos2d/core/load-pipeline/unpackers.js +++ b/cocos2d/core/load-pipeline/unpackers.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/uuid-loader.js b/cocos2d/core/load-pipeline/uuid-loader.js index c08d595f09..d723d20cc9 100644 --- a/cocos2d/core/load-pipeline/uuid-loader.js +++ b/cocos2d/core/load-pipeline/uuid-loader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/node-activator.js b/cocos2d/core/node-activator.js index 69dab8761c..6ec5e3fdd5 100644 --- a/cocos2d/core/node-activator.js +++ b/cocos2d/core/node-activator.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/CCPhysicsManager.js b/cocos2d/core/physics/CCPhysicsManager.js index 428f108a5a..1552b60234 100644 --- a/cocos2d/core/physics/CCPhysicsManager.js +++ b/cocos2d/core/physics/CCPhysicsManager.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/CCRigidBody.js b/cocos2d/core/physics/CCRigidBody.js index 71e355d417..e05247e085 100644 --- a/cocos2d/core/physics/CCRigidBody.js +++ b/cocos2d/core/physics/CCRigidBody.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js b/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js index ff150446ee..69719410f2 100644 --- a/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsChainCollider.js b/cocos2d/core/physics/collider/CCPhysicsChainCollider.js index b637777e2f..3dc08c519e 100644 --- a/cocos2d/core/physics/collider/CCPhysicsChainCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsChainCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js b/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js index 226c31518a..5b501b1bef 100644 --- a/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsCollider.js b/cocos2d/core/physics/collider/CCPhysicsCollider.js index 10c8b1018e..ac291d4a5a 100644 --- a/cocos2d/core/physics/collider/CCPhysicsCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js b/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js index c61d6438f0..71770d019f 100644 --- a/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCDistanceJoint.js b/cocos2d/core/physics/joint/CCDistanceJoint.js index 33ad2bef27..f2137ba64e 100644 --- a/cocos2d/core/physics/joint/CCDistanceJoint.js +++ b/cocos2d/core/physics/joint/CCDistanceJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCJoint.js b/cocos2d/core/physics/joint/CCJoint.js index 990a17183c..e907379b51 100644 --- a/cocos2d/core/physics/joint/CCJoint.js +++ b/cocos2d/core/physics/joint/CCJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCMotorJoint.js b/cocos2d/core/physics/joint/CCMotorJoint.js index f9ee38946e..a15e33c1a4 100644 --- a/cocos2d/core/physics/joint/CCMotorJoint.js +++ b/cocos2d/core/physics/joint/CCMotorJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCMouseJoint.js b/cocos2d/core/physics/joint/CCMouseJoint.js index 4f1046d3c4..5b166ba2bc 100644 --- a/cocos2d/core/physics/joint/CCMouseJoint.js +++ b/cocos2d/core/physics/joint/CCMouseJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCPrismaticJoint.js b/cocos2d/core/physics/joint/CCPrismaticJoint.js index 27cf6c29cb..f978fa1f72 100644 --- a/cocos2d/core/physics/joint/CCPrismaticJoint.js +++ b/cocos2d/core/physics/joint/CCPrismaticJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCRevoluteJoint.js b/cocos2d/core/physics/joint/CCRevoluteJoint.js index cc5670f59c..77d33e20c9 100644 --- a/cocos2d/core/physics/joint/CCRevoluteJoint.js +++ b/cocos2d/core/physics/joint/CCRevoluteJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCRopeJoint.js b/cocos2d/core/physics/joint/CCRopeJoint.js index 11d7f8124e..c4c405285b 100644 --- a/cocos2d/core/physics/joint/CCRopeJoint.js +++ b/cocos2d/core/physics/joint/CCRopeJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCWeldJoint.js b/cocos2d/core/physics/joint/CCWeldJoint.js index eec21a0431..ebdbf598df 100644 --- a/cocos2d/core/physics/joint/CCWeldJoint.js +++ b/cocos2d/core/physics/joint/CCWeldJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCWheelJoint.js b/cocos2d/core/physics/joint/CCWheelJoint.js index 294641432a..d9b7d6462d 100644 --- a/cocos2d/core/physics/joint/CCWheelJoint.js +++ b/cocos2d/core/physics/joint/CCWheelJoint.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCAssetLibrary.js b/cocos2d/core/platform/CCAssetLibrary.js index 0f4ebb0796..3b07c0e019 100644 --- a/cocos2d/core/platform/CCAssetLibrary.js +++ b/cocos2d/core/platform/CCAssetLibrary.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCClass.js b/cocos2d/core/platform/CCClass.js index f52f520e20..b75001c8f7 100644 --- a/cocos2d/core/platform/CCClass.js +++ b/cocos2d/core/platform/CCClass.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCClassDecorator.js b/cocos2d/core/platform/CCClassDecorator.js index 1f07b0eb67..e6b1f5cfa5 100644 --- a/cocos2d/core/platform/CCClassDecorator.js +++ b/cocos2d/core/platform/CCClassDecorator.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCEnum.js b/cocos2d/core/platform/CCEnum.js index f5296394e8..72c634be7d 100644 --- a/cocos2d/core/platform/CCEnum.js +++ b/cocos2d/core/platform/CCEnum.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index b4820c10a9..b0731d4fd2 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/_CCClass.js b/cocos2d/core/platform/_CCClass.js index 644320e987..3056711b64 100644 --- a/cocos2d/core/platform/_CCClass.js +++ b/cocos2d/core/platform/_CCClass.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/attribute.js b/cocos2d/core/platform/attribute.js index e3542aa139..aaef5f2187 100644 --- a/cocos2d/core/platform/attribute.js +++ b/cocos2d/core/platform/attribute.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/callbacks-invoker.js b/cocos2d/core/platform/callbacks-invoker.js index 380d912be2..a27e944bd2 100644 --- a/cocos2d/core/platform/callbacks-invoker.js +++ b/cocos2d/core/platform/callbacks-invoker.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/compiler.js b/cocos2d/core/platform/compiler.js index 534f785039..cc63d4ee5a 100644 --- a/cocos2d/core/platform/compiler.js +++ b/cocos2d/core/platform/compiler.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/deserialize.js b/cocos2d/core/platform/deserialize.js index b313402afb..ac57ed8ac0 100644 --- a/cocos2d/core/platform/deserialize.js +++ b/cocos2d/core/platform/deserialize.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/id-generater.js b/cocos2d/core/platform/id-generater.js index cc19190977..92d4f340d2 100644 --- a/cocos2d/core/platform/id-generater.js +++ b/cocos2d/core/platform/id-generater.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/index.js b/cocos2d/core/platform/index.js index 34c0523e28..06bdc5c7e1 100644 --- a/cocos2d/core/platform/index.js +++ b/cocos2d/core/platform/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/instantiate-jit.js b/cocos2d/core/platform/instantiate-jit.js index 534ae708eb..b7141e25ff 100644 --- a/cocos2d/core/platform/instantiate-jit.js +++ b/cocos2d/core/platform/instantiate-jit.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/instantiate.js b/cocos2d/core/platform/instantiate.js index ed2a115ced..ef2b5aaa45 100644 --- a/cocos2d/core/platform/instantiate.js +++ b/cocos2d/core/platform/instantiate.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/preprocess-class.js b/cocos2d/core/platform/preprocess-class.js index 95226385e8..b577ab1d28 100644 --- a/cocos2d/core/platform/preprocess-class.js +++ b/cocos2d/core/platform/preprocess-class.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/requiring-frame.js b/cocos2d/core/platform/requiring-frame.js index dde5c05629..57912acf4a 100644 --- a/cocos2d/core/platform/requiring-frame.js +++ b/cocos2d/core/platform/requiring-frame.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/url.js b/cocos2d/core/platform/url.js index 8a4f2a834d..4048c6f4cc 100644 --- a/cocos2d/core/platform/url.js +++ b/cocos2d/core/platform/url.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/utils.js b/cocos2d/core/platform/utils.js index a88aa4bd17..78ad42d95f 100644 --- a/cocos2d/core/platform/utils.js +++ b/cocos2d/core/platform/utils.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/predefine.js b/cocos2d/core/predefine.js index 06adc9bb9f..babf194f30 100644 --- a/cocos2d/core/predefine.js +++ b/cocos2d/core/predefine.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/renderer/RendererCanvas.js b/cocos2d/core/renderer/RendererCanvas.js index 42a491a5ec..b0ce2bf509 100644 --- a/cocos2d/core/renderer/RendererCanvas.js +++ b/cocos2d/core/renderer/RendererCanvas.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/renderer/RendererWebGL.js b/cocos2d/core/renderer/RendererWebGL.js index ecdd999c75..05ee7a7068 100644 --- a/cocos2d/core/renderer/RendererWebGL.js +++ b/cocos2d/core/renderer/RendererWebGL.js @@ -11,7 +11,7 @@ furnished to do so, subject to the following conditions: The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/renderer/index.js b/cocos2d/core/renderer/index.js index 62663c9951..47d6630eea 100644 --- a/cocos2d/core/renderer/index.js +++ b/cocos2d/core/renderer/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/scenes/CCSGScene.js b/cocos2d/core/scenes/CCSGScene.js index 948b475701..b2667e6872 100644 --- a/cocos2d/core/scenes/CCSGScene.js +++ b/cocos2d/core/scenes/CCSGScene.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js index bc5f816568..b7a18718f7 100644 --- a/cocos2d/core/textures/CCTexture2D.js +++ b/cocos2d/core/textures/CCTexture2D.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/textures/CCTextureCache.js b/cocos2d/core/textures/CCTextureCache.js index a867ab984b..847539a505 100644 --- a/cocos2d/core/textures/CCTextureCache.js +++ b/cocos2d/core/textures/CCTextureCache.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/textures/index.js b/cocos2d/core/textures/index.js index 79b8b519fb..d3df6e773a 100644 --- a/cocos2d/core/textures/index.js +++ b/cocos2d/core/textures/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/CCPath.js b/cocos2d/core/utils/CCPath.js index b7cac093d9..e830d863e0 100644 --- a/cocos2d/core/utils/CCPath.js +++ b/cocos2d/core/utils/CCPath.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/CCProfiler.js b/cocos2d/core/utils/CCProfiler.js index a391603cf6..a2a48bdbe1 100644 --- a/cocos2d/core/utils/CCProfiler.js +++ b/cocos2d/core/utils/CCProfiler.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 3f5a022a88..55710e1ba1 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/binary-search.js b/cocos2d/core/utils/binary-search.js index f34d4de382..26197ced2d 100644 --- a/cocos2d/core/utils/binary-search.js +++ b/cocos2d/core/utils/binary-search.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/decode-uuid.js b/cocos2d/core/utils/decode-uuid.js index b74f862a2d..3085360f9f 100644 --- a/cocos2d/core/utils/decode-uuid.js +++ b/cocos2d/core/utils/decode-uuid.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/find.js b/cocos2d/core/utils/find.js index 6e59531fe9..ee41977db0 100644 --- a/cocos2d/core/utils/find.js +++ b/cocos2d/core/utils/find.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/index.js b/cocos2d/core/utils/index.js index 2df6fc067f..5861e942e4 100644 --- a/cocos2d/core/utils/index.js +++ b/cocos2d/core/utils/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/misc.js b/cocos2d/core/utils/misc.js index c1360b9725..1a50592b17 100644 --- a/cocos2d/core/utils/misc.js +++ b/cocos2d/core/utils/misc.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/mutable-forward-iterator.js b/cocos2d/core/utils/mutable-forward-iterator.js index 113282e5b6..b646738341 100644 --- a/cocos2d/core/utils/mutable-forward-iterator.js +++ b/cocos2d/core/utils/mutable-forward-iterator.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/prefab-helper.js b/cocos2d/core/utils/prefab-helper.js index e676304786..8b80f246bb 100644 --- a/cocos2d/core/utils/prefab-helper.js +++ b/cocos2d/core/utils/prefab-helper.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/scene-graph-helper.js b/cocos2d/core/utils/scene-graph-helper.js index 56ec38a13d..0a8dd2dcea 100644 --- a/cocos2d/core/utils/scene-graph-helper.js +++ b/cocos2d/core/utils/scene-graph-helper.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCColor.js b/cocos2d/core/value-types/CCColor.js index 3c791d8b6b..ff3cd55c5c 100644 --- a/cocos2d/core/value-types/CCColor.js +++ b/cocos2d/core/value-types/CCColor.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCRect.js b/cocos2d/core/value-types/CCRect.js index 1071d79ad3..e038760ae7 100644 --- a/cocos2d/core/value-types/CCRect.js +++ b/cocos2d/core/value-types/CCRect.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCSize.js b/cocos2d/core/value-types/CCSize.js index b39f921f24..90904c961d 100644 --- a/cocos2d/core/value-types/CCSize.js +++ b/cocos2d/core/value-types/CCSize.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCValueType.js b/cocos2d/core/value-types/CCValueType.js index 7c2fb624ed..2ccc365775 100644 --- a/cocos2d/core/value-types/CCValueType.js +++ b/cocos2d/core/value-types/CCValueType.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCVec2.js b/cocos2d/core/value-types/CCVec2.js index 02aadcc517..e3690fe501 100644 --- a/cocos2d/core/value-types/CCVec2.js +++ b/cocos2d/core/value-types/CCVec2.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/index.js b/cocos2d/core/value-types/index.js index cbffd47baf..7d609c6f75 100644 --- a/cocos2d/core/value-types/index.js +++ b/cocos2d/core/value-types/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/videoplayer/CCSGVideoPlayer.js b/cocos2d/core/videoplayer/CCSGVideoPlayer.js index e35d8b97ee..bc0b6e0a31 100644 --- a/cocos2d/core/videoplayer/CCSGVideoPlayer.js +++ b/cocos2d/core/videoplayer/CCSGVideoPlayer.js @@ -3,13 +3,13 @@ http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/core/webview/CCSGWebView.js b/cocos2d/core/webview/CCSGWebView.js index 4ab1154c57..49d20f71d1 100644 --- a/cocos2d/core/webview/CCSGWebView.js +++ b/cocos2d/core/webview/CCSGWebView.js @@ -3,13 +3,13 @@ http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/motion-streak/CCMotionStreak.js b/cocos2d/motion-streak/CCMotionStreak.js index 57ebfdb394..bd56f191d0 100644 --- a/cocos2d/motion-streak/CCMotionStreak.js +++ b/cocos2d/motion-streak/CCMotionStreak.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/particle/CCParticleAsset.js b/cocos2d/particle/CCParticleAsset.js index 26a85702ab..2ab1bacf9a 100644 --- a/cocos2d/particle/CCParticleAsset.js +++ b/cocos2d/particle/CCParticleAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/particle/CCParticleSystem.js b/cocos2d/particle/CCParticleSystem.js index 4b4f88ca59..009c66a174 100644 --- a/cocos2d/particle/CCParticleSystem.js +++ b/cocos2d/particle/CCParticleSystem.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/shaders/index.js b/cocos2d/shaders/index.js index 49a1aeb233..e2eb6c9ff7 100644 --- a/cocos2d/shaders/index.js +++ b/cocos2d/shaders/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCSGTMXObject.js b/cocos2d/tilemap/CCSGTMXObject.js index c85c1a9418..91f172dad4 100644 --- a/cocos2d/tilemap/CCSGTMXObject.js +++ b/cocos2d/tilemap/CCSGTMXObject.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCTiledLayer.js b/cocos2d/tilemap/CCTiledLayer.js index 650e8d4904..3c028576ff 100644 --- a/cocos2d/tilemap/CCTiledLayer.js +++ b/cocos2d/tilemap/CCTiledLayer.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCTiledMap.js b/cocos2d/tilemap/CCTiledMap.js index 7175e7b145..f3cc6dba76 100644 --- a/cocos2d/tilemap/CCTiledMap.js +++ b/cocos2d/tilemap/CCTiledMap.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCTiledMapAsset.js b/cocos2d/tilemap/CCTiledMapAsset.js index e6e1c1042f..91999d0898 100644 --- a/cocos2d/tilemap/CCTiledMapAsset.js +++ b/cocos2d/tilemap/CCTiledMapAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCTiledObjectGroup.js b/cocos2d/tilemap/CCTiledObjectGroup.js index 15d82f50a2..f28a315dcf 100644 --- a/cocos2d/tilemap/CCTiledObjectGroup.js +++ b/cocos2d/tilemap/CCTiledObjectGroup.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extends.js b/extends.js index e424c7a368..69de2e0253 100644 --- a/extends.js +++ b/extends.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/anysdk/jsb_anysdk.js b/extensions/anysdk/jsb_anysdk.js index fd1f03f671..3dec54c1a0 100644 --- a/extensions/anysdk/jsb_anysdk.js +++ b/extensions/anysdk/jsb_anysdk.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of Stringge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index 931c53c149..7009abfda0 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/DragonBonesAsset.js b/extensions/dragonbones/DragonBonesAsset.js index 6f463882c6..f73d3169e3 100644 --- a/extensions/dragonbones/DragonBonesAsset.js +++ b/extensions/dragonbones/DragonBonesAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/DragonBonesAtlasAsset.js b/extensions/dragonbones/DragonBonesAtlasAsset.js index 4ca8e088b0..0a94dd3422 100644 --- a/extensions/dragonbones/DragonBonesAtlasAsset.js +++ b/extensions/dragonbones/DragonBonesAtlasAsset.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/editor/dragonbones-atlas-meta.js b/extensions/dragonbones/editor/dragonbones-atlas-meta.js index 6b01a1ef17..89f7274655 100644 --- a/extensions/dragonbones/editor/dragonbones-atlas-meta.js +++ b/extensions/dragonbones/editor/dragonbones-atlas-meta.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/editor/dragonbones-meta.js b/extensions/dragonbones/editor/dragonbones-meta.js index 3613e72685..2cb63f0065 100644 --- a/extensions/dragonbones/editor/dragonbones-meta.js +++ b/extensions/dragonbones/editor/dragonbones-meta.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/spine/Skeleton.js b/extensions/spine/Skeleton.js index a39fb5b43b..9e81c1be3e 100644 --- a/extensions/spine/Skeleton.js +++ b/extensions/spine/Skeleton.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/spine/SkeletonData.js b/extensions/spine/SkeletonData.js index 4b9204cbf7..07489e8133 100644 --- a/extensions/spine/SkeletonData.js +++ b/extensions/spine/SkeletonData.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index 57c662777f..02ab9c3ba2 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js index 29de7715c3..a28f7c278f 100644 --- a/gulp/tasks/test.js +++ b/gulp/tasks/test.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/gulp/util/handleErrors.js b/gulp/util/handleErrors.js index d7ec736585..d4852f5d21 100644 --- a/gulp/util/handleErrors.js +++ b/gulp/util/handleErrors.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/gulpfile.js b/gulpfile.js index 0eaee3737c..91714e6c53 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/index.js b/index.js index 19c859e023..48b85a146f 100644 --- a/index.js +++ b/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/index.js b/jsb/index.js index 93fb4d1a44..cbf6002bfb 100644 --- a/jsb/index.js +++ b/jsb/index.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-action.js b/jsb/jsb-action.js index fe49f619ff..c129b66fec 100644 --- a/jsb/jsb-action.js +++ b/jsb/jsb-action.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-apis.js b/jsb/jsb-apis.js index 26c105fb71..1d3b0971b2 100644 --- a/jsb/jsb-apis.js +++ b/jsb/jsb-apis.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-audio.js b/jsb/jsb-audio.js index a2a7449b1c..40c06bd456 100644 --- a/jsb/jsb-audio.js +++ b/jsb/jsb-audio.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-director.js b/jsb/jsb-director.js index 36a33cbd77..8eca880d20 100644 --- a/jsb/jsb-director.js +++ b/jsb/jsb-director.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-editbox.js b/jsb/jsb-editbox.js index 60119e2e25..45c7d49b40 100644 --- a/jsb/jsb-editbox.js +++ b/jsb/jsb-editbox.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-enums.js b/jsb/jsb-enums.js index d2302b7de3..236fe13497 100644 --- a/jsb/jsb-enums.js +++ b/jsb/jsb-enums.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-etc.js b/jsb/jsb-etc.js index 0e41aa65bd..395743bb37 100644 --- a/jsb/jsb-etc.js +++ b/jsb/jsb-etc.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-event.js b/jsb/jsb-event.js index e806ccb3ca..6d26764200 100644 --- a/jsb/jsb-event.js +++ b/jsb/jsb-event.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-game.js b/jsb/jsb-game.js index d7d43b6f7c..80a9a275b6 100644 --- a/jsb/jsb-game.js +++ b/jsb/jsb-game.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-label.js b/jsb/jsb-label.js index 19c04d1d0f..16419e6787 100644 --- a/jsb/jsb-label.js +++ b/jsb/jsb-label.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-loader.js b/jsb/jsb-loader.js index 70228ddc23..2375ee85bb 100644 --- a/jsb/jsb-loader.js +++ b/jsb/jsb-loader.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-particle.js b/jsb/jsb-particle.js index 77f04f70e6..4d7e35f5c2 100644 --- a/jsb/jsb-particle.js +++ b/jsb/jsb-particle.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-scale9sprite.js b/jsb/jsb-scale9sprite.js index 95e509a44f..2ef708df1b 100644 --- a/jsb/jsb-scale9sprite.js +++ b/jsb/jsb-scale9sprite.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-tex-sprite-frame.js b/jsb/jsb-tex-sprite-frame.js index eef749b73a..7297e76ab0 100644 --- a/jsb/jsb-tex-sprite-frame.js +++ b/jsb/jsb-tex-sprite-frame.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-tiledmap.js b/jsb/jsb-tiledmap.js index acf1f911ad..1409bf8233 100644 --- a/jsb/jsb-tiledmap.js +++ b/jsb/jsb-tiledmap.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-videoplayer.js b/jsb/jsb-videoplayer.js index ab7d40ebc3..f2d17fbbbb 100644 --- a/jsb/jsb-videoplayer.js +++ b/jsb/jsb-videoplayer.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-webview.js b/jsb/jsb-webview.js index 0065697b57..e8f0a10a0d 100644 --- a/jsb/jsb-webview.js +++ b/jsb/jsb-webview.js @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/licenses/LICENSE b/licenses/LICENSE index 8d8c76abdb..ab787ca12b 100644 --- a/licenses/LICENSE +++ b/licenses/LICENSE @@ -5,14 +5,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license + worldwide, royalty-free, non-assignable, revocable and non-exclusive license to use Cocos Creator solely to develop games on your target platforms. You shall not use Cocos Creator software for developing other software or tools that's used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Chukong Aipu reserves all rights not expressly granted to you. + Xiamen Yaji reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, From a6fb92ad90e4dcfaf3aeb936aed5d1c2d1ec1ceb Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Thu, 1 Feb 2018 00:48:24 +0800 Subject: [PATCH 27/74] updating license --- CCBoot.js | 3 ++- CCDebugger.js | 3 ++- DebugInfos.js | 25 +++++++++++++++++++ cocos2d/actions/CCAction.js | 3 ++- cocos2d/actions/CCActionCatmullRom.js | 3 ++- cocos2d/actions/CCActionEase.js | 3 ++- cocos2d/actions/CCActionInstant.js | 3 ++- cocos2d/actions/CCActionInterval.js | 3 ++- cocos2d/actions/CCActionManager.js | 3 ++- cocos2d/actions/index.js | 25 +++++++++++++++++++ cocos2d/animation/animation-animator.js | 25 +++++++++++++++++++ cocos2d/animation/animation-clip.js | 25 +++++++++++++++++++ cocos2d/animation/animation-curves.js | 25 +++++++++++++++++++ cocos2d/animation/animation-manager.js | 25 +++++++++++++++++++ cocos2d/animation/animation-state.js | 25 +++++++++++++++++++ cocos2d/animation/bezier.js | 25 +++++++++++++++++++ cocos2d/animation/easing.js | 25 +++++++++++++++++++ cocos2d/animation/index.js | 25 +++++++++++++++++++ cocos2d/animation/motion-path-helper.js | 25 +++++++++++++++++++ cocos2d/animation/playable.js | 25 +++++++++++++++++++ cocos2d/animation/types.js | 25 +++++++++++++++++++ cocos2d/audio/CCAudio.js | 3 ++- cocos2d/audio/CCAudioEngine.js | 3 ++- cocos2d/audio/deprecated.js | 3 ++- cocos2d/clipping-nodes/CCClippingNode.js | 3 ++- .../CCClippingNodeCanvasRenderCmd.js | 3 ++- .../CCClippingNodeWebGLRenderCmd.js | 3 ++- cocos2d/core/CCConfiguration.js | 3 ++- cocos2d/core/CCDirector.js | 3 ++- cocos2d/core/CCDirectorCanvas.js | 3 ++- cocos2d/core/CCDirectorWebGL.js | 3 ++- cocos2d/core/CCDrawingPrimitives.js | 5 ++-- cocos2d/core/CCDrawingPrimitivesCanvas.js | 3 ++- cocos2d/core/CCDrawingPrimitivesWebGL.js | 3 ++- cocos2d/core/CCGame.js | 5 ++-- cocos2d/core/CCNode.js | 3 ++- cocos2d/core/CCScene.js | 3 ++- cocos2d/core/CCScheduler.js | 5 ++-- cocos2d/core/assets/CCAsset.js | 3 ++- cocos2d/core/assets/CCAudioClip.js | 3 ++- cocos2d/core/assets/CCBitmapFont.js | 3 ++- cocos2d/core/assets/CCFont.js | 3 ++- cocos2d/core/assets/CCLabelAtlas.js | 3 ++- cocos2d/core/assets/CCPrefab.js | 3 ++- cocos2d/core/assets/CCRawAsset.js | 3 ++- cocos2d/core/assets/CCSceneAsset.js | 3 ++- cocos2d/core/assets/CCScripts.js | 3 ++- cocos2d/core/assets/CCSpriteAtlas.js | 3 ++- cocos2d/core/assets/CCTTFFont.js | 3 ++- cocos2d/core/assets/CCTextAsset.js | 3 ++- cocos2d/core/assets/index.js | 3 ++- cocos2d/core/base-nodes/CCSGNode.js | 3 ++- .../core/base-nodes/CCSGNodeBaseRenderCmd.js | 3 ++- .../base-nodes/CCSGNodeCanvasRenderCmd.js | 3 ++- .../core/base-nodes/CCSGNodeWebGLRenderCmd.js | 3 ++- cocos2d/core/base-ui/CCWidgetManager.js | 3 ++- cocos2d/core/camera/CCCamera.js | 3 ++- cocos2d/core/camera/CCSGCameraNode.js | 25 +++++++++++++++++++ cocos2d/core/collider/CCBoxCollider.js | 3 ++- cocos2d/core/collider/CCCircleCollider.js | 3 ++- cocos2d/core/collider/CCCollider.js | 3 ++- cocos2d/core/collider/CCCollisionManager.js | 25 +++++++++++++++++++ cocos2d/core/collider/CCContact.js | 25 +++++++++++++++++++ cocos2d/core/collider/CCIntersection.js | 25 +++++++++++++++++++ cocos2d/core/collider/CCPolygonCollider.js | 3 ++- cocos2d/core/collider/index.js | 25 +++++++++++++++++++ cocos2d/core/component-scheduler.js | 5 ++-- cocos2d/core/components/CCAnimation.js | 3 ++- cocos2d/core/components/CCAudioSource.js | 3 ++- cocos2d/core/components/CCBlockInputEvents.js | 3 ++- cocos2d/core/components/CCButton.js | 3 ++- cocos2d/core/components/CCCanvas.js | 3 ++- cocos2d/core/components/CCComponent.js | 5 ++-- .../components/CCComponentEventHandler.js | 3 ++- cocos2d/core/components/CCEditBox.js | 3 ++- cocos2d/core/components/CCLabel.js | 3 ++- cocos2d/core/components/CCLabelOutline.js | 3 ++- cocos2d/core/components/CCLayout.js | 3 ++- cocos2d/core/components/CCMask.js | 3 ++- cocos2d/core/components/CCPageView.js | 3 ++- .../core/components/CCPageViewIndicator.js | 3 ++- cocos2d/core/components/CCProgressBar.js | 3 ++- cocos2d/core/components/CCRendererInSG.js | 3 ++- cocos2d/core/components/CCRendererUnderSG.js | 3 ++- cocos2d/core/components/CCRichText.js | 3 ++- cocos2d/core/components/CCSGComponent.js | 3 ++- cocos2d/core/components/CCScrollBar.js | 3 ++- cocos2d/core/components/CCScrollView.js | 3 ++- cocos2d/core/components/CCSlider.js | 3 ++- cocos2d/core/components/CCSprite.js | 3 ++- cocos2d/core/components/CCSpriteDistortion.js | 3 ++- cocos2d/core/components/CCStudioComponent.js | 25 +++++++++++++++++++ cocos2d/core/components/CCToggle.js | 3 ++- cocos2d/core/components/CCToggleContainer.js | 3 ++- cocos2d/core/components/CCToggleGroup.js | 3 ++- cocos2d/core/components/CCVideoPlayer.js | 3 ++- cocos2d/core/components/CCViewGroup.js | 3 ++- cocos2d/core/components/CCWebView.js | 3 ++- cocos2d/core/components/CCWidget.js | 3 ++- cocos2d/core/components/index.js | 3 ++- cocos2d/core/components/missing-script.js | 3 ++- cocos2d/core/editbox/CCSGEditBox.js | 1 + cocos2d/core/event-manager/CCEvent.js | 3 ++- cocos2d/core/event-manager/CCEventListener.js | 3 ++- cocos2d/core/event-manager/CCEventManager.js | 3 ++- cocos2d/core/event-manager/CCTouch.js | 3 ++- cocos2d/core/event-manager/index.js | 3 ++- cocos2d/core/event/event-listeners.js | 3 ++- cocos2d/core/event/event-target.js | 3 ++- cocos2d/core/event/event.js | 3 ++- cocos2d/core/event/index.js | 3 ++- cocos2d/core/event/system-event.js | 3 ++- cocos2d/core/graphics/graphics-canvas-cmd.js | 3 ++- cocos2d/core/graphics/graphics-node.js | 3 ++- cocos2d/core/graphics/graphics-webgl-cmd.js | 3 ++- cocos2d/core/graphics/graphics.js | 3 ++- cocos2d/core/graphics/helper.js | 25 +++++++++++++++++++ cocos2d/core/graphics/index.js | 3 ++- cocos2d/core/graphics/types.js | 3 ++- cocos2d/core/index.js | 3 ++- cocos2d/core/label/CCHtmlTextParser.js | 1 + cocos2d/core/label/CCSGLabel.js | 3 ++- .../core/label/CCSGLabelCanvasRenderCmd.js | 3 ++- cocos2d/core/label/CCSGLabelWebGLRenderCmd.js | 3 ++- cocos2d/core/label/CCTextUtils.js | 3 ++- cocos2d/core/load-pipeline/CCLoader.js | 3 ++- cocos2d/core/load-pipeline/asset-loader.js | 5 ++-- cocos2d/core/load-pipeline/asset-table.js | 3 ++- .../core/load-pipeline/audio-downloader.js | 3 ++- .../core/load-pipeline/auto-release-utils.js | 5 ++-- .../core/load-pipeline/binary-downloader.js | 3 ++- cocos2d/core/load-pipeline/downloader.js | 3 ++- cocos2d/core/load-pipeline/index.js | 3 ++- cocos2d/core/load-pipeline/loader.js | 3 ++- cocos2d/core/load-pipeline/loading-items.js | 3 ++- cocos2d/core/load-pipeline/md5-pipe.js | 5 ++-- cocos2d/core/load-pipeline/pack-downloader.js | 3 ++- cocos2d/core/load-pipeline/pipeline.js | 3 ++- .../load-pipeline/released-asset-checker.js | 5 ++-- cocos2d/core/load-pipeline/text-downloader.js | 25 +++++++++++++++++++ cocos2d/core/load-pipeline/unpackers.js | 3 ++- cocos2d/core/load-pipeline/utils.js | 25 +++++++++++++++++++ cocos2d/core/load-pipeline/uuid-loader.js | 3 ++- cocos2d/core/node-activator.js | 5 ++-- cocos2d/core/physics/CCPhysicsContact.js | 25 +++++++++++++++++++ cocos2d/core/physics/CCPhysicsManager.js | 3 ++- cocos2d/core/physics/CCPhysicsTypes.js | 25 +++++++++++++++++++ cocos2d/core/physics/CCPolygonSeparator.js | 25 +++++++++++++++++++ cocos2d/core/physics/CCRigidBody.js | 3 ++- .../physics/collider/CCPhysicsBoxCollider.js | 3 ++- .../collider/CCPhysicsChainCollider.js | 3 ++- .../collider/CCPhysicsCircleCollider.js | 3 ++- .../physics/collider/CCPhysicsCollider.js | 3 ++- .../collider/CCPhysicsPolygonCollider.js | 3 ++- cocos2d/core/physics/index.js | 25 +++++++++++++++++++ cocos2d/core/physics/joint/CCDistanceJoint.js | 3 ++- cocos2d/core/physics/joint/CCJoint.js | 3 ++- cocos2d/core/physics/joint/CCMotorJoint.js | 3 ++- cocos2d/core/physics/joint/CCMouseJoint.js | 3 ++- .../core/physics/joint/CCPrismaticJoint.js | 3 ++- cocos2d/core/physics/joint/CCRevoluteJoint.js | 3 ++- cocos2d/core/physics/joint/CCRopeJoint.js | 3 ++- cocos2d/core/physics/joint/CCWeldJoint.js | 3 ++- cocos2d/core/physics/joint/CCWheelJoint.js | 3 ++- .../platform/CCPhysicsAABBQueryCallback.js | 25 +++++++++++++++++++ .../platform/CCPhysicsContactListner.js | 25 +++++++++++++++++++ .../physics/platform/CCPhysicsDebugDraw.js | 25 +++++++++++++++++++ .../platform/CCPhysicsRayCastCallback.js | 25 +++++++++++++++++++ .../core/physics/platform/CCPhysicsUtils.js | 25 +++++++++++++++++++ cocos2d/core/physics/utils.js | 25 +++++++++++++++++++ cocos2d/core/platform/CCAssetLibrary.js | 3 ++- cocos2d/core/platform/CCClass.js | 5 ++-- cocos2d/core/platform/CCClassDecorator.js | 5 ++-- cocos2d/core/platform/CCEnum.js | 3 ++- cocos2d/core/platform/CCInputExtension.js | 3 ++- cocos2d/core/platform/CCInputManager.js | 3 ++- cocos2d/core/platform/CCMacro.js | 3 ++- cocos2d/core/platform/CCObject.js | 25 +++++++++++++++++++ cocos2d/core/platform/CCSAXParser.js | 3 ++- cocos2d/core/platform/CCScreen.js | 3 ++- cocos2d/core/platform/CCSys.js | 3 ++- cocos2d/core/platform/CCView.js | 3 ++- cocos2d/core/platform/CCVisibleRect.js | 3 ++- cocos2d/core/platform/_CCClass.js | 3 ++- cocos2d/core/platform/attribute.js | 3 ++- cocos2d/core/platform/callbacks-invoker.js | 3 ++- cocos2d/core/platform/compiler.js | 5 ++-- cocos2d/core/platform/deserialize.js | 3 ++- cocos2d/core/platform/id-generater.js | 3 ++- cocos2d/core/platform/index.js | 3 ++- cocos2d/core/platform/instantiate-jit.js | 5 ++-- cocos2d/core/platform/instantiate.js | 3 ++- cocos2d/core/platform/js.js | 3 ++- cocos2d/core/platform/preprocess-class.js | 3 ++- cocos2d/core/platform/requiring-frame.js | 5 ++-- cocos2d/core/platform/url.js | 3 ++- cocos2d/core/platform/utils.js | 3 ++- cocos2d/core/predefine.js | 3 ++- cocos2d/core/renderer/DirtyRegion.js | 25 +++++++++++++++++++ cocos2d/core/renderer/RendererCanvas.js | 3 ++- cocos2d/core/renderer/RendererWebGL.js | 3 ++- cocos2d/core/renderer/index.js | 3 ++- cocos2d/core/scenes/CCSGScene.js | 3 ++- cocos2d/core/sprites/CCSGSprite.js | 3 ++- .../core/sprites/CCSGSpriteCanvasRenderCmd.js | 3 ++- .../core/sprites/CCSGSpriteWebGLRenderCmd.js | 3 ++- cocos2d/core/sprites/CCScale9Sprite.js | 1 + .../sprites/CCScale9SpriteCanvasRenderCmd.js | 1 + .../sprites/CCScale9SpriteWebGLRenderCmd.js | 1 + cocos2d/core/sprites/CCSpriteBatchNode.js | 3 ++- cocos2d/core/sprites/CCSpriteFrame.js | 3 ++- cocos2d/core/textures/CCTexture2D.js | 3 ++- cocos2d/core/textures/CCTextureCache.js | 3 ++- cocos2d/core/textures/index.js | 3 ++- cocos2d/core/utils/CCPath.js | 3 ++- cocos2d/core/utils/CCProfiler.js | 3 ++- cocos2d/core/utils/base-node.js | 3 ++- cocos2d/core/utils/binary-search.js | 5 ++-- cocos2d/core/utils/decode-uuid.js | 3 ++- cocos2d/core/utils/find.js | 3 ++- cocos2d/core/utils/index.js | 3 ++- cocos2d/core/utils/misc.js | 3 ++- .../core/utils/mutable-forward-iterator.js | 3 ++- cocos2d/core/utils/prefab-helper.js | 3 ++- cocos2d/core/utils/scene-graph-helper.js | 3 ++- cocos2d/core/value-types/CCAffineTransform.js | 3 ++- cocos2d/core/value-types/CCColor.js | 3 ++- cocos2d/core/value-types/CCPointExtension.js | 3 ++- cocos2d/core/value-types/CCRect.js | 3 ++- cocos2d/core/value-types/CCSize.js | 3 ++- cocos2d/core/value-types/CCTypes.js | 3 ++- cocos2d/core/value-types/CCTypesWebGL.js | 3 ++- cocos2d/core/value-types/CCValueType.js | 3 ++- cocos2d/core/value-types/CCVec2.js | 3 ++- cocos2d/core/value-types/index.js | 3 ++- cocos2d/core/videoplayer/CCSGVideoPlayer.js | 3 ++- cocos2d/core/webview/CCSGWebView.js | 3 ++- cocos2d/deprecated.js | 25 +++++++++++++++++++ cocos2d/index.js | 25 +++++++++++++++++++ cocos2d/kazmath/SIMDPolyfill.js | 3 ++- cocos2d/kazmath/aabb.js | 3 ++- cocos2d/kazmath/gl/mat4stack.js | 3 ++- cocos2d/kazmath/gl/matrix.js | 3 ++- cocos2d/kazmath/index.js | 25 +++++++++++++++++++ cocos2d/kazmath/mat3.js | 3 ++- cocos2d/kazmath/mat4.js | 3 ++- cocos2d/kazmath/mat4SIMD.js | 3 ++- cocos2d/kazmath/plane.js | 3 ++- cocos2d/kazmath/quaternion.js | 3 ++- cocos2d/kazmath/ray2.js | 3 ++- cocos2d/kazmath/utility.js | 3 ++- cocos2d/kazmath/vec2.js | 3 ++- cocos2d/kazmath/vec3.js | 3 ++- cocos2d/kazmath/vec3SIMD.js | 3 ++- cocos2d/kazmath/vec4.js | 3 ++- cocos2d/motion-streak/CCMotionStreak.js | 3 ++- cocos2d/motion-streak/CCSGMotionStreak.js | 3 ++- .../CCSGMotionStreakWebGLRenderCmd.js | 3 ++- cocos2d/particle/CCPNGReader.js | 3 ++- cocos2d/particle/CCParticleAsset.js | 3 ++- cocos2d/particle/CCParticleSystem.js | 3 ++- cocos2d/particle/CCSGParticleExamples.js | 3 ++- cocos2d/particle/CCSGParticleSystem.js | 3 ++- .../CCSGParticleSystemCanvasRenderCmd.js | 3 ++- .../CCSGParticleSystemWebGLRenderCmd.js | 3 ++- cocos2d/particle/CCTIFFReader.js | 3 ++- cocos2d/render-texture/CCRenderTexture.js | 3 ++- .../CCRenderTextureCanvasRenderCmd.js | 3 ++- .../CCRenderTextureWebGLRenderCmd.js | 3 ++- cocos2d/shaders/CCGLProgram.js | 3 ++- cocos2d/shaders/CCGLStateCache.js | 3 ++- cocos2d/shaders/CCShaderCache.js | 3 ++- cocos2d/shaders/CCShaders.js | 1 + cocos2d/shaders/index.js | 3 ++- cocos2d/shape-nodes/CCDrawNode.js | 3 ++- .../shape-nodes/CCDrawNodeCanvasRenderCmd.js | 3 ++- .../shape-nodes/CCDrawNodeWebGLRenderCmd.js | 3 ++- cocos2d/tilemap/CCSGTMXLayer.js | 3 ++- cocos2d/tilemap/CCSGTMXObject.js | 3 ++- cocos2d/tilemap/CCSGTMXObjectGroup.js | 3 ++- cocos2d/tilemap/CCSGTMXTiledMap.js | 3 ++- cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js | 1 + cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js | 1 + cocos2d/tilemap/CCTMXXMLParser.js | 3 ++- cocos2d/tilemap/CCTiledLayer.js | 3 ++- cocos2d/tilemap/CCTiledMap.js | 3 ++- cocos2d/tilemap/CCTiledMapAsset.js | 3 ++- cocos2d/tilemap/CCTiledObjectGroup.js | 3 ++- cocos2d/tilemap/editor/tiled-map.js | 25 +++++++++++++++++++ extends.js | 3 ++- extensions/anysdk/jsb_anysdk.js | 3 ++- extensions/ccpool/CCNodePool.js | 1 + extensions/ccpool/CCPool.js | 3 ++- extensions/dragonbones/ArmatureDisplay.js | 3 ++- extensions/dragonbones/CCArmatureDisplay.js | 1 + extensions/dragonbones/CCFactory.js | 1 + extensions/dragonbones/CCSlot.js | 1 + extensions/dragonbones/CCTextureData.js | 1 + extensions/dragonbones/DragonBonesAsset.js | 3 ++- .../dragonbones/DragonBonesAtlasAsset.js | 3 ++- .../editor/dragonbones-atlas-meta.js | 3 ++- .../dragonbones/editor/dragonbones-meta.js | 3 ++- extensions/dragonbones/index.js | 1 + extensions/spine/SGSkeleton.js | 1 + extensions/spine/SGSkeletonAnimation.js | 1 + extensions/spine/SGSkeletonCanvasRenderCmd.js | 1 + extensions/spine/SGSkeletonTexture.js | 3 ++- extensions/spine/SGSkeletonWebGLRenderCmd.js | 1 + extensions/spine/Skeleton.js | 3 ++- extensions/spine/SkeletonData.js | 3 ++- extensions/spine/editor/spine-meta.js | 25 +++++++++++++++++++ extensions/spine/index.js | 1 + gulp/tasks/engine.js | 2 +- gulp/tasks/test.js | 2 +- gulp/util/handleErrors.js | 2 +- gulpfile.js | 3 ++- index.js | 3 ++- jsb/index.js | 3 ++- jsb/jsb-action.js | 3 ++- jsb/jsb-apis.js | 3 ++- jsb/jsb-audio.js | 3 ++- jsb/jsb-box2d.js | 25 +++++++++++++++++++ jsb/jsb-director.js | 3 ++- jsb/jsb-dragonbones.js | 25 +++++++++++++++++++ jsb/jsb-editbox.js | 3 ++- jsb/jsb-enums.js | 3 ++- jsb/jsb-etc.js | 3 ++- jsb/jsb-event.js | 3 ++- jsb/jsb-game.js | 3 ++- jsb/jsb-label.js | 3 ++- jsb/jsb-loader.js | 3 ++- jsb/jsb-particle.js | 3 ++- jsb/jsb-scale9sprite.js | 3 ++- jsb/jsb-spine.js | 25 +++++++++++++++++++ jsb/jsb-tex-sprite-frame.js | 3 ++- jsb/jsb-tiledmap.js | 3 ++- jsb/jsb-videoplayer.js | 3 ++- jsb/jsb-webview.js | 3 ++- licenses/LICENSE | 3 ++- 339 files changed, 1638 insertions(+), 294 deletions(-) diff --git a/CCBoot.js b/CCBoot.js index 24aca4ba1c..a0c836ee4a 100644 --- a/CCBoot.js +++ b/CCBoot.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/CCDebugger.js b/CCDebugger.js index fc87d6abd2..e388eee65d 100644 --- a/CCDebugger.js +++ b/CCDebugger.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/DebugInfos.js b/DebugInfos.js index 651803e656..3b5b5cfb07 100644 --- a/DebugInfos.js +++ b/DebugInfos.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + if (CC_DEBUG) { module.exports = { // Common diff --git a/cocos2d/actions/CCAction.js b/cocos2d/actions/CCAction.js index 57e49ea6b7..08f1eaf611 100644 --- a/cocos2d/actions/CCAction.js +++ b/cocos2d/actions/CCAction.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/actions/CCActionCatmullRom.js b/cocos2d/actions/CCActionCatmullRom.js index 63fb9b1dfe..60883658b9 100644 --- a/cocos2d/actions/CCActionCatmullRom.js +++ b/cocos2d/actions/CCActionCatmullRom.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008 Radu Gruian Copyright (c) 2011 Vit Valentin diff --git a/cocos2d/actions/CCActionEase.js b/cocos2d/actions/CCActionEase.js index 809b55085d..456e5f35b6 100644 --- a/cocos2d/actions/CCActionEase.js +++ b/cocos2d/actions/CCActionEase.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/actions/CCActionInstant.js b/cocos2d/actions/CCActionInstant.js index 1727cc34ed..ea295c7863 100644 --- a/cocos2d/actions/CCActionInstant.js +++ b/cocos2d/actions/CCActionInstant.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/actions/CCActionInterval.js b/cocos2d/actions/CCActionInterval.js index 97d3f71d0e..bb122ac42e 100644 --- a/cocos2d/actions/CCActionInterval.js +++ b/cocos2d/actions/CCActionInterval.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/actions/CCActionManager.js b/cocos2d/actions/CCActionManager.js index 0d92bb2558..65bcbfa56a 100644 --- a/cocos2d/actions/CCActionManager.js +++ b/cocos2d/actions/CCActionManager.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/actions/index.js b/cocos2d/actions/index.js index ed6f20abc1..52557a1c17 100644 --- a/cocos2d/actions/index.js +++ b/cocos2d/actions/index.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + require('./CCActionManager'); require('./CCAction'); require('./CCActionInterval'); diff --git a/cocos2d/animation/animation-animator.js b/cocos2d/animation/animation-animator.js index dbdbd61ff9..77e4e2c526 100644 --- a/cocos2d/animation/animation-animator.js +++ b/cocos2d/animation/animation-animator.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var JS = cc.js; var Playable = require('./playable'); var DynamicAnimCurve = require('./animation-curves').DynamicAnimCurve; diff --git a/cocos2d/animation/animation-clip.js b/cocos2d/animation/animation-clip.js index f6004d0c35..5eecfd7f08 100644 --- a/cocos2d/animation/animation-clip.js +++ b/cocos2d/animation/animation-clip.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + /** * !#en Class for animation data handling. diff --git a/cocos2d/animation/animation-curves.js b/cocos2d/animation/animation-curves.js index 2b226b209c..e883e59052 100644 --- a/cocos2d/animation/animation-curves.js +++ b/cocos2d/animation/animation-curves.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var bezierByTime = require('./bezier').bezierByTime; diff --git a/cocos2d/animation/animation-manager.js b/cocos2d/animation/animation-manager.js index 510e573922..f0ba6abdb0 100644 --- a/cocos2d/animation/animation-manager.js +++ b/cocos2d/animation/animation-manager.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var JS = cc.js; var AnimationManager = cc.Class({ diff --git a/cocos2d/animation/animation-state.js b/cocos2d/animation/animation-state.js index b2b5fa3d0d..209036848c 100644 --- a/cocos2d/animation/animation-state.js +++ b/cocos2d/animation/animation-state.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var JS = cc.js; var Playable = require('./playable'); diff --git a/cocos2d/animation/bezier.js b/cocos2d/animation/bezier.js index 0f284f1827..f5dea5176a 100644 --- a/cocos2d/animation/bezier.js +++ b/cocos2d/animation/bezier.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + //var bezier = (function () { // function B1 (t) { return (t * t * t); } // function B2 (t) { return (3 * t * t * (1 - t)); } diff --git a/cocos2d/animation/easing.js b/cocos2d/animation/easing.js index 5bd051dc68..f17aadfde4 100644 --- a/cocos2d/animation/easing.js +++ b/cocos2d/animation/easing.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var Easing = { constant: function () { return 0; }, linear: function (k) { return k; }, diff --git a/cocos2d/animation/index.js b/cocos2d/animation/index.js index d09cdd0244..224528caaa 100644 --- a/cocos2d/animation/index.js +++ b/cocos2d/animation/index.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + require('./bezier'); require('./easing'); require('./types'); diff --git a/cocos2d/animation/motion-path-helper.js b/cocos2d/animation/motion-path-helper.js index 130a3acfad..604b7f9108 100644 --- a/cocos2d/animation/motion-path-helper.js +++ b/cocos2d/animation/motion-path-helper.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var DynamicAnimCurve = require('./animation-curves').DynamicAnimCurve; var computeRatioByType = require('./animation-curves').computeRatioByType; diff --git a/cocos2d/animation/playable.js b/cocos2d/animation/playable.js index b0bf1bf459..21fba9aa83 100644 --- a/cocos2d/animation/playable.js +++ b/cocos2d/animation/playable.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var JS = cc.js; /** diff --git a/cocos2d/animation/types.js b/cocos2d/animation/types.js index f5f4d6803c..50500b0457 100644 --- a/cocos2d/animation/types.js +++ b/cocos2d/animation/types.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var JS = cc.js; var WrapModeMask = { diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index d7e1b4e892..3725b323d2 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/audio/CCAudioEngine.js b/cocos2d/audio/CCAudioEngine.js index 5bf879d392..0cd68e6782 100644 --- a/cocos2d/audio/CCAudioEngine.js +++ b/cocos2d/audio/CCAudioEngine.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/audio/deprecated.js b/cocos2d/audio/deprecated.js index 747f283fa5..81f360a479 100644 --- a/cocos2d/audio/deprecated.js +++ b/cocos2d/audio/deprecated.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/clipping-nodes/CCClippingNode.js b/cocos2d/clipping-nodes/CCClippingNode.js index 3b735f8387..63bb6f5c81 100644 --- a/cocos2d/clipping-nodes/CCClippingNode.js +++ b/cocos2d/clipping-nodes/CCClippingNode.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2012 Pierre-David Bélanger http://www.cocos2d-x.org diff --git a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js index 016459275f..e7f4b4a751 100644 --- a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js +++ b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js index cacd2629e7..2d2b3ea06d 100644 --- a/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js +++ b/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCConfiguration.js b/cocos2d/core/CCConfiguration.js index c9b58841f2..d9eb425194 100644 --- a/cocos2d/core/CCConfiguration.js +++ b/cocos2d/core/CCConfiguration.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index d4a6c6b1ed..d3d4984f68 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCDirectorCanvas.js b/cocos2d/core/CCDirectorCanvas.js index ad03c86ec8..c0f97fcce8 100644 --- a/cocos2d/core/CCDirectorCanvas.js +++ b/cocos2d/core/CCDirectorCanvas.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCDirectorWebGL.js b/cocos2d/core/CCDirectorWebGL.js index 245f120342..0cec56e645 100644 --- a/cocos2d/core/CCDirectorWebGL.js +++ b/cocos2d/core/CCDirectorWebGL.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCDrawingPrimitives.js b/cocos2d/core/CCDrawingPrimitives.js index 7bffc2bb4b..13e48d1cbc 100644 --- a/cocos2d/core/CCDrawingPrimitives.js +++ b/cocos2d/core/CCDrawingPrimitives.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/CCDrawingPrimitivesCanvas.js b/cocos2d/core/CCDrawingPrimitivesCanvas.js index 5129ba8500..c29f067568 100644 --- a/cocos2d/core/CCDrawingPrimitivesCanvas.js +++ b/cocos2d/core/CCDrawingPrimitivesCanvas.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCDrawingPrimitivesWebGL.js b/cocos2d/core/CCDrawingPrimitivesWebGL.js index 3b614c619b..7a3967d060 100644 --- a/cocos2d/core/CCDrawingPrimitivesWebGL.js +++ b/cocos2d/core/CCDrawingPrimitivesWebGL.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index cb47718cff..c0a4475cd6 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index a9d7580e2f..9f449ca21f 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCScene.js b/cocos2d/core/CCScene.js index af493a061f..bcd8ab31d3 100644 --- a/cocos2d/core/CCScene.js +++ b/cocos2d/core/CCScene.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2015 Chukong Technologies Inc. + Copyright (c) 2015-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js index 23af974ea9..a64f17fb04 100644 --- a/cocos2d/core/CCScheduler.js +++ b/cocos2d/core/CCScheduler.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCAsset.js b/cocos2d/core/assets/CCAsset.js index fc804a5e52..0481fcfe62 100644 --- a/cocos2d/core/assets/CCAsset.js +++ b/cocos2d/core/assets/CCAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCAudioClip.js b/cocos2d/core/assets/CCAudioClip.js index b61fcfbc66..f5f23332bd 100644 --- a/cocos2d/core/assets/CCAudioClip.js +++ b/cocos2d/core/assets/CCAudioClip.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCBitmapFont.js b/cocos2d/core/assets/CCBitmapFont.js index 3c6471e3d7..45340968c6 100644 --- a/cocos2d/core/assets/CCBitmapFont.js +++ b/cocos2d/core/assets/CCBitmapFont.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCFont.js b/cocos2d/core/assets/CCFont.js index c399a13881..bd86f4a1ec 100644 --- a/cocos2d/core/assets/CCFont.js +++ b/cocos2d/core/assets/CCFont.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCLabelAtlas.js b/cocos2d/core/assets/CCLabelAtlas.js index 0d91dc6c4c..dd4e63005b 100644 --- a/cocos2d/core/assets/CCLabelAtlas.js +++ b/cocos2d/core/assets/CCLabelAtlas.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCPrefab.js b/cocos2d/core/assets/CCPrefab.js index 9635b42cd8..4385ff6cf7 100644 --- a/cocos2d/core/assets/CCPrefab.js +++ b/cocos2d/core/assets/CCPrefab.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCRawAsset.js b/cocos2d/core/assets/CCRawAsset.js index 867bc0154e..be3c7d0ec1 100644 --- a/cocos2d/core/assets/CCRawAsset.js +++ b/cocos2d/core/assets/CCRawAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCSceneAsset.js b/cocos2d/core/assets/CCSceneAsset.js index 51880e4741..f22c6f9fe7 100644 --- a/cocos2d/core/assets/CCSceneAsset.js +++ b/cocos2d/core/assets/CCSceneAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCScripts.js b/cocos2d/core/assets/CCScripts.js index b0c285c9ab..22f8a10e82 100644 --- a/cocos2d/core/assets/CCScripts.js +++ b/cocos2d/core/assets/CCScripts.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCSpriteAtlas.js b/cocos2d/core/assets/CCSpriteAtlas.js index 11d33630f6..5d6949928c 100644 --- a/cocos2d/core/assets/CCSpriteAtlas.js +++ b/cocos2d/core/assets/CCSpriteAtlas.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCTTFFont.js b/cocos2d/core/assets/CCTTFFont.js index 22d4433256..bb6df9d60e 100644 --- a/cocos2d/core/assets/CCTTFFont.js +++ b/cocos2d/core/assets/CCTTFFont.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/CCTextAsset.js b/cocos2d/core/assets/CCTextAsset.js index b44fdb3b86..b4f33cd0c0 100644 --- a/cocos2d/core/assets/CCTextAsset.js +++ b/cocos2d/core/assets/CCTextAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/assets/index.js b/cocos2d/core/assets/index.js index db3a81a7eb..3bfde19508 100644 --- a/cocos2d/core/assets/index.js +++ b/cocos2d/core/assets/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/base-nodes/CCSGNode.js b/cocos2d/core/base-nodes/CCSGNode.js index ef00d365c0..91c0dec446 100644 --- a/cocos2d/core/base-nodes/CCSGNode.js +++ b/cocos2d/core/base-nodes/CCSGNode.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js b/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js index acba7e79c2..c87fc3c4ee 100644 --- a/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js +++ b/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js index 09463e6c54..1ef4968902 100644 --- a/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js +++ b/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js b/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js index 0eea654e68..e876c9d5c4 100644 --- a/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js +++ b/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index ce4f6081e2..c683715bfb 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/camera/CCCamera.js b/cocos2d/core/camera/CCCamera.js index 36ee87e425..1a83f3154e 100644 --- a/cocos2d/core/camera/CCCamera.js +++ b/cocos2d/core/camera/CCCamera.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/camera/CCSGCameraNode.js b/cocos2d/core/camera/CCSGCameraNode.js index 5522d9c461..54803f1561 100644 --- a/cocos2d/core/camera/CCSGCameraNode.js +++ b/cocos2d/core/camera/CCSGCameraNode.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var tempMat = new cc.math.Matrix4(); let CameraNode = _ccsg.Node.extend({ diff --git a/cocos2d/core/collider/CCBoxCollider.js b/cocos2d/core/collider/CCBoxCollider.js index f8e54da11e..25a3265211 100644 --- a/cocos2d/core/collider/CCBoxCollider.js +++ b/cocos2d/core/collider/CCBoxCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/CCCircleCollider.js b/cocos2d/core/collider/CCCircleCollider.js index e039ca3afb..54006a0c4a 100644 --- a/cocos2d/core/collider/CCCircleCollider.js +++ b/cocos2d/core/collider/CCCircleCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/CCCollider.js b/cocos2d/core/collider/CCCollider.js index 88a63a877d..af9eb39ac9 100644 --- a/cocos2d/core/collider/CCCollider.js +++ b/cocos2d/core/collider/CCCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/CCCollisionManager.js b/cocos2d/core/collider/CCCollisionManager.js index d050d93846..962b40a26b 100644 --- a/cocos2d/core/collider/CCCollisionManager.js +++ b/cocos2d/core/collider/CCCollisionManager.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var Contact = require('./CCContact'); var CollisionType = Contact.CollisionType; diff --git a/cocos2d/core/collider/CCContact.js b/cocos2d/core/collider/CCContact.js index 8cb1922f52..d975171836 100644 --- a/cocos2d/core/collider/CCContact.js +++ b/cocos2d/core/collider/CCContact.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var Intersection = require('./CCIntersection'); diff --git a/cocos2d/core/collider/CCIntersection.js b/cocos2d/core/collider/CCIntersection.js index 80fbb6fa6a..600077025a 100644 --- a/cocos2d/core/collider/CCIntersection.js +++ b/cocos2d/core/collider/CCIntersection.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + /** * !#en Intersection helper class * !#zh 辅助类,用于测试形状与形状是否相交 diff --git a/cocos2d/core/collider/CCPolygonCollider.js b/cocos2d/core/collider/CCPolygonCollider.js index 750b227820..9b01679307 100644 --- a/cocos2d/core/collider/CCPolygonCollider.js +++ b/cocos2d/core/collider/CCPolygonCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/collider/index.js b/cocos2d/core/collider/index.js index e772ebee6c..98873d2ee9 100644 --- a/cocos2d/core/collider/index.js +++ b/cocos2d/core/collider/index.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + require('./CCCollisionManager'); require('./CCCollider'); diff --git a/cocos2d/core/component-scheduler.js b/cocos2d/core/component-scheduler.js index 7d7371f93d..6c0582bf18 100644 --- a/cocos2d/core/component-scheduler.js +++ b/cocos2d/core/component-scheduler.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCAnimation.js b/cocos2d/core/components/CCAnimation.js index 28ffef1c5b..a89548a558 100644 --- a/cocos2d/core/components/CCAnimation.js +++ b/cocos2d/core/components/CCAnimation.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCAudioSource.js b/cocos2d/core/components/CCAudioSource.js index 602fcb5a53..536be692a2 100644 --- a/cocos2d/core/components/CCAudioSource.js +++ b/cocos2d/core/components/CCAudioSource.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCBlockInputEvents.js b/cocos2d/core/components/CCBlockInputEvents.js index 7658aa12af..aa236a2dbf 100644 --- a/cocos2d/core/components/CCBlockInputEvents.js +++ b/cocos2d/core/components/CCBlockInputEvents.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index 5240454dae..bd94527222 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCCanvas.js b/cocos2d/core/components/CCCanvas.js index 8f2bc4c940..93e1c87386 100644 --- a/cocos2d/core/components/CCCanvas.js +++ b/cocos2d/core/components/CCCanvas.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCComponent.js b/cocos2d/core/components/CCComponent.js index 34950d4471..88c14265b6 100644 --- a/cocos2d/core/components/CCComponent.js +++ b/cocos2d/core/components/CCComponent.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCComponentEventHandler.js b/cocos2d/core/components/CCComponentEventHandler.js index e70478837a..9a0b2fd373 100644 --- a/cocos2d/core/components/CCComponentEventHandler.js +++ b/cocos2d/core/components/CCComponentEventHandler.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCEditBox.js b/cocos2d/core/components/CCEditBox.js index 59209f3458..13b00faacb 100644 --- a/cocos2d/core/components/CCEditBox.js +++ b/cocos2d/core/components/CCEditBox.js @@ -2,6 +2,7 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -14,7 +15,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index edfa09f938..24343f1f9f 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCLabelOutline.js b/cocos2d/core/components/CCLabelOutline.js index 4a289db2a1..f819fd991c 100644 --- a/cocos2d/core/components/CCLabelOutline.js +++ b/cocos2d/core/components/CCLabelOutline.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCLayout.js b/cocos2d/core/components/CCLayout.js index 61304a7b01..5abdbe7e09 100644 --- a/cocos2d/core/components/CCLayout.js +++ b/cocos2d/core/components/CCLayout.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCMask.js b/cocos2d/core/components/CCMask.js index 42c41d3907..bbd0679757 100644 --- a/cocos2d/core/components/CCMask.js +++ b/cocos2d/core/components/CCMask.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCPageView.js b/cocos2d/core/components/CCPageView.js index 1088708f0a..e69919d73a 100644 --- a/cocos2d/core/components/CCPageView.js +++ b/cocos2d/core/components/CCPageView.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCPageViewIndicator.js b/cocos2d/core/components/CCPageViewIndicator.js index d7bed5cc84..db34d5a6d2 100644 --- a/cocos2d/core/components/CCPageViewIndicator.js +++ b/cocos2d/core/components/CCPageViewIndicator.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCProgressBar.js b/cocos2d/core/components/CCProgressBar.js index 77c392430e..01abf78ea3 100644 --- a/cocos2d/core/components/CCProgressBar.js +++ b/cocos2d/core/components/CCProgressBar.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCRendererInSG.js b/cocos2d/core/components/CCRendererInSG.js index 403763acc0..917ddbe57b 100644 --- a/cocos2d/core/components/CCRendererInSG.js +++ b/cocos2d/core/components/CCRendererInSG.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCRendererUnderSG.js b/cocos2d/core/components/CCRendererUnderSG.js index 38d131e748..b302e4405f 100644 --- a/cocos2d/core/components/CCRendererUnderSG.js +++ b/cocos2d/core/components/CCRendererUnderSG.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCRichText.js b/cocos2d/core/components/CCRichText.js index ce2cf842f8..d24e530b40 100644 --- a/cocos2d/core/components/CCRichText.js +++ b/cocos2d/core/components/CCRichText.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSGComponent.js b/cocos2d/core/components/CCSGComponent.js index 8fc92835ac..4cd8c32cc8 100644 --- a/cocos2d/core/components/CCSGComponent.js +++ b/cocos2d/core/components/CCSGComponent.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCScrollBar.js b/cocos2d/core/components/CCScrollBar.js index 9d01f25a51..d06d47ce1d 100644 --- a/cocos2d/core/components/CCScrollBar.js +++ b/cocos2d/core/components/CCScrollBar.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index bcfcb743ef..233a30b58d 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSlider.js b/cocos2d/core/components/CCSlider.js index 440fdb7346..b3da650c4c 100644 --- a/cocos2d/core/components/CCSlider.js +++ b/cocos2d/core/components/CCSlider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index a9694c8d2d..a31544e6ef 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCSpriteDistortion.js b/cocos2d/core/components/CCSpriteDistortion.js index 23277e20f3..ad677c3f64 100644 --- a/cocos2d/core/components/CCSpriteDistortion.js +++ b/cocos2d/core/components/CCSpriteDistortion.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCStudioComponent.js b/cocos2d/core/components/CCStudioComponent.js index 90b8366bfa..4ea7a9d944 100644 --- a/cocos2d/core/components/CCStudioComponent.js +++ b/cocos2d/core/components/CCStudioComponent.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var ComponentType = cc.Enum({ NONE : 0, diff --git a/cocos2d/core/components/CCToggle.js b/cocos2d/core/components/CCToggle.js index 3d71c883ec..e506eedfc9 100644 --- a/cocos2d/core/components/CCToggle.js +++ b/cocos2d/core/components/CCToggle.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCToggleContainer.js b/cocos2d/core/components/CCToggleContainer.js index 88d9bde93a..0c80ab01f3 100644 --- a/cocos2d/core/components/CCToggleContainer.js +++ b/cocos2d/core/components/CCToggleContainer.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCToggleGroup.js b/cocos2d/core/components/CCToggleGroup.js index de68fbbcac..9ac79581d5 100644 --- a/cocos2d/core/components/CCToggleGroup.js +++ b/cocos2d/core/components/CCToggleGroup.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCVideoPlayer.js b/cocos2d/core/components/CCVideoPlayer.js index 44840f87d9..beee3b7350 100644 --- a/cocos2d/core/components/CCVideoPlayer.js +++ b/cocos2d/core/components/CCVideoPlayer.js @@ -2,6 +2,7 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, @@ -11,7 +12,7 @@ used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/core/components/CCViewGroup.js b/cocos2d/core/components/CCViewGroup.js index 2788440c0d..04b7b2f79f 100644 --- a/cocos2d/core/components/CCViewGroup.js +++ b/cocos2d/core/components/CCViewGroup.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/CCWebView.js b/cocos2d/core/components/CCWebView.js index 99ec40daae..9ff2793311 100644 --- a/cocos2d/core/components/CCWebView.js +++ b/cocos2d/core/components/CCWebView.js @@ -2,6 +2,7 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, @@ -11,7 +12,7 @@ used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index cc25ec392d..e6abb4ec5e 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/index.js b/cocos2d/core/components/index.js index 99b4905db2..ae0243cfa8 100644 --- a/cocos2d/core/components/index.js +++ b/cocos2d/core/components/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/components/missing-script.js b/cocos2d/core/components/missing-script.js index aa8da65e79..5a3bf11c98 100644 --- a/cocos2d/core/components/missing-script.js +++ b/cocos2d/core/components/missing-script.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/editbox/CCSGEditBox.js b/cocos2d/core/editbox/CCSGEditBox.js index 3f253b395c..53e93b5cbe 100644 --- a/cocos2d/core/editbox/CCSGEditBox.js +++ b/cocos2d/core/editbox/CCSGEditBox.js @@ -2,6 +2,7 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2012 James Chen Copyright (c) 2011-2012 cocos2d-x.org diff --git a/cocos2d/core/event-manager/CCEvent.js b/cocos2d/core/event-manager/CCEvent.js index 256638e5f4..fa781d6355 100644 --- a/cocos2d/core/event-manager/CCEvent.js +++ b/cocos2d/core/event-manager/CCEvent.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/CCEventListener.js b/cocos2d/core/event-manager/CCEventListener.js index 21f90265dd..d3bac346ff 100644 --- a/cocos2d/core/event-manager/CCEventListener.js +++ b/cocos2d/core/event-manager/CCEventListener.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/CCEventManager.js b/cocos2d/core/event-manager/CCEventManager.js index 8bdf8aeb2e..74e8299e33 100644 --- a/cocos2d/core/event-manager/CCEventManager.js +++ b/cocos2d/core/event-manager/CCEventManager.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/CCTouch.js b/cocos2d/core/event-manager/CCTouch.js index f8798c30f6..c678d6f711 100644 --- a/cocos2d/core/event-manager/CCTouch.js +++ b/cocos2d/core/event-manager/CCTouch.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event-manager/index.js b/cocos2d/core/event-manager/index.js index b8d6a430c2..21d36dea1d 100644 --- a/cocos2d/core/event-manager/index.js +++ b/cocos2d/core/event-manager/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/event-listeners.js b/cocos2d/core/event/event-listeners.js index a53c83de84..76adb60d17 100644 --- a/cocos2d/core/event/event-listeners.js +++ b/cocos2d/core/event/event-listeners.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/event-target.js b/cocos2d/core/event/event-target.js index ba08fbb08b..5bc41f6cb7 100644 --- a/cocos2d/core/event/event-target.js +++ b/cocos2d/core/event/event-target.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/event.js b/cocos2d/core/event/event.js index fb13cdbfbd..ca9c9e0013 100644 --- a/cocos2d/core/event/event.js +++ b/cocos2d/core/event/event.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/index.js b/cocos2d/core/event/index.js index f63cf24695..25158f1a57 100644 --- a/cocos2d/core/event/index.js +++ b/cocos2d/core/event/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/event/system-event.js b/cocos2d/core/event/system-event.js index 75e615c246..d092cd497f 100644 --- a/cocos2d/core/event/system-event.js +++ b/cocos2d/core/event/system-event.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/graphics-canvas-cmd.js b/cocos2d/core/graphics/graphics-canvas-cmd.js index ad06547ad2..2aac90ba2d 100644 --- a/cocos2d/core/graphics/graphics-canvas-cmd.js +++ b/cocos2d/core/graphics/graphics-canvas-cmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/graphics/graphics-node.js b/cocos2d/core/graphics/graphics-node.js index 548eeaa9d9..d337a34ee4 100644 --- a/cocos2d/core/graphics/graphics-node.js +++ b/cocos2d/core/graphics/graphics-node.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/graphics-webgl-cmd.js b/cocos2d/core/graphics/graphics-webgl-cmd.js index bdf3078b8f..cc50188f76 100644 --- a/cocos2d/core/graphics/graphics-webgl-cmd.js +++ b/cocos2d/core/graphics/graphics-webgl-cmd.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/graphics.js b/cocos2d/core/graphics/graphics.js index eb718ea522..c2dfa0920a 100644 --- a/cocos2d/core/graphics/graphics.js +++ b/cocos2d/core/graphics/graphics.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/helper.js b/cocos2d/core/graphics/helper.js index e21bfd6879..90a411da14 100644 --- a/cocos2d/core/graphics/helper.js +++ b/cocos2d/core/graphics/helper.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var PI = Math.PI; var min = Math.min; diff --git a/cocos2d/core/graphics/index.js b/cocos2d/core/graphics/index.js index 9191f81159..e140b9000e 100644 --- a/cocos2d/core/graphics/index.js +++ b/cocos2d/core/graphics/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/graphics/types.js b/cocos2d/core/graphics/types.js index e5916dba9f..56681d87fb 100644 --- a/cocos2d/core/graphics/types.js +++ b/cocos2d/core/graphics/types.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/index.js b/cocos2d/core/index.js index c35524c26d..26932ca0d5 100644 --- a/cocos2d/core/index.js +++ b/cocos2d/core/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/label/CCHtmlTextParser.js b/cocos2d/core/label/CCHtmlTextParser.js index 758d828077..beb71269f6 100644 --- a/cocos2d/core/label/CCHtmlTextParser.js +++ b/cocos2d/core/label/CCHtmlTextParser.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos2d/core/label/CCSGLabel.js b/cocos2d/core/label/CCSGLabel.js index 46d793ff53..11cad61a45 100644 --- a/cocos2d/core/label/CCSGLabel.js +++ b/cocos2d/core/label/CCSGLabel.js @@ -1,7 +1,8 @@ /*global cc */ /**************************************************************************** - Copyright (c) 2015 Chukong Technologies Inc. + Copyright (c) 2015-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js b/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js index 9a0ed54f7b..203b74e875 100644 --- a/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js +++ b/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js b/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js index 680c467594..583312c91c 100644 --- a/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js +++ b/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/label/CCTextUtils.js b/cocos2d/core/label/CCTextUtils.js index 41e0dd832e..c91a923abc 100644 --- a/cocos2d/core/label/CCTextUtils.js +++ b/cocos2d/core/label/CCTextUtils.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index ea1383be73..b91aa39ea9 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/asset-loader.js b/cocos2d/core/load-pipeline/asset-loader.js index 62938c81d7..634ff5eb72 100644 --- a/cocos2d/core/load-pipeline/asset-loader.js +++ b/cocos2d/core/load-pipeline/asset-loader.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2017 Chukong Technologies Inc. + Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/asset-table.js b/cocos2d/core/load-pipeline/asset-table.js index 3273611714..0156008c9d 100644 --- a/cocos2d/core/load-pipeline/asset-table.js +++ b/cocos2d/core/load-pipeline/asset-table.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/audio-downloader.js b/cocos2d/core/load-pipeline/audio-downloader.js index 7d714bd7de..4104e78c00 100644 --- a/cocos2d/core/load-pipeline/audio-downloader.js +++ b/cocos2d/core/load-pipeline/audio-downloader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/auto-release-utils.js b/cocos2d/core/load-pipeline/auto-release-utils.js index f27641da10..c889d22655 100644 --- a/cocos2d/core/load-pipeline/auto-release-utils.js +++ b/cocos2d/core/load-pipeline/auto-release-utils.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2017 Chukong Technologies Inc. + Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/binary-downloader.js b/cocos2d/core/load-pipeline/binary-downloader.js index b6ff262620..0bf0bc14e7 100644 --- a/cocos2d/core/load-pipeline/binary-downloader.js +++ b/cocos2d/core/load-pipeline/binary-downloader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/downloader.js b/cocos2d/core/load-pipeline/downloader.js index 364788cc3c..9a129f42ae 100644 --- a/cocos2d/core/load-pipeline/downloader.js +++ b/cocos2d/core/load-pipeline/downloader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/index.js b/cocos2d/core/load-pipeline/index.js index 5829c96fed..b93a25525d 100644 --- a/cocos2d/core/load-pipeline/index.js +++ b/cocos2d/core/load-pipeline/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/loader.js b/cocos2d/core/load-pipeline/loader.js index 110294820d..45d2f04c35 100644 --- a/cocos2d/core/load-pipeline/loader.js +++ b/cocos2d/core/load-pipeline/loader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/loading-items.js b/cocos2d/core/load-pipeline/loading-items.js index 32c118d208..4ccadbc03b 100644 --- a/cocos2d/core/load-pipeline/loading-items.js +++ b/cocos2d/core/load-pipeline/loading-items.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/md5-pipe.js b/cocos2d/core/load-pipeline/md5-pipe.js index f98c937ec6..cb3e4ba937 100644 --- a/cocos2d/core/load-pipeline/md5-pipe.js +++ b/cocos2d/core/load-pipeline/md5-pipe.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2017 Chukong Technologies Inc. + Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/pack-downloader.js b/cocos2d/core/load-pipeline/pack-downloader.js index b002eb788b..2d161ce312 100644 --- a/cocos2d/core/load-pipeline/pack-downloader.js +++ b/cocos2d/core/load-pipeline/pack-downloader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/pipeline.js b/cocos2d/core/load-pipeline/pipeline.js index ee98436473..6a60948cc7 100644 --- a/cocos2d/core/load-pipeline/pipeline.js +++ b/cocos2d/core/load-pipeline/pipeline.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/released-asset-checker.js b/cocos2d/core/load-pipeline/released-asset-checker.js index 9d4b6e3ec2..881bdc42f0 100644 --- a/cocos2d/core/load-pipeline/released-asset-checker.js +++ b/cocos2d/core/load-pipeline/released-asset-checker.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/text-downloader.js b/cocos2d/core/load-pipeline/text-downloader.js index 39ac5a3e7e..a25398d941 100644 --- a/cocos2d/core/load-pipeline/text-downloader.js +++ b/cocos2d/core/load-pipeline/text-downloader.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var sys = require('../platform/CCSys'); if (CC_JSB) { diff --git a/cocos2d/core/load-pipeline/unpackers.js b/cocos2d/core/load-pipeline/unpackers.js index f69a4a05db..32596eb4da 100644 --- a/cocos2d/core/load-pipeline/unpackers.js +++ b/cocos2d/core/load-pipeline/unpackers.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/load-pipeline/utils.js b/cocos2d/core/load-pipeline/utils.js index 14a721b909..35f1529fec 100644 --- a/cocos2d/core/load-pipeline/utils.js +++ b/cocos2d/core/load-pipeline/utils.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var _noCacheRex = /\?/; module.exports = { diff --git a/cocos2d/core/load-pipeline/uuid-loader.js b/cocos2d/core/load-pipeline/uuid-loader.js index d723d20cc9..c3897ff3e4 100644 --- a/cocos2d/core/load-pipeline/uuid-loader.js +++ b/cocos2d/core/load-pipeline/uuid-loader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/node-activator.js b/cocos2d/core/node-activator.js index 6ec5e3fdd5..7ef4f55efa 100644 --- a/cocos2d/core/node-activator.js +++ b/cocos2d/core/node-activator.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/CCPhysicsContact.js b/cocos2d/core/physics/CCPhysicsContact.js index 048b9a9449..f7fd3d1f32 100644 --- a/cocos2d/core/physics/CCPhysicsContact.js +++ b/cocos2d/core/physics/CCPhysicsContact.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var PTM_RATIO = require('./CCPhysicsTypes').PTM_RATIO; var ContactType = require('./CCPhysicsTypes').ContactType; diff --git a/cocos2d/core/physics/CCPhysicsManager.js b/cocos2d/core/physics/CCPhysicsManager.js index 1552b60234..4836df8d9f 100644 --- a/cocos2d/core/physics/CCPhysicsManager.js +++ b/cocos2d/core/physics/CCPhysicsManager.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/CCPhysicsTypes.js b/cocos2d/core/physics/CCPhysicsTypes.js index 930c0e7ac6..e19cb5f1b4 100644 --- a/cocos2d/core/physics/CCPhysicsTypes.js +++ b/cocos2d/core/physics/CCPhysicsTypes.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var ContactType = { BEGIN_CONTACT: 'begin-contact', diff --git a/cocos2d/core/physics/CCPolygonSeparator.js b/cocos2d/core/physics/CCPolygonSeparator.js index cbc4575ee4..4b5aae7345 100644 --- a/cocos2d/core/physics/CCPolygonSeparator.js +++ b/cocos2d/core/physics/CCPolygonSeparator.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + // http://answers.unity3d.com/questions/977416/2d-polygon-convex-decomposition-code.html /// diff --git a/cocos2d/core/physics/CCRigidBody.js b/cocos2d/core/physics/CCRigidBody.js index e05247e085..79f8af3eb5 100644 --- a/cocos2d/core/physics/CCRigidBody.js +++ b/cocos2d/core/physics/CCRigidBody.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js b/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js index 69719410f2..6cadd5a548 100644 --- a/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsBoxCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsChainCollider.js b/cocos2d/core/physics/collider/CCPhysicsChainCollider.js index 3dc08c519e..a4e31fb9fa 100644 --- a/cocos2d/core/physics/collider/CCPhysicsChainCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsChainCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js b/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js index 5b501b1bef..bc064a3a8e 100644 --- a/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsCircleCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsCollider.js b/cocos2d/core/physics/collider/CCPhysicsCollider.js index ac291d4a5a..bd4c6058e6 100644 --- a/cocos2d/core/physics/collider/CCPhysicsCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js b/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js index 71770d019f..dd1dc31809 100644 --- a/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsPolygonCollider.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/index.js b/cocos2d/core/physics/index.js index 1beab869be..5188b2e136 100644 --- a/cocos2d/core/physics/index.js +++ b/cocos2d/core/physics/index.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + if (!CC_JSB) { window.b2 = require('../../../external/box2d/box2d'); diff --git a/cocos2d/core/physics/joint/CCDistanceJoint.js b/cocos2d/core/physics/joint/CCDistanceJoint.js index f2137ba64e..ad35605226 100644 --- a/cocos2d/core/physics/joint/CCDistanceJoint.js +++ b/cocos2d/core/physics/joint/CCDistanceJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCJoint.js b/cocos2d/core/physics/joint/CCJoint.js index e907379b51..c56c32e217 100644 --- a/cocos2d/core/physics/joint/CCJoint.js +++ b/cocos2d/core/physics/joint/CCJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCMotorJoint.js b/cocos2d/core/physics/joint/CCMotorJoint.js index a15e33c1a4..58ab320a1f 100644 --- a/cocos2d/core/physics/joint/CCMotorJoint.js +++ b/cocos2d/core/physics/joint/CCMotorJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCMouseJoint.js b/cocos2d/core/physics/joint/CCMouseJoint.js index 5b166ba2bc..83931a1ceb 100644 --- a/cocos2d/core/physics/joint/CCMouseJoint.js +++ b/cocos2d/core/physics/joint/CCMouseJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCPrismaticJoint.js b/cocos2d/core/physics/joint/CCPrismaticJoint.js index f978fa1f72..0fe4867c51 100644 --- a/cocos2d/core/physics/joint/CCPrismaticJoint.js +++ b/cocos2d/core/physics/joint/CCPrismaticJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCRevoluteJoint.js b/cocos2d/core/physics/joint/CCRevoluteJoint.js index 77d33e20c9..fa0a476493 100644 --- a/cocos2d/core/physics/joint/CCRevoluteJoint.js +++ b/cocos2d/core/physics/joint/CCRevoluteJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCRopeJoint.js b/cocos2d/core/physics/joint/CCRopeJoint.js index c4c405285b..e61c6ba424 100644 --- a/cocos2d/core/physics/joint/CCRopeJoint.js +++ b/cocos2d/core/physics/joint/CCRopeJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCWeldJoint.js b/cocos2d/core/physics/joint/CCWeldJoint.js index ebdbf598df..64357a3140 100644 --- a/cocos2d/core/physics/joint/CCWeldJoint.js +++ b/cocos2d/core/physics/joint/CCWeldJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/joint/CCWheelJoint.js b/cocos2d/core/physics/joint/CCWheelJoint.js index d9b7d6462d..203a1710e6 100644 --- a/cocos2d/core/physics/joint/CCWheelJoint.js +++ b/cocos2d/core/physics/joint/CCWheelJoint.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js b/cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js index 06f0ac6407..85ba38e6e9 100644 --- a/cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js +++ b/cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + function PhysicsAABBQueryCallback () { this._point = new b2.Vec2(); diff --git a/cocos2d/core/physics/platform/CCPhysicsContactListner.js b/cocos2d/core/physics/platform/CCPhysicsContactListner.js index 25eb50a03a..efbb13ed75 100644 --- a/cocos2d/core/physics/platform/CCPhysicsContactListner.js +++ b/cocos2d/core/physics/platform/CCPhysicsContactListner.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + function PhysicsContactListener () { this._contactFixtures = []; diff --git a/cocos2d/core/physics/platform/CCPhysicsDebugDraw.js b/cocos2d/core/physics/platform/CCPhysicsDebugDraw.js index 288c3829c6..2b0845b887 100644 --- a/cocos2d/core/physics/platform/CCPhysicsDebugDraw.js +++ b/cocos2d/core/physics/platform/CCPhysicsDebugDraw.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var PTM_RATIO = require('../CCPhysicsTypes').PTM_RATIO; var PhysicsDebugDraw = cc.Class({ diff --git a/cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js b/cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js index 4963686e06..181925536d 100644 --- a/cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js +++ b/cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + function PhysicsRayCastCallback () { this._type = 0; diff --git a/cocos2d/core/physics/platform/CCPhysicsUtils.js b/cocos2d/core/physics/platform/CCPhysicsUtils.js index e70b3b3837..708d6dbaf3 100644 --- a/cocos2d/core/physics/platform/CCPhysicsUtils.js +++ b/cocos2d/core/physics/platform/CCPhysicsUtils.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var PHYSICS_ANGLE_TO_ANGLE = require('../CCPhysicsTypes').PHYSICS_ANGLE_TO_ANGLE; var PTM_RATIO = require('../CCPhysicsTypes').PTM_RATIO; diff --git a/cocos2d/core/physics/utils.js b/cocos2d/core/physics/utils.js index 4405bc040c..ce1a7857f9 100644 --- a/cocos2d/core/physics/utils.js +++ b/cocos2d/core/physics/utils.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + function getWorldRotation (node) { var rot = node.rotationX; diff --git a/cocos2d/core/platform/CCAssetLibrary.js b/cocos2d/core/platform/CCAssetLibrary.js index 3b07c0e019..c5b5273cad 100644 --- a/cocos2d/core/platform/CCAssetLibrary.js +++ b/cocos2d/core/platform/CCAssetLibrary.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCClass.js b/cocos2d/core/platform/CCClass.js index b75001c8f7..81e68a6643 100644 --- a/cocos2d/core/platform/CCClass.js +++ b/cocos2d/core/platform/CCClass.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCClassDecorator.js b/cocos2d/core/platform/CCClassDecorator.js index e6b1f5cfa5..d6dfd396e9 100644 --- a/cocos2d/core/platform/CCClassDecorator.js +++ b/cocos2d/core/platform/CCClassDecorator.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCEnum.js b/cocos2d/core/platform/CCEnum.js index 72c634be7d..c04c5b207c 100644 --- a/cocos2d/core/platform/CCEnum.js +++ b/cocos2d/core/platform/CCEnum.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCInputExtension.js b/cocos2d/core/platform/CCInputExtension.js index 9f4a1c76fc..a880b5b924 100644 --- a/cocos2d/core/platform/CCInputExtension.js +++ b/cocos2d/core/platform/CCInputExtension.js @@ -1,6 +1,7 @@ /**************************************************************************** Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/CCInputManager.js b/cocos2d/core/platform/CCInputManager.js index 2aeef32fbe..acaa0da58a 100644 --- a/cocos2d/core/platform/CCInputManager.js +++ b/cocos2d/core/platform/CCInputManager.js @@ -1,6 +1,7 @@ /**************************************************************************** Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/CCMacro.js b/cocos2d/core/platform/CCMacro.js index 30f3738e8b..fae1399e0a 100644 --- a/cocos2d/core/platform/CCMacro.js +++ b/cocos2d/core/platform/CCMacro.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/CCObject.js b/cocos2d/core/platform/CCObject.js index 2d923291d6..082f726c3d 100644 --- a/cocos2d/core/platform/CCObject.js +++ b/cocos2d/core/platform/CCObject.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var JS = require('./js'); var CCClass = require('./CCClass'); diff --git a/cocos2d/core/platform/CCSAXParser.js b/cocos2d/core/platform/CCSAXParser.js index 3e763715cc..d24a890015 100644 --- a/cocos2d/core/platform/CCSAXParser.js +++ b/cocos2d/core/platform/CCSAXParser.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/CCScreen.js b/cocos2d/core/platform/CCScreen.js index 8af9cc3a92..0a440f4d88 100644 --- a/cocos2d/core/platform/CCScreen.js +++ b/cocos2d/core/platform/CCScreen.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index b0731d4fd2..172c631b06 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/CCView.js b/cocos2d/core/platform/CCView.js index e07fec158b..57f26bbabd 100644 --- a/cocos2d/core/platform/CCView.js +++ b/cocos2d/core/platform/CCView.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/CCVisibleRect.js b/cocos2d/core/platform/CCVisibleRect.js index 08cec5fa16..91ed472bb2 100644 --- a/cocos2d/core/platform/CCVisibleRect.js +++ b/cocos2d/core/platform/CCVisibleRect.js @@ -1,6 +1,7 @@ /**************************************************************************** Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/_CCClass.js b/cocos2d/core/platform/_CCClass.js index 3056711b64..8550cb8740 100644 --- a/cocos2d/core/platform/_CCClass.js +++ b/cocos2d/core/platform/_CCClass.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/attribute.js b/cocos2d/core/platform/attribute.js index aaef5f2187..0801d592e2 100644 --- a/cocos2d/core/platform/attribute.js +++ b/cocos2d/core/platform/attribute.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/callbacks-invoker.js b/cocos2d/core/platform/callbacks-invoker.js index a27e944bd2..a4549e3392 100644 --- a/cocos2d/core/platform/callbacks-invoker.js +++ b/cocos2d/core/platform/callbacks-invoker.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/compiler.js b/cocos2d/core/platform/compiler.js index cc63d4ee5a..f667267420 100644 --- a/cocos2d/core/platform/compiler.js +++ b/cocos2d/core/platform/compiler.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/deserialize.js b/cocos2d/core/platform/deserialize.js index ac57ed8ac0..e72c163f97 100644 --- a/cocos2d/core/platform/deserialize.js +++ b/cocos2d/core/platform/deserialize.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/id-generater.js b/cocos2d/core/platform/id-generater.js index 92d4f340d2..4a7ae2f499 100644 --- a/cocos2d/core/platform/id-generater.js +++ b/cocos2d/core/platform/id-generater.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/index.js b/cocos2d/core/platform/index.js index 06bdc5c7e1..f99e97cf87 100644 --- a/cocos2d/core/platform/index.js +++ b/cocos2d/core/platform/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/instantiate-jit.js b/cocos2d/core/platform/instantiate-jit.js index b7141e25ff..8d97a28419 100644 --- a/cocos2d/core/platform/instantiate-jit.js +++ b/cocos2d/core/platform/instantiate-jit.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/instantiate.js b/cocos2d/core/platform/instantiate.js index ef2b5aaa45..a7b4518205 100644 --- a/cocos2d/core/platform/instantiate.js +++ b/cocos2d/core/platform/instantiate.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/js.js b/cocos2d/core/platform/js.js index 8b01fae5c8..36793ad4b4 100644 --- a/cocos2d/core/platform/js.js +++ b/cocos2d/core/platform/js.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/platform/preprocess-class.js b/cocos2d/core/platform/preprocess-class.js index b577ab1d28..7926065989 100644 --- a/cocos2d/core/platform/preprocess-class.js +++ b/cocos2d/core/platform/preprocess-class.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/requiring-frame.js b/cocos2d/core/platform/requiring-frame.js index 57912acf4a..2dadbe1302 100644 --- a/cocos2d/core/platform/requiring-frame.js +++ b/cocos2d/core/platform/requiring-frame.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/url.js b/cocos2d/core/platform/url.js index 4048c6f4cc..3c0d0ed260 100644 --- a/cocos2d/core/platform/url.js +++ b/cocos2d/core/platform/url.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/platform/utils.js b/cocos2d/core/platform/utils.js index 78ad42d95f..0d6e1e1418 100644 --- a/cocos2d/core/platform/utils.js +++ b/cocos2d/core/platform/utils.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/predefine.js b/cocos2d/core/predefine.js index babf194f30..2b271014ae 100644 --- a/cocos2d/core/predefine.js +++ b/cocos2d/core/predefine.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/renderer/DirtyRegion.js b/cocos2d/core/renderer/DirtyRegion.js index b395d716d5..fcd938a567 100644 --- a/cocos2d/core/renderer/DirtyRegion.js +++ b/cocos2d/core/renderer/DirtyRegion.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + //Region is used to label a rect which world axis aligned. var Region = function () { this._minX = 0; diff --git a/cocos2d/core/renderer/RendererCanvas.js b/cocos2d/core/renderer/RendererCanvas.js index b0ce2bf509..e3672e93e0 100644 --- a/cocos2d/core/renderer/RendererCanvas.js +++ b/cocos2d/core/renderer/RendererCanvas.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/renderer/RendererWebGL.js b/cocos2d/core/renderer/RendererWebGL.js index 05ee7a7068..e5f67dd6a2 100644 --- a/cocos2d/core/renderer/RendererWebGL.js +++ b/cocos2d/core/renderer/RendererWebGL.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org @@ -11,7 +12,7 @@ furnished to do so, subject to the following conditions: The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/renderer/index.js b/cocos2d/core/renderer/index.js index 47d6630eea..284e6381f8 100644 --- a/cocos2d/core/renderer/index.js +++ b/cocos2d/core/renderer/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/scenes/CCSGScene.js b/cocos2d/core/scenes/CCSGScene.js index b2667e6872..9acb16f795 100644 --- a/cocos2d/core/scenes/CCSGScene.js +++ b/cocos2d/core/scenes/CCSGScene.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/sprites/CCSGSprite.js b/cocos2d/core/sprites/CCSGSprite.js index 136a8e09e3..847c1d1725 100644 --- a/cocos2d/core/sprites/CCSGSprite.js +++ b/cocos2d/core/sprites/CCSGSprite.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/sprites/CCSGSpriteCanvasRenderCmd.js b/cocos2d/core/sprites/CCSGSpriteCanvasRenderCmd.js index 532b203512..c839ce5a41 100644 --- a/cocos2d/core/sprites/CCSGSpriteCanvasRenderCmd.js +++ b/cocos2d/core/sprites/CCSGSpriteCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js b/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js index 9acd14ae09..cd6ee7ee44 100644 --- a/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js +++ b/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/sprites/CCScale9Sprite.js b/cocos2d/core/sprites/CCScale9Sprite.js index f948648e8d..faf0822d6e 100644 --- a/cocos2d/core/sprites/CCScale9Sprite.js +++ b/cocos2d/core/sprites/CCScale9Sprite.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/sprites/CCScale9SpriteCanvasRenderCmd.js b/cocos2d/core/sprites/CCScale9SpriteCanvasRenderCmd.js index 485e881895..0d990a2510 100644 --- a/cocos2d/core/sprites/CCScale9SpriteCanvasRenderCmd.js +++ b/cocos2d/core/sprites/CCScale9SpriteCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js b/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js index b31d417330..367f8e975a 100644 --- a/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js +++ b/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/sprites/CCSpriteBatchNode.js b/cocos2d/core/sprites/CCSpriteBatchNode.js index 0042f8f881..dcda237305 100644 --- a/cocos2d/core/sprites/CCSpriteBatchNode.js +++ b/cocos2d/core/sprites/CCSpriteBatchNode.js @@ -2,7 +2,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/sprites/CCSpriteFrame.js b/cocos2d/core/sprites/CCSpriteFrame.js index d537fb1365..e825aae956 100644 --- a/cocos2d/core/sprites/CCSpriteFrame.js +++ b/cocos2d/core/sprites/CCSpriteFrame.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2015 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js index b7a18718f7..d7dd793102 100644 --- a/cocos2d/core/textures/CCTexture2D.js +++ b/cocos2d/core/textures/CCTexture2D.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/textures/CCTextureCache.js b/cocos2d/core/textures/CCTextureCache.js index 847539a505..c042a2361c 100644 --- a/cocos2d/core/textures/CCTextureCache.js +++ b/cocos2d/core/textures/CCTextureCache.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/textures/index.js b/cocos2d/core/textures/index.js index d3df6e773a..9d81f93456 100644 --- a/cocos2d/core/textures/index.js +++ b/cocos2d/core/textures/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/CCPath.js b/cocos2d/core/utils/CCPath.js index e830d863e0..fd80de9f40 100644 --- a/cocos2d/core/utils/CCPath.js +++ b/cocos2d/core/utils/CCPath.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/CCProfiler.js b/cocos2d/core/utils/CCProfiler.js index a2a48bdbe1..b5bac66215 100644 --- a/cocos2d/core/utils/CCProfiler.js +++ b/cocos2d/core/utils/CCProfiler.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 55710e1ba1..60fbd34153 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/binary-search.js b/cocos2d/core/utils/binary-search.js index 26197ced2d..fa5b4a847a 100644 --- a/cocos2d/core/utils/binary-search.js +++ b/cocos2d/core/utils/binary-search.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2017 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/decode-uuid.js b/cocos2d/core/utils/decode-uuid.js index 3085360f9f..13e96bacea 100644 --- a/cocos2d/core/utils/decode-uuid.js +++ b/cocos2d/core/utils/decode-uuid.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/find.js b/cocos2d/core/utils/find.js index ee41977db0..ea42a19c2f 100644 --- a/cocos2d/core/utils/find.js +++ b/cocos2d/core/utils/find.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/index.js b/cocos2d/core/utils/index.js index 5861e942e4..03f404bc61 100644 --- a/cocos2d/core/utils/index.js +++ b/cocos2d/core/utils/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/misc.js b/cocos2d/core/utils/misc.js index 1a50592b17..4021e6b665 100644 --- a/cocos2d/core/utils/misc.js +++ b/cocos2d/core/utils/misc.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/mutable-forward-iterator.js b/cocos2d/core/utils/mutable-forward-iterator.js index b646738341..6581ee9969 100644 --- a/cocos2d/core/utils/mutable-forward-iterator.js +++ b/cocos2d/core/utils/mutable-forward-iterator.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/prefab-helper.js b/cocos2d/core/utils/prefab-helper.js index 8b80f246bb..329b4366da 100644 --- a/cocos2d/core/utils/prefab-helper.js +++ b/cocos2d/core/utils/prefab-helper.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/utils/scene-graph-helper.js b/cocos2d/core/utils/scene-graph-helper.js index 0a8dd2dcea..e4144be706 100644 --- a/cocos2d/core/utils/scene-graph-helper.js +++ b/cocos2d/core/utils/scene-graph-helper.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCAffineTransform.js b/cocos2d/core/value-types/CCAffineTransform.js index 65d594164b..f0e0ac0366 100644 --- a/cocos2d/core/value-types/CCAffineTransform.js +++ b/cocos2d/core/value-types/CCAffineTransform.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/value-types/CCColor.js b/cocos2d/core/value-types/CCColor.js index ff3cd55c5c..25d645aee4 100644 --- a/cocos2d/core/value-types/CCColor.js +++ b/cocos2d/core/value-types/CCColor.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCPointExtension.js b/cocos2d/core/value-types/CCPointExtension.js index 33be9aeefb..4ef729d2f4 100644 --- a/cocos2d/core/value-types/CCPointExtension.js +++ b/cocos2d/core/value-types/CCPointExtension.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/value-types/CCRect.js b/cocos2d/core/value-types/CCRect.js index e038760ae7..acbbd74a6b 100644 --- a/cocos2d/core/value-types/CCRect.js +++ b/cocos2d/core/value-types/CCRect.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCSize.js b/cocos2d/core/value-types/CCSize.js index 90904c961d..4bd25423f6 100644 --- a/cocos2d/core/value-types/CCSize.js +++ b/cocos2d/core/value-types/CCSize.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCTypes.js b/cocos2d/core/value-types/CCTypes.js index 1fa699053f..eb46b5ddb8 100644 --- a/cocos2d/core/value-types/CCTypes.js +++ b/cocos2d/core/value-types/CCTypes.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2015 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/value-types/CCTypesWebGL.js b/cocos2d/core/value-types/CCTypesWebGL.js index ffce347c06..4340a37ae0 100644 --- a/cocos2d/core/value-types/CCTypesWebGL.js +++ b/cocos2d/core/value-types/CCTypesWebGL.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/core/value-types/CCValueType.js b/cocos2d/core/value-types/CCValueType.js index 2ccc365775..44a6a897ad 100644 --- a/cocos2d/core/value-types/CCValueType.js +++ b/cocos2d/core/value-types/CCValueType.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/CCVec2.js b/cocos2d/core/value-types/CCVec2.js index e3690fe501..ee35f2360b 100644 --- a/cocos2d/core/value-types/CCVec2.js +++ b/cocos2d/core/value-types/CCVec2.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/value-types/index.js b/cocos2d/core/value-types/index.js index 7d609c6f75..2ceb8fa9ec 100644 --- a/cocos2d/core/value-types/index.js +++ b/cocos2d/core/value-types/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/core/videoplayer/CCSGVideoPlayer.js b/cocos2d/core/videoplayer/CCSGVideoPlayer.js index bc0b6e0a31..e203627a42 100644 --- a/cocos2d/core/videoplayer/CCSGVideoPlayer.js +++ b/cocos2d/core/videoplayer/CCSGVideoPlayer.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, @@ -9,7 +10,7 @@ used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/core/webview/CCSGWebView.js b/cocos2d/core/webview/CCSGWebView.js index 49d20f71d1..fc178693ac 100644 --- a/cocos2d/core/webview/CCSGWebView.js +++ b/cocos2d/core/webview/CCSGWebView.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, @@ -9,7 +10,7 @@ used for developing games. You are not granted to publish, distribute, sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. 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 diff --git a/cocos2d/deprecated.js b/cocos2d/deprecated.js index 6859825aee..81a3b92ebd 100644 --- a/cocos2d/deprecated.js +++ b/cocos2d/deprecated.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var js = cc.js; diff --git a/cocos2d/index.js b/cocos2d/index.js index ba06b83849..7702910952 100644 --- a/cocos2d/index.js +++ b/cocos2d/index.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + require('./core/CCGame'); // ensure modular-cocos2d can determine whether action module is included diff --git a/cocos2d/kazmath/SIMDPolyfill.js b/cocos2d/kazmath/SIMDPolyfill.js index 6efabbbd2b..e391fe7de7 100644 --- a/cocos2d/kazmath/SIMDPolyfill.js +++ b/cocos2d/kazmath/SIMDPolyfill.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/aabb.js b/cocos2d/kazmath/aabb.js index 8c5dc5b664..440d09b074 100644 --- a/cocos2d/kazmath/aabb.js +++ b/cocos2d/kazmath/aabb.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/gl/mat4stack.js b/cocos2d/kazmath/gl/mat4stack.js index 58059665c9..5b26d3c80e 100644 --- a/cocos2d/kazmath/gl/mat4stack.js +++ b/cocos2d/kazmath/gl/mat4stack.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/gl/matrix.js b/cocos2d/kazmath/gl/matrix.js index 0de4623e3a..78bb52226b 100644 --- a/cocos2d/kazmath/gl/matrix.js +++ b/cocos2d/kazmath/gl/matrix.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/index.js b/cocos2d/kazmath/index.js index 798130d9fa..2a852592d0 100644 --- a/cocos2d/kazmath/index.js +++ b/cocos2d/kazmath/index.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + require('./utility'); require('./vec2'); require('./vec3'); diff --git a/cocos2d/kazmath/mat3.js b/cocos2d/kazmath/mat3.js index fd2a891a55..201b870f50 100644 --- a/cocos2d/kazmath/mat3.js +++ b/cocos2d/kazmath/mat3.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/mat4.js b/cocos2d/kazmath/mat4.js index 9e9880f13d..177a8cd640 100644 --- a/cocos2d/kazmath/mat4.js +++ b/cocos2d/kazmath/mat4.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/mat4SIMD.js b/cocos2d/kazmath/mat4SIMD.js index 6da1f8c34e..d00fad5cf1 100644 --- a/cocos2d/kazmath/mat4SIMD.js +++ b/cocos2d/kazmath/mat4SIMD.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/plane.js b/cocos2d/kazmath/plane.js index 852b5ff6d8..a691e6e933 100644 --- a/cocos2d/kazmath/plane.js +++ b/cocos2d/kazmath/plane.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/quaternion.js b/cocos2d/kazmath/quaternion.js index 1035f3fb27..d9230e419e 100644 --- a/cocos2d/kazmath/quaternion.js +++ b/cocos2d/kazmath/quaternion.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/ray2.js b/cocos2d/kazmath/ray2.js index 1c39326214..84f62291bf 100644 --- a/cocos2d/kazmath/ray2.js +++ b/cocos2d/kazmath/ray2.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/utility.js b/cocos2d/kazmath/utility.js index f3f8ab188f..a168685f3b 100644 --- a/cocos2d/kazmath/utility.js +++ b/cocos2d/kazmath/utility.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/vec2.js b/cocos2d/kazmath/vec2.js index a0650c92eb..4fa95a4544 100644 --- a/cocos2d/kazmath/vec2.js +++ b/cocos2d/kazmath/vec2.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/vec3.js b/cocos2d/kazmath/vec3.js index a1918b981a..4717241563 100644 --- a/cocos2d/kazmath/vec3.js +++ b/cocos2d/kazmath/vec3.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/vec3SIMD.js b/cocos2d/kazmath/vec3SIMD.js index 31dcbcd715..f7d3c8dd73 100644 --- a/cocos2d/kazmath/vec3SIMD.js +++ b/cocos2d/kazmath/vec3SIMD.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/kazmath/vec4.js b/cocos2d/kazmath/vec4.js index 3761f4acb9..50adf97a91 100644 --- a/cocos2d/kazmath/vec4.js +++ b/cocos2d/kazmath/vec4.js @@ -1,7 +1,8 @@ /** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008, Luke Benstead. All rights reserved. diff --git a/cocos2d/motion-streak/CCMotionStreak.js b/cocos2d/motion-streak/CCMotionStreak.js index bd56f191d0..1617f2ea30 100644 --- a/cocos2d/motion-streak/CCMotionStreak.js +++ b/cocos2d/motion-streak/CCMotionStreak.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/motion-streak/CCSGMotionStreak.js b/cocos2d/motion-streak/CCSGMotionStreak.js index 4a4d12e5d9..46f25d1268 100644 --- a/cocos2d/motion-streak/CCSGMotionStreak.js +++ b/cocos2d/motion-streak/CCSGMotionStreak.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2008-2009 Jason Booth http://www.cocos2d-x.org diff --git a/cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js b/cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js index 3613044314..d1217c59f3 100644 --- a/cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js +++ b/cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/particle/CCPNGReader.js b/cocos2d/particle/CCPNGReader.js index 9cee60f59f..dcdb9c3c26 100644 --- a/cocos2d/particle/CCPNGReader.js +++ b/cocos2d/particle/CCPNGReader.js @@ -2,7 +2,8 @@ Copyright (c) 2011 Devon Govett Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/particle/CCParticleAsset.js b/cocos2d/particle/CCParticleAsset.js index 2ab1bacf9a..14f1bb288d 100644 --- a/cocos2d/particle/CCParticleAsset.js +++ b/cocos2d/particle/CCParticleAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/particle/CCParticleSystem.js b/cocos2d/particle/CCParticleSystem.js index 009c66a174..ed61dce89c 100644 --- a/cocos2d/particle/CCParticleSystem.js +++ b/cocos2d/particle/CCParticleSystem.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/particle/CCSGParticleExamples.js b/cocos2d/particle/CCSGParticleExamples.js index b5f961e4c6..00172b72bc 100644 --- a/cocos2d/particle/CCSGParticleExamples.js +++ b/cocos2d/particle/CCSGParticleExamples.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/particle/CCSGParticleSystem.js b/cocos2d/particle/CCSGParticleSystem.js index 98e4c1fcaf..7b22621079 100644 --- a/cocos2d/particle/CCSGParticleSystem.js +++ b/cocos2d/particle/CCSGParticleSystem.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js b/cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js index 74160bbf3f..7f5dc48fa2 100644 --- a/cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js +++ b/cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js b/cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js index 4f12f01080..6e4961b57a 100644 --- a/cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js +++ b/cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/particle/CCTIFFReader.js b/cocos2d/particle/CCTIFFReader.js index 38f33dcafa..66d1a6d2b4 100644 --- a/cocos2d/particle/CCTIFFReader.js +++ b/cocos2d/particle/CCTIFFReader.js @@ -4,7 +4,8 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/render-texture/CCRenderTexture.js b/cocos2d/render-texture/CCRenderTexture.js index 369aa1bd97..46f06f2e9e 100644 --- a/cocos2d/render-texture/CCRenderTexture.js +++ b/cocos2d/render-texture/CCRenderTexture.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2009 Jason Booth http://www.cocos2d-x.org diff --git a/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js b/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js index 3e635cd8e6..c31072e5df 100644 --- a/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js +++ b/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js index 28e04922e3..d321794885 100644 --- a/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js +++ b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/shaders/CCGLProgram.js b/cocos2d/shaders/CCGLProgram.js index 80b14d74e1..c0d52aed6b 100644 --- a/cocos2d/shaders/CCGLProgram.js +++ b/cocos2d/shaders/CCGLProgram.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright 2011 Jeff Lamarche Copyright 2012 Goffredo Marocchi diff --git a/cocos2d/shaders/CCGLStateCache.js b/cocos2d/shaders/CCGLStateCache.js index cf4f258692..016991302d 100644 --- a/cocos2d/shaders/CCGLStateCache.js +++ b/cocos2d/shaders/CCGLStateCache.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/shaders/CCShaderCache.js b/cocos2d/shaders/CCShaderCache.js index 33b8447e89..6a1ccfc18b 100644 --- a/cocos2d/shaders/CCShaderCache.js +++ b/cocos2d/shaders/CCShaderCache.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/shaders/CCShaders.js b/cocos2d/shaders/CCShaders.js index 96e92386bb..2979b9aca5 100644 --- a/cocos2d/shaders/CCShaders.js +++ b/cocos2d/shaders/CCShaders.js @@ -2,6 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/shaders/index.js b/cocos2d/shaders/index.js index e2eb6c9ff7..b5abfcf1b2 100644 --- a/cocos2d/shaders/index.js +++ b/cocos2d/shaders/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/shape-nodes/CCDrawNode.js b/cocos2d/shape-nodes/CCDrawNode.js index 5868552521..d14860185c 100644 --- a/cocos2d/shape-nodes/CCDrawNode.js +++ b/cocos2d/shape-nodes/CCDrawNode.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2012 Scott Lembcke and Howling Moon Software http://www.cocos2d-x.org diff --git a/cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js b/cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js index 716c7996a3..18bbeb21d8 100644 --- a/cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js +++ b/cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js b/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js index 1528bc0a79..ddf01e5839 100644 --- a/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js +++ b/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/tilemap/CCSGTMXLayer.js b/cocos2d/tilemap/CCSGTMXLayer.js index b8bb77f611..a38b39880d 100644 --- a/cocos2d/tilemap/CCSGTMXLayer.js +++ b/cocos2d/tilemap/CCSGTMXLayer.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/tilemap/CCSGTMXObject.js b/cocos2d/tilemap/CCSGTMXObject.js index 91f172dad4..9e4e9f6d10 100644 --- a/cocos2d/tilemap/CCSGTMXObject.js +++ b/cocos2d/tilemap/CCSGTMXObject.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCSGTMXObjectGroup.js b/cocos2d/tilemap/CCSGTMXObjectGroup.js index 6b6bc3c30a..801084b471 100644 --- a/cocos2d/tilemap/CCSGTMXObjectGroup.js +++ b/cocos2d/tilemap/CCSGTMXObjectGroup.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/tilemap/CCSGTMXTiledMap.js b/cocos2d/tilemap/CCSGTMXTiledMap.js index ab121404a9..a37169ece3 100644 --- a/cocos2d/tilemap/CCSGTMXTiledMap.js +++ b/cocos2d/tilemap/CCSGTMXTiledMap.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js index 211d069beb..db190f66cf 100644 --- a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js +++ b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js index ee0e338f83..1e5077d36e 100644 --- a/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js +++ b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/tilemap/CCTMXXMLParser.js b/cocos2d/tilemap/CCTMXXMLParser.js index 4ec00b3360..e95b89ddac 100644 --- a/cocos2d/tilemap/CCTMXXMLParser.js +++ b/cocos2d/tilemap/CCTMXXMLParser.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos2d/tilemap/CCTiledLayer.js b/cocos2d/tilemap/CCTiledLayer.js index 3c028576ff..d7dafbde6e 100644 --- a/cocos2d/tilemap/CCTiledLayer.js +++ b/cocos2d/tilemap/CCTiledLayer.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCTiledMap.js b/cocos2d/tilemap/CCTiledMap.js index f3cc6dba76..2325d05751 100644 --- a/cocos2d/tilemap/CCTiledMap.js +++ b/cocos2d/tilemap/CCTiledMap.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCTiledMapAsset.js b/cocos2d/tilemap/CCTiledMapAsset.js index 91999d0898..c37c2a9632 100644 --- a/cocos2d/tilemap/CCTiledMapAsset.js +++ b/cocos2d/tilemap/CCTiledMapAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/CCTiledObjectGroup.js b/cocos2d/tilemap/CCTiledObjectGroup.js index f28a315dcf..d5affd5710 100644 --- a/cocos2d/tilemap/CCTiledObjectGroup.js +++ b/cocos2d/tilemap/CCTiledObjectGroup.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/cocos2d/tilemap/editor/tiled-map.js b/cocos2d/tilemap/editor/tiled-map.js index 5d82a3235d..779a0b9f76 100644 --- a/cocos2d/tilemap/editor/tiled-map.js +++ b/cocos2d/tilemap/editor/tiled-map.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + 'use strict'; const CustomAssetMeta = Editor.metas['custom-asset']; diff --git a/extends.js b/extends.js index 69de2e0253..71912ea9e6 100644 --- a/extends.js +++ b/extends.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/anysdk/jsb_anysdk.js b/extensions/anysdk/jsb_anysdk.js index 3dec54c1a0..a7c73880cc 100644 --- a/extensions/anysdk/jsb_anysdk.js +++ b/extensions/anysdk/jsb_anysdk.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/ccpool/CCNodePool.js b/extensions/ccpool/CCNodePool.js index 3ee080e6b0..672cafdb0c 100644 --- a/extensions/ccpool/CCNodePool.js +++ b/extensions/ccpool/CCNodePool.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/ccpool/CCPool.js b/extensions/ccpool/CCPool.js index 8424fbe1b6..f343895392 100644 --- a/extensions/ccpool/CCPool.js +++ b/extensions/ccpool/CCPool.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index 7009abfda0..73107dbf95 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/CCArmatureDisplay.js b/extensions/dragonbones/CCArmatureDisplay.js index c92f39ba77..e4ef5ee33b 100644 --- a/extensions/dragonbones/CCArmatureDisplay.js +++ b/extensions/dragonbones/CCArmatureDisplay.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/CCFactory.js b/extensions/dragonbones/CCFactory.js index 65e2f1249c..2c75d0c4a7 100644 --- a/extensions/dragonbones/CCFactory.js +++ b/extensions/dragonbones/CCFactory.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/CCSlot.js b/extensions/dragonbones/CCSlot.js index 6c37807fce..86f298a69c 100644 --- a/extensions/dragonbones/CCSlot.js +++ b/extensions/dragonbones/CCSlot.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/CCTextureData.js b/extensions/dragonbones/CCTextureData.js index 0278222a2e..09c26939a0 100644 --- a/extensions/dragonbones/CCTextureData.js +++ b/extensions/dragonbones/CCTextureData.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/DragonBonesAsset.js b/extensions/dragonbones/DragonBonesAsset.js index f73d3169e3..531a4da13c 100644 --- a/extensions/dragonbones/DragonBonesAsset.js +++ b/extensions/dragonbones/DragonBonesAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/DragonBonesAtlasAsset.js b/extensions/dragonbones/DragonBonesAtlasAsset.js index 0a94dd3422..f88e7342ac 100644 --- a/extensions/dragonbones/DragonBonesAtlasAsset.js +++ b/extensions/dragonbones/DragonBonesAtlasAsset.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/editor/dragonbones-atlas-meta.js b/extensions/dragonbones/editor/dragonbones-atlas-meta.js index 89f7274655..abc1f818c9 100644 --- a/extensions/dragonbones/editor/dragonbones-atlas-meta.js +++ b/extensions/dragonbones/editor/dragonbones-atlas-meta.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/editor/dragonbones-meta.js b/extensions/dragonbones/editor/dragonbones-meta.js index 2cb63f0065..c7978521ff 100644 --- a/extensions/dragonbones/editor/dragonbones-meta.js +++ b/extensions/dragonbones/editor/dragonbones-meta.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/dragonbones/index.js b/extensions/dragonbones/index.js index e458d58782..af5f71d115 100644 --- a/extensions/dragonbones/index.js +++ b/extensions/dragonbones/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/spine/SGSkeleton.js b/extensions/spine/SGSkeleton.js index 52b6dcd57a..2dd0b539aa 100644 --- a/extensions/spine/SGSkeleton.js +++ b/extensions/spine/SGSkeleton.js @@ -3,6 +3,7 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2014 Shengxiang Chen (Nero Chan) Copyright (c) 2015-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/spine/SGSkeletonAnimation.js b/extensions/spine/SGSkeletonAnimation.js index c1b5fbfcf1..615cf1e08c 100644 --- a/extensions/spine/SGSkeletonAnimation.js +++ b/extensions/spine/SGSkeletonAnimation.js @@ -3,6 +3,7 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2014 Shengxiang Chen (Nero Chan) Copyright (c) 2015-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/spine/SGSkeletonCanvasRenderCmd.js b/extensions/spine/SGSkeletonCanvasRenderCmd.js index d513e85bc3..81c37d36ee 100644 --- a/extensions/spine/SGSkeletonCanvasRenderCmd.js +++ b/extensions/spine/SGSkeletonCanvasRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/spine/SGSkeletonTexture.js b/extensions/spine/SGSkeletonTexture.js index 455ee25a54..e5fdf4004f 100644 --- a/extensions/spine/SGSkeletonTexture.js +++ b/extensions/spine/SGSkeletonTexture.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2017 Chukong Technologies Inc. + Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/spine/SGSkeletonWebGLRenderCmd.js b/extensions/spine/SGSkeletonWebGLRenderCmd.js index 8f8e583461..65894fc824 100644 --- a/extensions/spine/SGSkeletonWebGLRenderCmd.js +++ b/extensions/spine/SGSkeletonWebGLRenderCmd.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/spine/Skeleton.js b/extensions/spine/Skeleton.js index 9e81c1be3e..1c6a2ace59 100644 --- a/extensions/spine/Skeleton.js +++ b/extensions/spine/Skeleton.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/spine/SkeletonData.js b/extensions/spine/SkeletonData.js index 07489e8133..7118045b8f 100644 --- a/extensions/spine/SkeletonData.js +++ b/extensions/spine/SkeletonData.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/extensions/spine/editor/spine-meta.js b/extensions/spine/editor/spine-meta.js index 5e9fdb63eb..b61b2fc5b7 100644 --- a/extensions/spine/editor/spine-meta.js +++ b/extensions/spine/editor/spine-meta.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + 'use strict'; /* diff --git a/extensions/spine/index.js b/extensions/spine/index.js index 24056f4e07..c3a4e112f5 100644 --- a/extensions/spine/index.js +++ b/extensions/spine/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index 02ab9c3ba2..d2c20bb9f1 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -12,7 +12,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js index a28f7c278f..168cb84eb2 100644 --- a/gulp/tasks/test.js +++ b/gulp/tasks/test.js @@ -12,7 +12,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/gulp/util/handleErrors.js b/gulp/util/handleErrors.js index d4852f5d21..62531aab57 100644 --- a/gulp/util/handleErrors.js +++ b/gulp/util/handleErrors.js @@ -12,7 +12,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/gulpfile.js b/gulpfile.js index 91714e6c53..5ba7792483 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/index.js b/index.js index 48b85a146f..9b70765348 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/index.js b/jsb/index.js index cbf6002bfb..a971647251 100644 --- a/jsb/index.js +++ b/jsb/index.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-action.js b/jsb/jsb-action.js index c129b66fec..bebb0ed355 100644 --- a/jsb/jsb-action.js +++ b/jsb/jsb-action.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-apis.js b/jsb/jsb-apis.js index 1d3b0971b2..a74db5b217 100644 --- a/jsb/jsb-apis.js +++ b/jsb/jsb-apis.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-audio.js b/jsb/jsb-audio.js index 40c06bd456..3d943ec979 100644 --- a/jsb/jsb-audio.js +++ b/jsb/jsb-audio.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-box2d.js b/jsb/jsb-box2d.js index 8d5b76f0f8..4baa2b63e3 100644 --- a/jsb/jsb-box2d.js +++ b/jsb/jsb-box2d.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + (function () { diff --git a/jsb/jsb-director.js b/jsb/jsb-director.js index 8eca880d20..9f9ef78e83 100644 --- a/jsb/jsb-director.js +++ b/jsb/jsb-director.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-dragonbones.js b/jsb/jsb-dragonbones.js index fe7b674712..e82597fa10 100644 --- a/jsb/jsb-dragonbones.js +++ b/jsb/jsb-dragonbones.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + var proto = dragonBones.CCArmatureDisplay.prototype; cc.js.mixin(proto, cc.EventTarget.prototype); diff --git a/jsb/jsb-editbox.js b/jsb/jsb-editbox.js index 45c7d49b40..35e0e5eeae 100644 --- a/jsb/jsb-editbox.js +++ b/jsb/jsb-editbox.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-enums.js b/jsb/jsb-enums.js index 236fe13497..99b8249bf6 100644 --- a/jsb/jsb-enums.js +++ b/jsb/jsb-enums.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-etc.js b/jsb/jsb-etc.js index 395743bb37..62683d15fe 100644 --- a/jsb/jsb-etc.js +++ b/jsb/jsb-etc.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-event.js b/jsb/jsb-event.js index 6d26764200..8ae36f171a 100644 --- a/jsb/jsb-event.js +++ b/jsb/jsb-event.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-game.js b/jsb/jsb-game.js index 80a9a275b6..af8dc70e2a 100644 --- a/jsb/jsb-game.js +++ b/jsb/jsb-game.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-label.js b/jsb/jsb-label.js index 16419e6787..c873bbf1e9 100644 --- a/jsb/jsb-label.js +++ b/jsb/jsb-label.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-loader.js b/jsb/jsb-loader.js index 2375ee85bb..259440e63d 100644 --- a/jsb/jsb-loader.js +++ b/jsb/jsb-loader.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-particle.js b/jsb/jsb-particle.js index 4d7e35f5c2..8cfb73f3df 100644 --- a/jsb/jsb-particle.js +++ b/jsb/jsb-particle.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-scale9sprite.js b/jsb/jsb-scale9sprite.js index 2ef708df1b..8edc97ee97 100644 --- a/jsb/jsb-scale9sprite.js +++ b/jsb/jsb-scale9sprite.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-spine.js b/jsb/jsb-spine.js index 096ef41d90..32fd3d9447 100644 --- a/jsb/jsb-spine.js +++ b/jsb/jsb-spine.js @@ -1,3 +1,28 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + sp._SGSkeleton = sp.Skeleton; sp._SGSkeletonAnimation = sp.SkeletonAnimation; diff --git a/jsb/jsb-tex-sprite-frame.js b/jsb/jsb-tex-sprite-frame.js index 7297e76ab0..4419c33dd6 100644 --- a/jsb/jsb-tex-sprite-frame.js +++ b/jsb/jsb-tex-sprite-frame.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-tiledmap.js b/jsb/jsb-tiledmap.js index 1409bf8233..dc30cc6614 100644 --- a/jsb/jsb-tiledmap.js +++ b/jsb/jsb-tiledmap.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-videoplayer.js b/jsb/jsb-videoplayer.js index f2d17fbbbb..fe9d3fe96d 100644 --- a/jsb/jsb-videoplayer.js +++ b/jsb/jsb-videoplayer.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/jsb/jsb-webview.js b/jsb/jsb-webview.js index e8f0a10a0d..388af5e49e 100644 --- a/jsb/jsb-webview.js +++ b/jsb/jsb-webview.js @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/licenses/LICENSE b/licenses/LICENSE index ab787ca12b..8102192271 100644 --- a/licenses/LICENSE +++ b/licenses/LICENSE @@ -1,5 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -12,7 +13,7 @@ sublicense, and/or sell copies of Cocos Creator. The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji reserves all rights not expressly granted to you. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, From fe867cd95bd1ba096c12cda036305563361cc05a Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 1 Feb 2018 15:28:00 +0800 Subject: [PATCH 28/74] Fix supportsNPOT and ignore contentSize in Texture.initWithData --- cocos2d/core/CCConfiguration.js | 2 +- cocos2d/core/textures/CCTexture2D.js | 6 +++--- cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cocos2d/core/CCConfiguration.js b/cocos2d/core/CCConfiguration.js index e87b9acdfb..ce9b6d1943 100644 --- a/cocos2d/core/CCConfiguration.js +++ b/cocos2d/core/CCConfiguration.js @@ -244,7 +244,7 @@ cc.configuration = /** @lends cc.configuration# */{ this._supportsPVRTC = this.checkForGLExtension("GL_IMG_texture_compression_pvrtc"); locValueDict["gl.supports_PVRTC"] = this._supportsPVRTC; - this._supportsNPOT = false; //true; + this._supportsNPOT = true; locValueDict["gl.supports_NPOT"] = this._supportsNPOT; this._supportsBGRA8888 = this.checkForGLExtension("GL_IMG_texture_format_BGRA888"); diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js index 1ca8fbb2d5..2d59900681 100644 --- a/cocos2d/core/textures/CCTexture2D.js +++ b/cocos2d/core/textures/CCTexture2D.js @@ -352,7 +352,7 @@ var Texture2D = cc.Class(/** @lends cc.Texture2D# */{ * @param {Number} pixelFormat * @param {Number} pixelsWidth * @param {Number} pixelsHeight - * @param {Size} contentSize + * @param {Size} contentSize contentSize is deprecated and ignored * @return {Boolean} */ initWithData: function (data, pixelFormat, pixelsWidth, pixelsHeight, contentSize) { @@ -860,8 +860,8 @@ game.once(game.EVENT_RENDERER_INITED, function () { opts.width = pixelsWidth; opts.height = pixelsHeight; this.update(opts); - this.width = contentSize.width; - this.height = contentSize.height; + this.width = pixelsWidth; + this.height = pixelsHeight; this.loaded = true; this.emit("load"); return true; diff --git a/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js index e2768b6a7d..f831cff960 100644 --- a/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js +++ b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js @@ -172,7 +172,7 @@ proto.initWithWidthAndHeight = function(width, height, format, depthStencilForma if (!node._texture) return false; - locTexture.initWithData(data, node._pixelFormat, powW, powH, cc.size(width, height)); + locTexture.initWithData(data, node._pixelFormat, powW, powH); //free( data ); var oldRBO = gl.getParameter(gl.RENDERBUFFER_BINDING); @@ -181,7 +181,7 @@ proto.initWithWidthAndHeight = function(width, height, format, depthStencilForma this._textureCopy = new cc.Texture2D(); if (!this._textureCopy) return false; - this._textureCopy.initWithData(data, node._pixelFormat, powW, powH, cc.size(width, height)); + this._textureCopy.initWithData(data, node._pixelFormat, powW, powH); } // generate FBO From 5fd4afcb555bd530b4d2a9e094ca0317107a7d35 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 1 Feb 2018 15:39:15 +0800 Subject: [PATCH 29/74] Add deprecation log --- DebugInfos.js | 2 ++ cocos2d/core/CCScheduler.js | 4 ++++ cocos2d/core/textures/CCTexture2D.js | 3 +++ 3 files changed, 9 insertions(+) diff --git a/DebugInfos.js b/DebugInfos.js index 162045527b..c5b84415f3 100644 --- a/DebugInfos.js +++ b/DebugInfos.js @@ -64,6 +64,7 @@ if (CC_DEBUG) { "1509": "Argument target must be non-nullptr", //isScheduled "1510": "cc.Scheduler: Illegal target which doesn't have uuid or instanceId", "1511": "cc.Scheduler: pause state of the scheduled task doesn't match the element pause state in Scheduler, the given paused state will be ignored", + "1512": "cc.Scheduler: updateFunc parameter is deprecated in scheduleUpdate function, and will be removed in v2.0", //Node: 1600 "1600": "getZOrder is deprecated. Please use getLocalZOrder instead.", //getZOrder "1601": "setZOrder is deprecated. Please use setLocalZOrder instead.", //setZOrder @@ -239,6 +240,7 @@ if (CC_DEBUG) { "3115": "Frame Grabber: could not attach texture to framebuffer", //CCGrabber.grab "3116": "WebGLRenderingContext.CLAMP_TO_EDGE should be used in NPOT textures", //setTexParameters "3117": "Mimpap texture only works in POT textures", //generateMipmap + "3118": "contentSize parameter is deprecated and ignored for cc.Texture2D initWithData function", // initWithData //RectWidth: 3300 "3300": "Rect width exceeds maximum margin: %s", //RectWidth //RectHeight: 3400 diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js index 9c3ec89076..4cf00041e5 100644 --- a/cocos2d/core/CCScheduler.js +++ b/cocos2d/core/CCScheduler.js @@ -618,6 +618,10 @@ cc.Scheduler = cc._Class.extend({ } } + if (updateFunc) { + cc.warnID(1512); + } + var listElement = ListEntry.get(null, null, updateFunc, target, priority, paused, false); var ppList; diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js index 2d59900681..29499e4624 100644 --- a/cocos2d/core/textures/CCTexture2D.js +++ b/cocos2d/core/textures/CCTexture2D.js @@ -854,6 +854,9 @@ game.once(game.EVENT_RENDERER_INITED, function () { }; _p.initWithData = function (data, pixelFormat, pixelsWidth, pixelsHeight, contentSize) { + if (contentSize) { + cc.warnID(3118); + } var opts = _getSharedOptions(); opts.image = data; opts.format = pixelFormat; From 6810732ec3908918bb27d945718d3ea5e6babe61 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 2 Feb 2018 13:41:15 +0800 Subject: [PATCH 30/74] fix onShow/onHide on wechat mini game --- cocos2d/core/CCGame.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index ba43a95b09..ae1f056b91 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -785,12 +785,12 @@ var game = { } if (navigator.userAgent.indexOf("MicroMessenger") > -1) { - win.onfocus = function(){ onShow() }; + win.onfocus = onShow; } if (CC_WECHATGAME) { - wx.onShow = onShow; - wx.onHide = onHidden; + wx.onShow(onShow); + wx.onHide(onHidden); } if ("onpageshow" in window && "onpagehide" in window) { From 1c70cd611a0a36c42569eed65ee226537b444aef Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Fri, 2 Feb 2018 17:50:08 +0800 Subject: [PATCH 31/74] export FIXED_TIME_STEP and MAX_ACCUMULATOR to PhysicsManager --- cocos2d/core/physics/CCPhysicsManager.js | 38 +++++++++++++++++++----- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/cocos2d/core/physics/CCPhysicsManager.js b/cocos2d/core/physics/CCPhysicsManager.js index 428f108a5a..d3c851649c 100644 --- a/cocos2d/core/physics/CCPhysicsManager.js +++ b/cocos2d/core/physics/CCPhysicsManager.js @@ -35,9 +35,6 @@ var tempB2AABB = new b2.AABB(); var tempB2Vec21 = new b2.Vec2(); var tempB2Vec22 = new b2.Vec2(); -var FIXED_TIME_STEP = 1/60; -var MAX_ACCUMULATOR = 1/5; - /** * !#en * Physics manager uses box2d as the inner physics system, and hide most box2d implement details(creating rigidbody, synchronize rigidbody info to node). @@ -104,7 +101,31 @@ var PhysicsManager = cc.Class({ * @default 10 * @static */ - POSITION_ITERATIONS: 10 + POSITION_ITERATIONS: 10, + + /** + * !#en + * Specify the fixed time step. + * Need enabledAccumulator to make it work. + * !#zh + * 指定固定的时间步长,需要开启 enabledAccumulator 才有效。 + * @property {Number} FIXED_TIME_STEP + * @default 1/60 + * @static + */ + FIXED_TIME_STEP: 1/60, + + /** + * !#en + * Specify the max accumulator time. + * Need enabledAccumulator to make it work. + * !#zh + * 每次可用于更新物理系统的最大时间,需要开启 enabledAccumulator 才有效。 + * @property {Number} MAX_ACCUMULATOR + * @default 1/5 + * @static + */ + MAX_ACCUMULATOR: 1/5 }, ctor: function () { @@ -126,11 +147,11 @@ var PhysicsManager = cc.Class({ /** * !#en - * If enabled accumulator, then will call step function with a fixed time step. + * If enabled accumulator, then will call step function with the fixed time step FIXED_TIME_STEP. * And if the update dt is bigger than the time step, then will call step function several times. * If disabled accumulator, then will call step function with a time step calculated with the frame rate. * !#zh - * 如果开启此选项,那么将会以一个固定的时间步来更新物理引擎,如果一个 update 的间隔时间大于这个时间步,则会对物理引擎进行多次更新。 + * 如果开启此选项,那么将会以固定的时间步 FIXED_TIME_STEP 来更新物理引擎,如果一个 update 的间隔时间大于这个时间步,则会对物理引擎进行多次更新。 * 如果关闭此选项,那么将会根据设定的 frame rate 计算出一个时间步来更新物理引擎。 * @property {Boolean} enabledAccumulator * @default false @@ -165,7 +186,10 @@ var PhysicsManager = cc.Class({ if (this.enabledAccumulator) { this._accumulator += dt; - + + var FIXED_TIME_STEP = PhysicsManager.FIXED_TIME_STEP; + var MAX_ACCUMULATOR = PhysicsManager.MAX_ACCUMULATOR; + // max accumulator time to avoid spiral of death if (this._accumulator > MAX_ACCUMULATOR) { this._accumulator = MAX_ACCUMULATOR; From 627880ed423c326d0c1a217988f3e9a1018f4a7d Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Fri, 2 Feb 2018 17:58:40 +0800 Subject: [PATCH 32/74] update physics api comment --- cocos2d/core/physics/CCPhysicsManager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2d/core/physics/CCPhysicsManager.js b/cocos2d/core/physics/CCPhysicsManager.js index d3c851649c..f762cc33a8 100644 --- a/cocos2d/core/physics/CCPhysicsManager.js +++ b/cocos2d/core/physics/CCPhysicsManager.js @@ -108,7 +108,7 @@ var PhysicsManager = cc.Class({ * Specify the fixed time step. * Need enabledAccumulator to make it work. * !#zh - * 指定固定的时间步长,需要开启 enabledAccumulator 才有效。 + * 指定固定的物理更新间隔时间,需要开启 enabledAccumulator 才有效。 * @property {Number} FIXED_TIME_STEP * @default 1/60 * @static @@ -151,8 +151,8 @@ var PhysicsManager = cc.Class({ * And if the update dt is bigger than the time step, then will call step function several times. * If disabled accumulator, then will call step function with a time step calculated with the frame rate. * !#zh - * 如果开启此选项,那么将会以固定的时间步 FIXED_TIME_STEP 来更新物理引擎,如果一个 update 的间隔时间大于这个时间步,则会对物理引擎进行多次更新。 - * 如果关闭此选项,那么将会根据设定的 frame rate 计算出一个时间步来更新物理引擎。 + * 如果开启此选项,那么将会以固定的间隔时间 FIXED_TIME_STEP 来更新物理引擎,如果一个 update 的间隔时间大于 FIXED_TIME_STEP,则会对物理引擎进行多次更新。 + * 如果关闭此选项,那么将会根据设定的 frame rate 计算出一个间隔时间来更新物理引擎。 * @property {Boolean} enabledAccumulator * @default false */ From 09a15147891a1c5bc0ef4a03fc4a95294fb34972 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 2 Feb 2018 18:35:56 +0800 Subject: [PATCH 33/74] Fix WECHAT_GAME check issue --- cocos2d/audio/CCAudio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 62b59ed33f..6d7686b718 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -360,7 +360,7 @@ var WebAudioElement = function (buffer, audio) { var self = this; clearTimeout(this._currextTimer); this._currextTimer = setTimeout(function () { - if (sys.platform === sys.WECHAT_GAME && self._context.currentTime === 0) { + if (sys.platform !== sys.WECHAT_GAME && self._context.currentTime === 0) { touchPlayList.push({ instance: self._audio, offset: offset, From b32ff4d02ef27110cc357b27c049cf36d171405d Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 9 Feb 2018 00:18:26 +0800 Subject: [PATCH 34/74] register engine version for both web and jsb --- CCBoot.js | 17 +--- cocos2d/core/platform/CCMacro.js | 2 +- index.js | 132 +------------------------- jsb/index.js | 31 +----- predefine.js | 157 +++++++++++++++++++++++++++++++ 5 files changed, 165 insertions(+), 174 deletions(-) create mode 100644 predefine.js diff --git a/CCBoot.js b/CCBoot.js index a0c836ee4a..6f58a693b3 100644 --- a/CCBoot.js +++ b/CCBoot.js @@ -24,16 +24,6 @@ THE SOFTWARE. ****************************************************************************/ -/** - * The current version of Cocos2d being used.
- * Please DO NOT remove this String, it is an important flag for bug tracking.
- * If you post a bug to forum, please attach this flag. - * @property {String} ENGINE_VERSION - */ -var engineVersion; -engineVersion = '1.6.0'; -window['CocosEngine'] = cc.ENGINE_VERSION = engineVersion; - /** * @property {CanvasRenderingContext2D|WebGLRenderingContext} _renderContext - main Canvas 2D/3D Context of game engine * @private @@ -97,12 +87,7 @@ function _determineRenderType(config) { function _afterEngineLoaded() { cc._engineLoaded = true; - if (CC_EDITOR) { - Editor.log(cc.ENGINE_VERSION); - } - else { - console.log(cc.ENGINE_VERSION); - } + console.log('Cocos Creator v' + cc.ENGINE_VERSION); if (_engineLoadedCallback) _engineLoadedCallback(); } diff --git a/cocos2d/core/platform/CCMacro.js b/cocos2d/core/platform/CCMacro.js index fae1399e0a..a971823fe0 100644 --- a/cocos2d/core/platform/CCMacro.js +++ b/cocos2d/core/platform/CCMacro.js @@ -1949,7 +1949,7 @@ cc.defineGetterSetter(cc.macro, 'ENABLE_CULLING', cc.renderer.childrenOrderDirty = true; } } -) +); /** * !#en diff --git a/index.js b/index.js index 9b70765348..f16a635d38 100644 --- a/index.js +++ b/index.js @@ -24,117 +24,6 @@ THE SOFTWARE. ****************************************************************************/ -// MACROS - -/** - * !#zh - * 这里是一些用来判断执行环境的宏,这些宏都是全局变量,直接访问即可。
- * 在项目构建时,这些宏将会被预处理并根据构建的平台剔除不需要的代码,例如 - * - * if (CC_DEBUG) { - * cc.log('debug'); - * } - * else { - * cc.log('release'); - * } - * - * 在构建后会只剩下 - * - * cc.log('release'); - * - * (好棒棒)
- *
- * 如需判断脚本是否运行于指定平台,可以用如下表达式: - * - * { - * "编辑器": CC_EDITOR, - * "编辑器 或 预览": CC_DEV, - * "编辑器 或 预览 或 构建调试": CC_DEBUG, - * "网页预览": CC_PREVIEW && !CC_JSB, - * "模拟器预览": CC_PREVIEW && CC_JSB, - * "构建调试": CC_BUILD && CC_DEBUG, - * "构建发行": CC_BUILD && !CC_DEBUG, - * } - * - * !#en - * Here are some of the macro used to determine the execution environment, these macros are global variables, can be accessed directly.
- * When the project is built, these macros will be preprocessed and discard unreachable code based on the built platform, for example: - * - * if (CC_DEBUG) { - * cc.log('debug'); - * } - * else { - * cc.log('release'); - * } - * - * After build will become: - * - * cc.log('release'); - * - *
- * To determine whether the script is running on the specified platform, you can use the following expression: - * - * { - * "editor": CC_EDITOR, - * "editor or preview": CC_DEV, - * "editor or preview or build in debug mode": CC_DEBUG, - * "web preview": CC_PREVIEW && !CC_JSB, - * "simulator preview": CC_PREVIEW && CC_JSB, - * "build in debug mode": CC_BUILD && CC_DEBUG, - * "build in release mode": CC_BUILD && !CC_DEBUG, - * } - * - * @module GLOBAL-MACROS - */ -/** - * @property {Boolean} CC_EDITOR - Running in the editor. - */ -/** - * @property {Boolean} CC_PREVIEW - Preview in browser or simulator. - */ -/** - * @property {Boolean} CC_DEV - Running in the editor or preview. - */ -/** - * @property {Boolean} CC_DEBUG - Running in the editor or preview, or build in debug mode. - */ -/** - * @property {Boolean} CC_BUILD - Running in published project. - */ -/** - * @property {Boolean} CC_JSB - Running in native platform (mobile app, desktop app, or simulator). - */ -/** - * @property {Boolean} CC_TEST - Running in the engine's unit test. - */ -/** - * @property {Boolean} CC_WECHATGAME - Running in the Wechat's mini game. - */ - -// window may be undefined when first load engine from editor -var _global = typeof window === 'undefined' ? global : window; -function defineMacro (name, defaultValue) { - // if "global_defs" not preprocessed by uglify, just declare them globally, - // this may happened in release version's preview page. - // (use evaled code to prevent mangle by uglify) - if (typeof _global[name] === 'undefined') { - _global[name] = defaultValue; - } -} -function defined (name) { - return typeof _global[name] === 'object'; -} - -defineMacro('CC_TEST', defined('tap') || defined('QUnit')); -defineMacro('CC_EDITOR', defined('Editor') && defined('process') && ('electron' in process.versions)); -defineMacro('CC_PREVIEW', !CC_EDITOR); -defineMacro('CC_DEV', true); // (CC_EDITOR && !CC_BUILD) || CC_PREVIEW || CC_TEST -defineMacro('CC_DEBUG', true); // CC_DEV || Debug Build -defineMacro('CC_JSB', defined('jsb')); -defineMacro('CC_BUILD', false); -defineMacro('CC_WECHATGAME', false); -defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); - // PREDEFINE /** @@ -146,22 +35,14 @@ defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); * @main cc */ cc = {}; - -// The namespace for original nodes rendering in scene graph. _ccsg = {}; +ccs = {}; +cp = {}; -if (CC_DEV) { - /** - * contains internal apis for unit tests - * @expose - */ - cc._Test = {}; -} - +require('./predefine'); require('./CCDebugger'); // polyfills -/* require('./polyfill/bind'); */ require('./polyfill/string'); require('./polyfill/misc'); require('./polyfill/array'); @@ -172,10 +53,7 @@ if (!(CC_EDITOR && Editor.isMainProcess)) { require('./cocos2d/kazmath'); require('./cocos2d/core/predefine'); -ccs = {}; -cp = {}; - -// LOAD COCOS2D ENGINE CODE +// LOAD ENGINE CODE if (!(CC_EDITOR && Editor.isMainProcess)) { require('./cocos2d/shaders'); @@ -183,7 +61,7 @@ if (!(CC_EDITOR && Editor.isMainProcess)) { require('./cocos2d'); } -// LOAD EXTENDS FOR CREATOR +// LOAD EXTENDS require('./extends'); diff --git a/jsb/index.js b/jsb/index.js index a971647251..2269feb143 100644 --- a/jsb/index.js +++ b/jsb/index.js @@ -26,41 +26,12 @@ 'use strict'; -function defineMacro (name, defaultValue) { - // if "global_defs" not preprocessed by uglify, just declare them globally, - // this may happened in release version's preview page. - // (use evaled code to prevent mangle by uglify) - if (typeof window[name] === 'undefined') { - window[name] = defaultValue; - } -} -function defined (name) { - return typeof window[name] === 'object'; -} - -defineMacro('CC_TEST', defined('tap') || defined('QUnit')); -defineMacro('CC_EDITOR', defined('Editor') && defined('process') && ('electron' in process.versions)); -defineMacro('CC_PREVIEW', !CC_EDITOR); -defineMacro('CC_DEV', true); // (CC_EDITOR && !CC_BUILD) || CC_PREVIEW || CC_TEST -defineMacro('CC_DEBUG', true); // CC_DEV || Debug Build -defineMacro('CC_JSB', defined('jsb')); -defineMacro('CC_BUILD', false); -defineMacro('CC_WECHATGAME', false); -defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); - +require('../predefine'); if (!cc.ClassManager) { cc.ClassManager = window.ClassManager; } -if (CC_DEV) { - /** - * contains internal apis for unit tests - * @expose - */ - cc._Test = {}; -} - // polyfills require('../polyfill/misc'); // str.startswith isn't supported in JavaScriptCore which is shipped with iOS8. diff --git a/predefine.js b/predefine.js new file mode 100644 index 0000000000..31cf2a8b3d --- /dev/null +++ b/predefine.js @@ -0,0 +1,157 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + +// MACROS + +/** + * !#zh + * 这里是一些用来判断执行环境的宏,这些宏都是全局变量,直接访问即可。
+ * 在项目构建时,这些宏将会被预处理并根据构建的平台剔除不需要的代码,例如 + * + * if (CC_DEBUG) { + * cc.log('debug'); + * } + * else { + * cc.log('release'); + * } + * + * 在构建后会只剩下 + * + * cc.log('release'); + * + * (好棒棒)
+ *
+ * 如需判断脚本是否运行于指定平台,可以用如下表达式: + * + * { + * "编辑器": CC_EDITOR, + * "编辑器 或 预览": CC_DEV, + * "编辑器 或 预览 或 构建调试": CC_DEBUG, + * "网页预览": CC_PREVIEW && !CC_JSB, + * "模拟器预览": CC_PREVIEW && CC_JSB, + * "构建调试": CC_BUILD && CC_DEBUG, + * "构建发行": CC_BUILD && !CC_DEBUG, + * } + * + * !#en + * Here are some of the macro used to determine the execution environment, these macros are global variables, can be accessed directly.
+ * When the project is built, these macros will be preprocessed and discard unreachable code based on the built platform, for example: + * + * if (CC_DEBUG) { + * cc.log('debug'); + * } + * else { + * cc.log('release'); + * } + * + * After build will become: + * + * cc.log('release'); + * + *
+ * To determine whether the script is running on the specified platform, you can use the following expression: + * + * { + * "editor": CC_EDITOR, + * "editor or preview": CC_DEV, + * "editor or preview or build in debug mode": CC_DEBUG, + * "web preview": CC_PREVIEW && !CC_JSB, + * "simulator preview": CC_PREVIEW && CC_JSB, + * "build in debug mode": CC_BUILD && CC_DEBUG, + * "build in release mode": CC_BUILD && !CC_DEBUG, + * } + * + * @module GLOBAL-MACROS + */ +/** + * @property {Boolean} CC_EDITOR - Running in the editor. + */ +/** + * @property {Boolean} CC_PREVIEW - Preview in browser or simulator. + */ +/** + * @property {Boolean} CC_DEV - Running in the editor or preview. + */ +/** + * @property {Boolean} CC_DEBUG - Running in the editor or preview, or build in debug mode. + */ +/** + * @property {Boolean} CC_BUILD - Running in published project. + */ +/** + * @property {Boolean} CC_JSB - Running in native platform (mobile app, desktop app, or simulator). + */ +/** + * @property {Boolean} CC_TEST - Running in the engine's unit test. + */ +/** + * @property {Boolean} CC_WECHATGAME - Running in the Wechat's mini game. + */ + +// window may be undefined when first load engine from editor +var _global = typeof window === 'undefined' ? global : window; +function defineMacro (name, defaultValue) { + // if "global_defs" not preprocessed by uglify, just declare them globally, + // this may happened in release version's preview page. + if (typeof _global[name] === 'undefined') { + _global[name] = defaultValue; + } +} +function defined (name) { + return typeof _global[name] === 'object'; +} + +defineMacro('CC_TEST', defined('tap') || defined('QUnit')); +defineMacro('CC_EDITOR', defined('Editor') && defined('process') && ('electron' in process.versions)); +defineMacro('CC_PREVIEW', !CC_EDITOR); +defineMacro('CC_DEV', true); // (CC_EDITOR && !CC_BUILD) || CC_PREVIEW || CC_TEST +defineMacro('CC_DEBUG', true); // CC_DEV || Debug Build +defineMacro('CC_JSB', defined('jsb')); +defineMacro('CC_BUILD', false); +defineMacro('CC_WECHATGAME', false); +defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); + +// + +if (CC_DEV) { + /** + * contains internal apis for unit tests + * @expose + */ + cc._Test = {}; +} + +/** + * @module cc + */ + +/** + * The current version of Cocos2d being used.
+ * Please DO NOT remove this String, it is an important flag for bug tracking.
+ * If you post a bug to forum, please attach this flag. + * @property {String} ENGINE_VERSION + */ +const engineVersion = '1.8.1'; +_global['CocosEngine'] = cc.ENGINE_VERSION = engineVersion; From 530e7512dc5eff7655cc1829df8c160975312e5d Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 9 Feb 2018 09:44:07 +0800 Subject: [PATCH 35/74] remove chipmunk and studio namespace --- index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.js b/index.js index f16a635d38..552c8181c4 100644 --- a/index.js +++ b/index.js @@ -36,8 +36,6 @@ */ cc = {}; _ccsg = {}; -ccs = {}; -cp = {}; require('./predefine'); require('./CCDebugger'); From 992b74f0acebf74c985af9b20e8f259035de2026 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 9 Feb 2018 10:12:44 +0800 Subject: [PATCH 36/74] merge bricks (#2328) * support bk game * update code * update code * update code * update code * refine code * update code * update code * update code --- cocos2d/core/CCDirectorWebGL.js | 6 +- cocos2d/core/CCDrawingPrimitivesWebGL.js | 2 +- cocos2d/core/CCGame.js | 10 +- cocos2d/core/editbox/CCSGEditBox.js | 48 +- cocos2d/core/label/CCSGLabelWebGLRenderCmd.js | 2 +- cocos2d/core/load-pipeline/loader.js | 2 +- cocos2d/core/physics/index.js | 4 + cocos2d/core/platform/BKInputManager.js | 444 ++++++++++++++++++ cocos2d/core/platform/CCSys.js | 51 +- cocos2d/core/platform/CCView.js | 13 +- cocos2d/core/textures/CCTexture2D.js | 1 + cocos2d/core/utils/index.js | 2 +- cocos2d/core/videoplayer/CCSGVideoPlayer.js | 2 +- cocos2d/shaders/CCGLProgram.js | 2 +- gulp/util/utils.js | 2 +- index.js | 4 + jsb/index.js | 1 + 17 files changed, 573 insertions(+), 23 deletions(-) create mode 100644 cocos2d/core/platform/BKInputManager.js diff --git a/cocos2d/core/CCDirectorWebGL.js b/cocos2d/core/CCDirectorWebGL.js index 245f120342..b2cbf14c7d 100644 --- a/cocos2d/core/CCDirectorWebGL.js +++ b/cocos2d/core/CCDirectorWebGL.js @@ -147,8 +147,10 @@ cc.game.once(cc.game.EVENT_RENDERER_INITED, function () { _t._openGLView = openGLView || cc.view; // Configuration. Gather GPU info - var conf = cc.configuration; - conf.gatherGPUInfo(); + if (!CC_QQPLAY) { + var conf = cc.configuration; + conf.gatherGPUInfo(); + } // set size //_t._winSizeInPoints = _t._openGLView.getDesignResolutionSize(); diff --git a/cocos2d/core/CCDrawingPrimitivesWebGL.js b/cocos2d/core/CCDrawingPrimitivesWebGL.js index 1c1c914c4d..7e27f85996 100644 --- a/cocos2d/core/CCDrawingPrimitivesWebGL.js +++ b/cocos2d/core/CCDrawingPrimitivesWebGL.js @@ -43,7 +43,7 @@ var DrawingPrimitiveWebGL = cc._Class.extend({ * @param ctx rendercontext */ ctor:function (ctx) { - if (cc.sys.platform !== cc.sys.WECHAT_GAME && !ctx instanceof WebGLRenderingContext) + if (!CC_WECHATGAME && !CC_QQPLAY && !ctx instanceof WebGLRenderingContext) throw new Error("Can't initialise DrawingPrimitiveWebGL. context need is WebGLRenderingContext"); this._renderContext = ctx; diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index ae1f056b91..b8f6649cee 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -30,7 +30,7 @@ if (!(CC_EDITOR && Editor.isMainProcess)) { } require('../audio/CCAudioEngine'); -var inputManager = require('./platform/CCInputManager'); +var inputManager = CC_QQPLAY ? require('./platform/BKInputManager') : require('./platform/CCInputManager'); /** * !#en An object to boot the game. @@ -656,13 +656,19 @@ var game = { var el = this.config[game.CONFIG_KEY.id], win = window, localCanvas, localContainer, - isWeChatGame = cc.sys.platform === cc.sys.WECHAT_GAME; + isWeChatGame = cc.sys.platform === cc.sys.WECHAT_GAME, + isQQPlay = cc.sys.platform === cc.sys.QQ_PLAY; if (isWeChatGame) { this.container = cc.container = localContainer = document.createElement("DIV"); this.frame = localContainer.parentNode === document.body ? document.documentElement : localContainer.parentNode; this.canvas = cc._canvas = localCanvas = canvas; } + else if (isQQPlay) { + this.container = cc.container = document.createElement("DIV"); + this.frame = document.documentElement; + this.canvas = cc._canvas = localCanvas = canvas; + } else { var element = (el instanceof HTMLElement) ? el : (document.querySelector(el) || document.querySelector('#' + el)); diff --git a/cocos2d/core/editbox/CCSGEditBox.js b/cocos2d/core/editbox/CCSGEditBox.js index 3f253b395c..221aa07e9a 100644 --- a/cocos2d/core/editbox/CCSGEditBox.js +++ b/cocos2d/core/editbox/CCSGEditBox.js @@ -334,6 +334,9 @@ _ccsg.EditBox = _ccsg.Node.extend({ var bb = cc.rect(0,0, this._contentSize.width, this._contentSize.height); var hitted = cc.rectContainsPoint(bb, this.convertToNodeSpace(touchPoint)); if(hitted) { + if (CC_QQPLAY) { + this._renderCmd._showBKKeyboard(); + } return true; } else { @@ -889,6 +892,34 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; return tmpEdTxt; }; + if (CC_QQPLAY) { + proto._onBKBtnClick = function (text) { + var editBox = this._editBox; + editBox._text = text; + this._updateDomTextCases(); + this._endEditing(); + editBox._delegate && editBox._delegate.editBoxEditingReturn && editBox._delegate.editBoxEditingReturn(editBox); + editBox._delegate && editBox._delegate.editBoxEditingDidEnded && editBox._delegate.editBoxEditingDidEnded(editBox); + }; + + proto._onBKTextChange = function (text) { + var editBox = this._editBox; + if (editBox._delegate && editBox._delegate.editBoxTextChanged && editBox._text !== text) { + editBox._text = text; + this._updateDomTextCases(); + editBox._delegate.editBoxTextChanged(editBox, editBox._text); + } + }; + proto._createBKInput = function (multiline) { + this._edTxt = document.createElement("input"); + }; + proto._showBKKeyboard = function () { + BK.Editor.showKeyBoard(this._onBKBtnClick.bind(this), this._onBKTextChange.bind(this)); + var editBox = this._editBox; + editBox._delegate && editBox._delegate.editBoxEditingDidBegan && editBox._delegate.editBoxEditingDidBegan(editBox); + }; + } + proto._createWXInput = function (multiline) { this.removeDom(); var thisPointer = this; @@ -1040,7 +1071,7 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; proto._showLabels = function () { this._hiddenLabels(); - var text = sys.platform === sys.WECHAT_GAME ? this._editBox._text : this._edTxt.value; + var text = CC_WECHATGAME || CC_QQPLAY ? this._editBox._text : this._edTxt.value; if (text === '') { if(this._placeholderLabel) { this._placeholderLabel.setVisible(true); @@ -1061,7 +1092,7 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; if (sys.platform === sys.WECHAT_GAME) { this._edTxt.focus(); } - else if (!self._editBox._alwaysOnTop) { + else if (!self._editBox._alwaysOnTop && sys.platform !== sys.QQ_PLAY) { if (self._edTxt.style.display === 'none') { self._edTxt.style.display = ''; @@ -1081,7 +1112,7 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; } } - if (sys.isMobile && !self._editingMode) { + if (sys.isMobile && !self._editingMode && sys.platform !== sys.QQ_PLAY) { // Pre adaptation and self._beginEditingOnMobile(self._editBox); } @@ -1089,11 +1120,12 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; }; proto._endEditing = function() { - if (!this._editBox._alwaysOnTop) { + if (!this._editBox._alwaysOnTop && sys.platform !== sys.QQ_PLAY) { this._edTxt.style.display = 'none'; } this._showLabels(); - if (sys.platform !== sys.WECHAT_GAME && sys.isMobile && this._editingMode) { + if (sys.platform !== sys.WECHAT_GAME && + sys.platform !== sys.QQ_PLAY && sys.isMobile && this._editingMode) { var self = this; // Delay end editing adaptation to ensure virtual keyboard is disapeared setTimeout(function () { @@ -1158,6 +1190,9 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; }; proto._updateDomInputType = function () { + if (!this._edTxt) { + return; + } var inputMode = this._editBox._editBoxInputMode; if(inputMode === InputMode.EMAIL_ADDR) { this._edTxt.type = 'email'; @@ -1202,6 +1237,9 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; if (sys.platform === sys.WECHAT_GAME) { this._createWXInput(inputMode === InputMode.ANY); } + else if (CC_QQPLAY) { + this._createBKInput(inputMode === InputMode.ANY); + } else if (inputMode === InputMode.ANY) { this._createDomTextArea(); } diff --git a/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js b/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js index 680c467594..81165fb542 100644 --- a/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js +++ b/cocos2d/core/label/CCSGLabelWebGLRenderCmd.js @@ -121,7 +121,7 @@ proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) { // Use 255 because color has been set when baking label // premultiplied alpha is used for labelTTF and system font var opacity = this._displayedOpacity; - this._color[0] = ((opacity<<24) | (opacity<<16) | (opacity<<8) | opacity); + this._color[0] = ((~~opacity << 24) >>> 0) | (~~opacity << 16) | (~~opacity << 8) | ~~opacity; var z = node._vertexZ; diff --git a/cocos2d/core/load-pipeline/loader.js b/cocos2d/core/load-pipeline/loader.js index f9e64299d0..461d78c8ab 100644 --- a/cocos2d/core/load-pipeline/loader.js +++ b/cocos2d/core/load-pipeline/loader.js @@ -49,7 +49,7 @@ function loadJSON (item, callback) { } function loadImage (item, callback) { - if (sys.platform !== sys.WECHAT_GAME && !(item.content instanceof Image)) { + if (sys.platform !== sys.WECHAT_GAME && sys.platform !== sys.QQ_PLAY && !(item.content instanceof Image)) { return new Error('Image Loader: Input item doesn\'t contain Image content'); } var rawUrl = item.rawUrl; diff --git a/cocos2d/core/physics/index.js b/cocos2d/core/physics/index.js index 1beab869be..2d05035e08 100644 --- a/cocos2d/core/physics/index.js +++ b/cocos2d/core/physics/index.js @@ -1,6 +1,10 @@ if (!CC_JSB) { window.b2 = require('../../../external/box2d/box2d'); + if (CC_QQPLAY) { + // can only define global variable in this way + b2 = window.b2; + } } require('./CCPhysicsManager'); diff --git a/cocos2d/core/platform/BKInputManager.js b/cocos2d/core/platform/BKInputManager.js new file mode 100644 index 0000000000..810068ff6d --- /dev/null +++ b/cocos2d/core/platform/BKInputManager.js @@ -0,0 +1,444 @@ +/**************************************************************************** + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + 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. + ****************************************************************************/ + +if (CC_QQPLAY) { + + var js = require('../platform/js'); + var macro = require('./CCMacro'); + var sys = require('./CCSys'); + var eventManager = require('../event-manager'); + + var TOUCH_TIMEOUT = macro.TOUCH_TIMEOUT; + + /** + * This class manages all events of input. include: touch, mouse, accelerometer, keyboard + */ + var bkInputManager = { + _isRegisterEvent: false, + + _preTouchPoint: cc.p(0, 0), + + _preTouchPool: [], + _preTouchPoolPointer: 0, + + _touches: [], + _touchesIntegerDict: {}, + + _indexBitsUsed: 0, + _maxTouches: 5, + + _getUnUsedIndex: function () { + var temp = this._indexBitsUsed; + var now = cc.sys.now(); + + for (var i = 0; i < this._maxTouches; i++) { + if (!(temp & 0x00000001)) { + this._indexBitsUsed |= (1 << i); + return i; + } + else { + var touch = this._touches[i]; + if (now - touch._lastModified > TOUCH_TIMEOUT) { + this._removeUsedIndexBit(i); + delete this._touchesIntegerDict[touch.getID()]; + return i; + } + } + temp >>= 1; + } + + // all bits are used + return -1; + }, + + _removeUsedIndexBit: function (index) { + if (index < 0 || index >= this._maxTouches) + return; + + var temp = 1 << index; + temp = ~temp; + this._indexBitsUsed &= temp; + }, + + _glView: null, + + /** + * @method handleTouchesBegin + * @param {Array} touches + */ + handleTouchesBegin: function (touches) { + var selTouch, index, curTouch, touchID, + handleTouches = [], locTouchIntDict = this._touchesIntegerDict, + now = sys.now(); + for (var i = 0, len = touches.length; i < len; i++) { + selTouch = touches[i]; + touchID = selTouch.getID(); + index = locTouchIntDict[touchID]; + + if (index == null) { + var unusedIndex = this._getUnUsedIndex(); + if (unusedIndex === -1) { + cc.logID(2300, unusedIndex); + continue; + } + //curTouch = this._touches[unusedIndex] = selTouch; + curTouch = this._touches[unusedIndex] = new cc.Touch(selTouch._point.x, selTouch._point.y, selTouch.getID()); + curTouch._lastModified = now; + curTouch._setPrevPoint(selTouch._prevPoint); + locTouchIntDict[touchID] = unusedIndex; + handleTouches.push(curTouch); + } + } + if (handleTouches.length > 0) { + this._glView._convertTouchesWithScale(handleTouches); + var touchEvent = new cc.Event.EventTouch(handleTouches); + touchEvent._eventCode = cc.Event.EventTouch.BEGAN; + eventManager.dispatchEvent(touchEvent); + } + }, + + /** + * @method handleTouchesMove + * @param {Array} touches + */ + handleTouchesMove: function (touches) { + var selTouch, index, touchID, + handleTouches = [], locTouches = this._touches, + now = sys.now(); + for (var i = 0, len = touches.length; i < len; i++) { + selTouch = touches[i]; + touchID = selTouch.getID(); + index = this._touchesIntegerDict[touchID]; + + if (index == null) { + //cc.log("if the index doesn't exist, it is an error"); + continue; + } + if (locTouches[index]) { + locTouches[index]._setPoint(selTouch._point); + locTouches[index]._setPrevPoint(selTouch._prevPoint); + locTouches[index]._lastModified = now; + handleTouches.push(locTouches[index]); + } + } + if (handleTouches.length > 0) { + this._glView._convertTouchesWithScale(handleTouches); + var touchEvent = new cc.Event.EventTouch(handleTouches); + touchEvent._eventCode = cc.Event.EventTouch.MOVED; + eventManager.dispatchEvent(touchEvent); + } + }, + + /** + * @method handleTouchesEnd + * @param {Array} touches + */ + handleTouchesEnd: function (touches) { + var handleTouches = this.getSetOfTouchesEndOrCancel(touches); + if (handleTouches.length > 0) { + this._glView._convertTouchesWithScale(handleTouches); + var touchEvent = new cc.Event.EventTouch(handleTouches); + touchEvent._eventCode = cc.Event.EventTouch.ENDED; + eventManager.dispatchEvent(touchEvent); + } + }, + + /** + * @method handleTouchesCancel + * @param {Array} touches + */ + handleTouchesCancel: function (touches) { + var handleTouches = this.getSetOfTouchesEndOrCancel(touches); + if (handleTouches.length > 0) { + this._glView._convertTouchesWithScale(handleTouches); + var touchEvent = new cc.Event.EventTouch(handleTouches); + touchEvent._eventCode = cc.Event.EventTouch.CANCELLED; + eventManager.dispatchEvent(touchEvent); + } + }, + + /** + * @method getSetOfTouchesEndOrCancel + * @param {Array} touches + * @returns {Array} + */ + getSetOfTouchesEndOrCancel: function (touches) { + var selTouch, index, touchID, handleTouches = [], locTouches = this._touches, + locTouchesIntDict = this._touchesIntegerDict; + for (var i = 0, len = touches.length; i < len; i++) { + selTouch = touches[i]; + touchID = selTouch.getID(); + index = locTouchesIntDict[touchID]; + + if (index == null) { + continue; //cc.log("if the index doesn't exist, it is an error"); + } + if (locTouches[index]) { + locTouches[index]._setPoint(selTouch._point); + locTouches[index]._setPrevPoint(selTouch._prevPoint); + handleTouches.push(locTouches[index]); + this._removeUsedIndexBit(index); + delete locTouchesIntDict[touchID]; + } + } + return handleTouches; + }, + + /** + * @method getHTMLElementPosition + * @param {HTMLElement} element + * @return {Object} + */ + getHTMLElementPosition: function (element) { + if (sys.platform === sys.WECHAT_GAME) { + return { + left: 0, + top: 0, + width: window.innerWidth, + height: window.innerHeight + }; + } + + var docElem = document.documentElement; + var leftOffset = window.pageXOffset - docElem.clientLeft; + var topOffset = window.pageYOffset - docElem.clientTop; + if (typeof element.getBoundingClientRect === 'function') { + var box = element.getBoundingClientRect(); + return { + left: box.left + leftOffset, + top: box.top + topOffset, + width: box.width, + height: box.height + }; + } + else { + if (element instanceof HTMLCanvasElement) { + return { + left: leftOffset, + top: topOffset, + width: element.width, + height: element.height + }; + } + else { + return { + left: leftOffset, + top: topOffset, + width: parseInt(element.style.width), + height: parseInt(element.style.height) + }; + } + } + }, + + /** + * @method getPreTouch + * @param {Touch} touch + * @return {Touch} + */ + getPreTouch: function (touch) { + var preTouch = null; + var locPreTouchPool = this._preTouchPool; + var id = touch.getID(); + for (var i = locPreTouchPool.length - 1; i >= 0; i--) { + if (locPreTouchPool[i].getID() === id) { + preTouch = locPreTouchPool[i]; + break; + } + } + if (!preTouch) + preTouch = touch; + return preTouch; + }, + + /** + * @method setPreTouch + * @param {Touch} touch + */ + setPreTouch: function (touch) { + var find = false; + var locPreTouchPool = this._preTouchPool; + var id = touch.getID(); + for (var i = locPreTouchPool.length - 1; i >= 0; i--) { + if (locPreTouchPool[i].getID() === id) { + locPreTouchPool[i] = touch; + find = true; + break; + } + } + if (!find) { + if (locPreTouchPool.length <= 50) { + locPreTouchPool.push(touch); + } + else { + locPreTouchPool[this._preTouchPoolPointer] = touch; + this._preTouchPoolPointer = (this._preTouchPoolPointer + 1) % 50; + } + } + }, + + /** + * @method getTouchByXY + * @param {Number} tx + * @param {Number} ty + * @param {Vec2} pos + * @return {Touch} + */ + getTouchByXY: function (tx, ty, pos) { + var locPreTouch = this._preTouchPoint; + var location = this._glView.convertToLocationInView(tx, ty, pos); + var touch = new cc.Touch(location.x, location.y); + touch._setPrevPoint(locPreTouch.x, locPreTouch.y); + locPreTouch.x = location.x; + locPreTouch.y = location.y; + return touch; + }, + + /** + * @method getPointByEvent + * @param {Touch} event + * @param {Vec2} pos + * @return {Vec2} + */ + getPointByEvent: function (event, pos) { + if (event.pageX != null) //not avalable in <= IE8 + return { + x: event.pageX, + y: event.pageY + }; + + if (sys.platform === sys.WECHAT_GAME) { + pos.left = 0; + pos.top = 0; + } + else { + pos.left -= document.body.scrollLeft; + pos.top -= document.body.scrollTop; + } + return { + x: event.clientX, + y: event.clientY + }; + }, + + /** + * @method getTouchesByEvent + * @param {Touch} event + * @param {Vec2} pos + * @returns {Array} + */ + getTouchesByEvent: function (event) { + var touchArr = [], locView = this._glView; + var touch_event, touch, preLocation; + var locPreTouch = this._preTouchPoint; + var length = event.length; + for (var i = 0; i < length; i++) { + touch_event = event[i]; + if (touch_event) { + + var location = locView.convertToLocationInView(touch_event.x, touch_event.y, this._relatedPos); + location.y = cc.game.canvas.height - location.y; + if (touch_event.identifier != null) { + touch = new cc.Touch(location.x, location.y, touch_event.identifier); + //use Touch Pool + preLocation = this.getPreTouch(touch).getLocation(); + touch._setPrevPoint(preLocation.x, preLocation.y); + this.setPreTouch(touch); + } + else { + touch = new cc.Touch(location.x, location.y); + touch._setPrevPoint(locPreTouch.x, locPreTouch.y); + } + locPreTouch.x = location.x; + locPreTouch.y = location.y; + touchArr.push(touch); + } + } + return touchArr; + }, + + // bk game + detectGesture: function () { + var touchArr = BK.TouchEvent.getTouchEvent(); + if (!touchArr) { + return; + } + + var _touchBeginEvents = []; + var _touchMoveEvents = []; + var _touchEndEvents = []; + + for (var i = 0; i < touchArr.length; i++) { + var touch_event = touchArr[i]; + //touch begin + if (touchArr[i].status === 2) { + _touchBeginEvents.push(touch_event); + } + //touch moved + else if (touchArr[i].status === 3) { + _touchMoveEvents.push(touch_event); + } + //touch end + else if (touchArr[i].status === 1) { + _touchEndEvents.push(touch_event); + } + } + + if (_touchBeginEvents.length > 0) { + this.handleTouchesBegin(this.getTouchesByEvent(_touchBeginEvents)); + } + if (_touchMoveEvents.length > 0) { + this.handleTouchesMove(this.getTouchesByEvent(_touchMoveEvents)); + } + if (_touchEndEvents.length > 0) { + this.handleTouchesEnd(this.getTouchesByEvent(_touchEndEvents)); + } + + BK.TouchEvent.updateTouchStatus(); + }, + + /** + * @method registerSystemEvent + * @param {HTMLElement} element + */ + registerSystemEvent: function (element) { + this._glView = cc.view; + this._relatedPos = { + left: 0, + top: 0, + width: element.width, + height: element.height + }; + }, + + _registerKeyboardEvent: function () { + }, + + _registerAccelerometerEvent: function () { + }, + }; + + module.exports = BK.inputManager = bkInputManager; +} diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index 2002811938..e2b0840335 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -340,6 +340,12 @@ sys.EDITOR_CORE = 103; * @default 104 */ sys.WECHAT_GAME = 104; +/** + * @property {Number} QQ_PLAY + * @readOnly + * @default 105 + */ +sys.QQ_PLAY = 105; /** * BROWSER_TYPE_WECHAT @@ -355,6 +361,13 @@ sys.BROWSER_TYPE_WECHAT = "wechat"; * @default "wechatgame" */ sys.BROWSER_TYPE_WECHAT_GAME = "wechatgame"; +/** + * BROWSER_TYPE_QQ_PLAY + * @property {String} BROWSER_TYPE_QQ_PLAY + * @readOnly + * @default "qqplay" + */ +sys.BROWSER_TYPE_QQ_PLAY = "qqplay"; /** * * @property {String} BROWSER_TYPE_ANDROID @@ -500,7 +513,7 @@ sys.isNative = false; * Is web browser ? * @property {Boolean} isBrowser */ -sys.isBrowser = typeof window === 'object' && typeof document === 'object' && !CC_WECHATGAME; +sys.isBrowser = typeof window === 'object' && typeof document === 'object' && !CC_WECHATGAME && !CC_QQPLAY; cc.create3DContext = function (canvas, opt_attribs, opt_contextType) { if (opt_contextType) { @@ -576,6 +589,40 @@ else if (CC_WECHATGAME) { format: ['.mp3'] }; } +else if (CC_QQPLAY) { + sys.isMobile = true; + sys.platform = sys.QQ_PLAY; + sys.language = sys.LANGUAGE_UNKNOWN; + sys.os = sys.OS_UNKNOWN; + + sys.osVersion = 0; + sys.osMainVersion = 0; + sys.browserType = sys.BROWSER_TYPE_QQ_PLAY; + sys.browserVersion = 0; + + var w = 960; + var h = 640; + var ratio = 1; + + sys.windowPixelResolution = { + width: ratio * w, + height: ratio * h + }; + + sys.localStorage = window.localStorage; + + sys.capabilities = { + "canvas": false, + "opengl": true, + "webp": false + }; + sys.__audioSupport = { + ONLY_ONE: false, + WEB_AUDIO: false, + DELAY_CREATE_CTX: false, + format: ['.mp3'] + }; +} else { // browser or runtime var win = window, nav = win.navigator, doc = document, docEle = doc.documentElement; @@ -667,6 +714,8 @@ else { var browserType = browserTypes ? browserTypes[0].toLowerCase() : sys.BROWSER_TYPE_UNKNOWN; if (CC_WECHATGAME) browserType = sys.BROWSER_TYPE_WECHAT_GAME; + else if (CC_QQPLAY) + browserType = sys.BROWSER_TYPE_QQ_PLAY; else if (browserType === 'micromessenger') browserType = sys.BROWSER_TYPE_WECHAT; else if (browserType === "safari" && isAndroid) diff --git a/cocos2d/core/platform/CCView.js b/cocos2d/core/platform/CCView.js index e07fec158b..6522e43348 100644 --- a/cocos2d/core/platform/CCView.js +++ b/cocos2d/core/platform/CCView.js @@ -27,7 +27,7 @@ var eventManager = require('../event-manager'); var __BrowserGetter = { init: function(){ - if (cc.sys.platform !== cc.sys.WECHAT_GAME) { + if (!CC_WECHATGAME && !CC_QQPLAY) { this.html = document.getElementsByTagName("html")[0]; } }, @@ -49,9 +49,6 @@ var __BrowserGetter = { adaptationType: cc.sys.browserType }; -if (window.navigator.userAgent.indexOf("OS 8_1_") > -1) //this mistake like MIUI, so use of MIUI treatment method - __BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_MIUI; - if (cc.sys.os === cc.sys.OS_IOS) // All browsers are WebView __BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_SAFARI; @@ -59,6 +56,10 @@ if (CC_WECHATGAME) { __BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_WECHAT_GAME; } +if (CC_QQPLAY) { + __BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_QQ_PLAY; +} + switch (__BrowserGetter.adaptationType) { case cc.sys.BROWSER_TYPE_SAFARI: __BrowserGetter.meta["minimal-ui"] = "true"; @@ -392,7 +393,7 @@ var View = cc._Class.extend({ }, _adjustViewportMeta: function () { - if (this._isAdjustViewPort && cc.sys.platform !== cc.sys.WECHAT_GAME) { + if (this._isAdjustViewPort && !CC_WECHATGAME && !CC_QQPLAY) { this._setViewportMeta(__BrowserGetter.meta, false); this._isAdjustViewPort = false; } @@ -825,7 +826,7 @@ var View = cc._Class.extend({ * @param {ResolutionPolicy|Number} resolutionPolicy The resolution policy desired */ setRealPixelResolution: function (width, height, resolutionPolicy) { - if (cc.sys.platform !== cc.sys.WECHAT_GAME) { + if (!CC_WECHATGAME && !CC_QQPLAY) { // Set viewport's width this._setViewportMeta({"width": width}, true); diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js index 29499e4624..f05762cd2a 100644 --- a/cocos2d/core/textures/CCTexture2D.js +++ b/cocos2d/core/textures/CCTexture2D.js @@ -804,6 +804,7 @@ game.once(game.EVENT_RENDERER_INITED, function () { gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, premultiplyAlpha); if ( sys.platform === sys.WECHAT_GAME || + sys.platform === sys.QQ_PLAY || img instanceof HTMLCanvasElement || img instanceof HTMLImageElement || img instanceof HTMLVideoElement diff --git a/cocos2d/core/utils/index.js b/cocos2d/core/utils/index.js index 2df6fc067f..3f26ef6871 100644 --- a/cocos2d/core/utils/index.js +++ b/cocos2d/core/utils/index.js @@ -24,7 +24,7 @@ ****************************************************************************/ require('./CCPath'); -if (!CC_EDITOR && !CC_JSB) { +if (!CC_EDITOR && !CC_JSB && !CC_WECHATGAME && !CC_QQPLAY) { require('./CCProfiler'); } require('./find'); diff --git a/cocos2d/core/videoplayer/CCSGVideoPlayer.js b/cocos2d/core/videoplayer/CCSGVideoPlayer.js index d9a523a16b..7c5156b1ad 100644 --- a/cocos2d/core/videoplayer/CCSGVideoPlayer.js +++ b/cocos2d/core/videoplayer/CCSGVideoPlayer.js @@ -222,7 +222,7 @@ _ccsg.VideoPlayer.EventType = { * so it is best to provide mp4 and webm or ogv file */ var dom = document.createElement("video"); - if (sys.platform !== sys.WECHAT_GAME) { + if (sys.platform !== sys.WECHAT_GAME && sys.platform !== sys.QQ_PLAY) { if(dom.canPlayType("video/ogg")){ video._polyfill.canPlayType.push(".ogg"); video._polyfill.canPlayType.push(".ogv"); diff --git a/cocos2d/shaders/CCGLProgram.js b/cocos2d/shaders/CCGLProgram.js index 004b1f23d7..1cf2e5c78e 100644 --- a/cocos2d/shaders/CCGLProgram.js +++ b/cocos2d/shaders/CCGLProgram.js @@ -99,7 +99,7 @@ cc.GLProgram = cc._Class.extend(/** @lends cc.GLProgram# */{ else cc.log("cocos2d: \n" + this.fragmentShaderLog()); } - return ( status === true ); + return !!status }, /** diff --git a/gulp/util/utils.js b/gulp/util/utils.js index 886f923c0c..ec8d63f96d 100644 --- a/gulp/util/utils.js +++ b/gulp/util/utils.js @@ -1,6 +1,6 @@ const PLATFORM_MACROS = ['CC_EDITOR', 'CC_PREVIEW', 'CC_BUILD', 'CC_TEST']; -const FLAGS = ['jsb', 'wechatgame', 'debug']; +const FLAGS = ['jsb', 'wechatgame', 'qqplay', 'debug']; // generate macros for uglify's global_defs // available platforms: 'editor' | 'preview' | 'build' | 'test' diff --git a/index.js b/index.js index f4f28be494..8cc1e9159c 100644 --- a/index.js +++ b/index.js @@ -109,6 +109,9 @@ /** * @property {Boolean} CC_WECHATGAME - Running in the Wechat's mini game. */ +/** + * @property {Boolean} CC_QQPLAY - Running in the bricks. + */ // window may be undefined when first load engine from editor var _global = typeof window === 'undefined' ? global : window; @@ -132,6 +135,7 @@ defineMacro('CC_DEBUG', true); // CC_DEV || Debug Build defineMacro('CC_JSB', defined('jsb')); defineMacro('CC_BUILD', false); defineMacro('CC_WECHATGAME', false); +defineMacro('CC_QQPLAY', false); defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); // PREDEFINE diff --git a/jsb/index.js b/jsb/index.js index f1fa917c34..2231f5c5ad 100644 --- a/jsb/index.js +++ b/jsb/index.js @@ -45,6 +45,7 @@ defineMacro('CC_DEBUG', true); // CC_DEV || Debug Build defineMacro('CC_JSB', defined('jsb')); defineMacro('CC_BUILD', false); defineMacro('CC_WECHATGAME', false); +defineMacro('CC_QQPLAY', false); defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); From ec2f53fb1b8e1567702a17e76cd5eff30952a58c Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Sun, 11 Feb 2018 15:42:30 +0800 Subject: [PATCH 37/74] add destroy for fireball/issues/6888 --- cocos2d/audio/CCAudio.js | 6 ++++++ cocos2d/audio/CCAudioEngine.js | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 6d7686b718..88d92f1a00 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -175,6 +175,12 @@ Audio.State = { }); }; + proto.destroy = function () { + if (CC_WECHATGAME) { + this._element.destroy(); + } + }; + proto.pause = function () { if (!this._element) return; this._unbindEnded(); diff --git a/cocos2d/audio/CCAudioEngine.js b/cocos2d/audio/CCAudioEngine.js index 8ed026746f..9a310195ff 100644 --- a/cocos2d/audio/CCAudioEngine.js +++ b/cocos2d/audio/CCAudioEngine.js @@ -425,6 +425,7 @@ var audioEngine = { var audio = id2audio[id]; if (audio) { audio.stop(); + audio.destroy(); delete id2audio[id]; } } @@ -439,6 +440,12 @@ var audioEngine = { */ uncacheAll: function () { this.stopAll(); + for (var id in id2audio) { + var audio = id2audio[id]; + if (audio) { + audio.destroy(); + } + } id2audio = {}; url2id = {}; }, From cbafbf8a37640a47feb2c2d40615f87ccbf7c1a9 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Mon, 12 Feb 2018 11:25:56 +0800 Subject: [PATCH 38/74] fix label display error for fireball/issues/6894 --- cocos2d/core/label/CCSGLabelCanvasRenderCmd.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js b/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js index 9a0ed54f7b..3902eb1402 100644 --- a/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js +++ b/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js @@ -288,8 +288,8 @@ } canvasSizeY = this._splitedStrings.length * this._getLineHeight(); - this._canvasSize.width = parseFloat(canvasSizeX.toFixed(2)) + 2 * this._getMargin(); - this._canvasSize.height = parseFloat(canvasSizeY.toFixed(2)); + this._canvasSize.width = Math.round(canvasSizeX.toFixed(2)) + 2 * this._getMargin(); + this._canvasSize.height = Math.round(canvasSizeY.toFixed(2)); if(node._isItalic) { //0.0174532925 = 3.141592653 / 180 this._canvasSize.width += node._drawFontsize * Math.tan(12 * 0.0174532925); From dfdc70a7403acd99419b59fdcd6e2a189812bd8a Mon Sep 17 00:00:00 2001 From: Knox Date: Mon, 12 Feb 2018 13:38:23 +0800 Subject: [PATCH 39/74] fix containsRect api error for creator-api-docs/issues/19 (#2333) --- cocos2d/core/value-types/CCRect.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/value-types/CCRect.js b/cocos2d/core/value-types/CCRect.js index 1071d79ad3..cfcc3b6066 100644 --- a/cocos2d/core/value-types/CCRect.js +++ b/cocos2d/core/value-types/CCRect.js @@ -346,8 +346,8 @@ proto.contains = function (point) { * @param {Rect} rect * @type {Boolean} * @example - * var a = new cc.Rect(0, 0, 10, 10); - * var b = new cc.Rect(0, 0, 20, 20); + * var a = new cc.Rect(0, 0, 20, 20); + * var b = new cc.Rect(0, 0, 10, 10); * a.containsRect(b);// true */ proto.containsRect = function (rect) { From f572c790bffb999e387ef2640936ef0f4ff38b55 Mon Sep 17 00:00:00 2001 From: SijieWang Date: Tue, 13 Feb 2018 09:55:39 +0800 Subject: [PATCH 40/74] The audio cache id does not match (#2336) --- cocos2d/core/load-pipeline/audio-downloader.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2d/core/load-pipeline/audio-downloader.js b/cocos2d/core/load-pipeline/audio-downloader.js index 48ccf7abce..07ebeee101 100644 --- a/cocos2d/core/load-pipeline/audio-downloader.js +++ b/cocos2d/core/load-pipeline/audio-downloader.js @@ -84,15 +84,15 @@ function loadWebAudio (item, callback) { context["decodeAudioData"](request.response, function(buffer){ //success item.buffer = buffer; - callback(null, item.url); + callback(null, item.id); }, function(){ //error - callback('decode error - ' + item.url, null); + callback('decode error - ' + item.id, null); }); }; request.onerror = function(){ - callback('request error - ' + item.url, null); + callback('request error - ' + item.id, null); }; request.send(); From d8be5c462203084dd6026e8f5c97cb62808ad1e2 Mon Sep 17 00:00:00 2001 From: nshmura Date: Fri, 16 Feb 2018 12:48:37 +0900 Subject: [PATCH 41/74] Fix types of CCPolygonCollier and CCPhysicsChainCollider --- cocos2d/core/collider/CCPolygonCollider.js | 2 +- cocos2d/core/physics/collider/CCPhysicsChainCollider.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/collider/CCPolygonCollider.js b/cocos2d/core/collider/CCPolygonCollider.js index 9b01679307..a017c358d4 100644 --- a/cocos2d/core/collider/CCPolygonCollider.js +++ b/cocos2d/core/collider/CCPolygonCollider.js @@ -59,7 +59,7 @@ cc.Collider.Polygon = cc.Class({ * !#en Polygon points * !#zh 多边形顶点数组 * @property points - * @type {[Vec2]} + * @type {Vec2[]} */ points: { tooltip: CC_DEV && 'i18n:COMPONENT.physics.physics_collider.points', diff --git a/cocos2d/core/physics/collider/CCPhysicsChainCollider.js b/cocos2d/core/physics/collider/CCPhysicsChainCollider.js index a4e31fb9fa..0431acde6b 100644 --- a/cocos2d/core/physics/collider/CCPhysicsChainCollider.js +++ b/cocos2d/core/physics/collider/CCPhysicsChainCollider.js @@ -53,7 +53,7 @@ var PhysicsChainCollider = cc.Class({ * !#en Chain points * !#zh 链条顶点数组 * @property points - * @type {[Vec2]} + * @type {Vec2[]} */ points: { default: function () { From 1a2f0b584c7fbfa048c3a8afd4af840ea000ac62 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Thu, 22 Feb 2018 10:49:51 +0800 Subject: [PATCH 42/74] remove chipmunk --- extends.js | 1 - external/chipmunk/chipmunk.js | 6182 --------------------------------- gulp/tasks/engine.js | 1 - modules.json | 6 - 4 files changed, 6190 deletions(-) delete mode 100644 external/chipmunk/chipmunk.js diff --git a/extends.js b/extends.js index 71912ea9e6..0ee2a5eed3 100644 --- a/extends.js +++ b/extends.js @@ -40,7 +40,6 @@ else { require('./extensions/ccpool/CCPool'); if (!CC_JSB) { require('./cocos2d/actions'); - require('./external/chipmunk/chipmunk'); } } diff --git a/external/chipmunk/chipmunk.js b/external/chipmunk/chipmunk.js deleted file mode 100644 index 0da684077d..0000000000 --- a/external/chipmunk/chipmunk.js +++ /dev/null @@ -1,6182 +0,0 @@ -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -Object.create = Object.create || function(o) { - function F() {} - F.prototype = o; - return new F(); -}; - -//var VERSION = CP_VERSION_MAJOR + "." + CP_VERSION_MINOR + "." + CP_VERSION_RELEASE; - -var assert = function(value, message) -{ - if (!value) { - throw new Error('Assertion failed: ' + message); - } -}; - -var assertSoft = function(value, message) -{ - if(!value && console && console.warn) { - console.warn("ASSERTION FAILED: " + message); - if(console.trace) { - console.trace(); - } - } -}; - -var mymin = function(a, b) -{ - return a < b ? a : b; -}; -var mymax = function(a, b) -{ - return a > b ? a : b; -}; - -var min, max; -if (typeof window === 'object' && window.navigator.userAgent.indexOf('Firefox') > -1){ - // On firefox, Math.min and Math.max are really fast: - // http://jsperf.com/math-vs-greater-than/8 - min = Math.min; - max = Math.max; -} else { - // On chrome and safari, Math.min / max are slooow. The ternery operator above is faster - // than the builtins because we only have to deal with 2 arguments that are always numbers. - min = mymin; - max = mymax; -} - -/* The hashpair function takes two numbers and returns a hash code for them. - * Required that hashPair(a, b) === hashPair(b, a). - * Chipmunk's hashPair function is defined as: - * #define CP_HASH_COEF (3344921057ul) - * #define CP_HASH_PAIR(A, B) ((cpHashValue)(A)*CP_HASH_COEF ^ (cpHashValue)(B)*CP_HASH_COEF) - * But thats not suitable in javascript because multiplying by a large number will make the number - * a large float. - * - * The result of hashPair is used as the key in objects, so it returns a string. - */ -var hashPair = function(a, b) -{ - //assert(typeof(a) === 'number', "HashPair used on something not a number"); - return a < b ? a + ' ' + b : b + ' ' + a; -}; - -var deleteObjFromList = function(arr, obj) -{ - for(var i=0; i> 1; - for(var i=1; i maxx || (x == maxx && y > maxy)){ - maxx = x; - maxy = y; - end = i; - } - } - return [start, end]; -}; - -var SWAP = function(arr, idx1, idx2) -{ - var tmp = arr[idx1*2]; - arr[idx1*2] = arr[idx2*2]; - arr[idx2*2] = tmp; - - tmp = arr[idx1*2+1]; - arr[idx1*2+1] = arr[idx2*2+1]; - arr[idx2*2+1] = tmp; -}; - -var QHullPartition = function(verts, offs, count, a, b, tol) -{ - if(count === 0) return 0; - - var max = 0; - var pivot = offs; - - var delta = vsub(b, a); - var valueTol = tol * vlength(delta); - - var head = offs; - for(var tail = offs+count-1; head <= tail;){ - var v = new Vect(verts[head * 2], verts[head * 2 + 1]); - var value = vcross(delta, vsub(v, a)); - if(value > valueTol){ - if(value > max){ - max = value; - pivot = head; - } - - head++; - } else { - SWAP(verts, head, tail); - tail--; - } - } - - // move the new pivot to the front if it's not already there. - if(pivot != offs) SWAP(verts, offs, pivot); - return head - offs; -}; - -var QHullReduce = function(tol, verts, offs, count, a, pivot, b, resultPos) -{ - if(count < 0){ - return 0; - } else if(count == 0) { - verts[resultPos*2] = pivot.x; - verts[resultPos*2+1] = pivot.y; - return 1; - } else { - var left_count = QHullPartition(verts, offs, count, a, pivot, tol); - var left = new Vect(verts[offs*2], verts[offs*2+1]); - var index = QHullReduce(tol, verts, offs + 1, left_count - 1, a, left, pivot, resultPos); - - var pivotPos = resultPos + index++; - verts[pivotPos*2] = pivot.x; - verts[pivotPos*2+1] = pivot.y; - - var right_count = QHullPartition(verts, offs + left_count, count - left_count, pivot, b, tol); - var right = new Vect(verts[(offs+left_count)*2], verts[(offs+left_count)*2+1]); - return index + QHullReduce(tol, verts, offs + left_count + 1, right_count - 1, pivot, right, b, resultPos + index); - } -}; - -// QuickHull seemed like a neat algorithm, and efficient-ish for large input sets. -// My implementation performs an in place reduction using the result array as scratch space. -// -// Pass an Array into result to put the result of the calculation there. Otherwise, pass null -// and the verts list will be edited in-place. -// -// Expects the verts to be described in the same way as cpPolyShape - which is to say, it should -// be a list of [x1,y1,x2,y2,x3,y3,...]. -// -// tolerance is in world coordinates. Eg, 2. -cp.convexHull = function(verts, result, tolerance) -{ - if(result){ - // Copy the line vertexes into the empty part of the result polyline to use as a scratch buffer. - for (var i = 0; i < verts.length; i++){ - result[i] = verts[i]; - } - } else { - // If a result array was not specified, reduce the input instead. - result = verts; - } - - // Degenerate case, all points are the same. - var indexes = loopIndexes(verts); - var start = indexes[0], end = indexes[1]; - if(start == end){ - //if(first) (*first) = 0; - result.length = 2; - return result; - } - - SWAP(result, 0, start); - SWAP(result, 1, end == 0 ? start : end); - - var a = new Vect(result[0], result[1]); - var b = new Vect(result[2], result[3]); - - var count = verts.length >> 1; - //if(first) (*first) = start; - var resultCount = QHullReduce(tolerance, result, 2, count - 2, a, b, a, 1) + 1; - result.length = resultCount*2; - - assertSoft(polyValidate(result), - "Internal error: cpConvexHull() and cpPolyValidate() did not agree." + - "Please report this error with as much info as you can."); - return result; -}; - -/// Clamp @c f to be between @c min and @c max. -var clamp = function(f, minv, maxv) -{ - return min(max(f, minv), maxv); -}; - -/// Clamp @c f to be between 0 and 1. -var clamp01 = function(f) -{ - return max(0, min(f, 1)); -}; - -/// Linearly interpolate (or extrapolate) between @c f1 and @c f2 by @c t percent. -var lerp = function(f1, f2, t) -{ - return f1*(1 - t) + f2*t; -}; - -/// Linearly interpolate from @c f1 to @c f2 by no more than @c d. -var lerpconst = function(f1, f2, d) -{ - return f1 + clamp(f2 - f1, -d, d); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -// I'm using an array tuple here because (at time of writing) its about 3x faster -// than an object on firefox, and the same speed on chrome. - -//var numVects = 0; - -var Vect = cp.Vect = function(x, y) -{ - this.x = x; - this.y = y; - //numVects++; - -// var s = new Error().stack; -// traces[s] = traces[s] ? traces[s]+1 : 1; -}; - -cp.v = function (x,y) { return new Vect(x, y) }; - -var vzero = cp.vzero = new Vect(0,0); - -// The functions below *could* be rewritten to be instance methods on Vect. I don't -// know how that would effect performance. For now, I'm keeping the JS similar to -// the original C code. - -/// Vector dot product. -var vdot = cp.v.dot = function(v1, v2) -{ - return v1.x*v2.x + v1.y*v2.y; -}; - -var vdot2 = function(x1, y1, x2, y2) -{ - return x1*x2 + y1*y2; -}; - -/// Returns the length of v. -var vlength = cp.v.len = function(v) -{ - return Math.sqrt(vdot(v, v)); -}; - -var vlength2 = cp.v.len2 = function(x, y) -{ - return Math.sqrt(x*x + y*y); -}; - -/// Check if two vectors are equal. (Be careful when comparing floating point numbers!) -var veql = cp.v.eql = function(v1, v2) -{ - return (v1.x === v2.x && v1.y === v2.y); -}; - -/// Add two vectors -var vadd = cp.v.add = function(v1, v2) -{ - return new Vect(v1.x + v2.x, v1.y + v2.y); -}; - -Vect.prototype.add = function(v2) -{ - this.x += v2.x; - this.y += v2.y; - return this; -}; - -/// Subtract two vectors. -var vsub = cp.v.sub = function(v1, v2) -{ - return new Vect(v1.x - v2.x, v1.y - v2.y); -}; - -Vect.prototype.sub = function(v2) -{ - this.x -= v2.x; - this.y -= v2.y; - return this; -}; - -/// Negate a vector. -var vneg = cp.v.neg = function(v) -{ - return new Vect(-v.x, -v.y); -}; - -Vect.prototype.neg = function() -{ - this.x = -this.x; - this.y = -this.y; - return this; -}; - -/// Scalar multiplication. -var vmult = cp.v.mult = function(v, s) -{ - return new Vect(v.x*s, v.y*s); -}; - -Vect.prototype.mult = function(s) -{ - this.x *= s; - this.y *= s; - return this; -}; - -/// 2D vector cross product analog. -/// The cross product of 2D vectors results in a 3D vector with only a z component. -/// This function returns the magnitude of the z value. -var vcross = cp.v.cross = function(v1, v2) -{ - return v1.x*v2.y - v1.y*v2.x; -}; - -var vcross2 = function(x1, y1, x2, y2) -{ - return x1*y2 - y1*x2; -}; - -/// Returns a perpendicular vector. (90 degree rotation) -var vperp = cp.v.perp = function(v) -{ - return new Vect(-v.y, v.x); -}; - -/// Returns a perpendicular vector. (-90 degree rotation) -var vpvrperp = cp.v.pvrperp = function(v) -{ - return new Vect(v.y, -v.x); -}; - -/// Returns the vector projection of v1 onto v2. -var vproject = cp.v.project = function(v1, v2) -{ - return vmult(v2, vdot(v1, v2)/vlengthsq(v2)); -}; - -Vect.prototype.project = function(v2) -{ - this.mult(vdot(this, v2) / vlengthsq(v2)); - return this; -}; - -/// Uses complex number multiplication to rotate v1 by v2. Scaling will occur if v1 is not a unit vector. -var vrotate = cp.v.rotate = function(v1, v2) -{ - return new Vect(v1.x*v2.x - v1.y*v2.y, v1.x*v2.y + v1.y*v2.x); -}; - -Vect.prototype.rotate = function(v2) -{ - this.x = this.x * v2.x - this.y * v2.y; - this.y = this.x * v2.y + this.y * v2.x; - return this; -}; - -/// Inverse of vrotate(). -var vunrotate = cp.v.unrotate = function(v1, v2) -{ - return new Vect(v1.x*v2.x + v1.y*v2.y, v1.y*v2.x - v1.x*v2.y); -}; - -/// Returns the squared length of v. Faster than vlength() when you only need to compare lengths. -var vlengthsq = cp.v.lengthsq = function(v) -{ - return vdot(v, v); -}; - -var vlengthsq2 = cp.v.lengthsq2 = function(x, y) -{ - return x*x + y*y; -}; - -/// Linearly interpolate between v1 and v2. -var vlerp = cp.v.lerp = function(v1, v2, t) -{ - return vadd(vmult(v1, 1 - t), vmult(v2, t)); -}; - -/// Returns a normalized copy of v. -var vnormalize = cp.v.normalize = function(v) -{ - return vmult(v, 1/vlength(v)); -}; - -/// Returns a normalized copy of v or vzero if v was already vzero. Protects against divide by zero errors. -var vnormalize_safe = cp.v.normalize_safe = function(v) -{ - return (v.x === 0 && v.y === 0 ? vzero : vnormalize(v)); -}; - -/// Clamp v to length len. -var vclamp = cp.v.clamp = function(v, len) -{ - return (vdot(v,v) > len*len) ? vmult(vnormalize(v), len) : v; -}; - -/// Linearly interpolate between v1 towards v2 by distance d. -var vlerpconst = cp.v.lerpconst = function(v1, v2, d) -{ - return vadd(v1, vclamp(vsub(v2, v1), d)); -}; - -/// Returns the distance between v1 and v2. -var vdist = cp.v.dist = function(v1, v2) -{ - return vlength(vsub(v1, v2)); -}; - -/// Returns the squared distance between v1 and v2. Faster than vdist() when you only need to compare distances. -var vdistsq = cp.v.distsq = function(v1, v2) -{ - return vlengthsq(vsub(v1, v2)); -}; - -/// Returns true if the distance between v1 and v2 is less than dist. -var vnear = cp.v.near = function(v1, v2, dist) -{ - return vdistsq(v1, v2) < dist*dist; -}; - -/// Spherical linearly interpolate between v1 and v2. -var vslerp = cp.v.slerp = function(v1, v2, t) -{ - var omega = Math.acos(vdot(v1, v2)); - - if(omega) { - var denom = 1/Math.sin(omega); - return vadd(vmult(v1, Math.sin((1 - t)*omega)*denom), vmult(v2, Math.sin(t*omega)*denom)); - } else { - return v1; - } -}; - -/// Spherical linearly interpolate between v1 towards v2 by no more than angle a radians -var vslerpconst = cp.v.slerpconst = function(v1, v2, a) -{ - var angle = Math.acos(vdot(v1, v2)); - return vslerp(v1, v2, min(a, angle)/angle); -}; - -/// Returns the unit length vector for the given angle (in radians). -var vforangle = cp.v.forangle = function(a) -{ - return new Vect(Math.cos(a), Math.sin(a)); -}; - -/// Returns the angular direction v is pointing in (in radians). -var vtoangle = cp.v.toangle = function(v) -{ - return Math.atan2(v.y, v.x); -}; - -/// Returns a string representation of v. Intended mostly for debugging purposes and not production use. -var vstr = cp.v.str = function(v) -{ - return "(" + v.x.toFixed(3) + ", " + v.y.toFixed(3) + ")"; -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -/// Chipmunk's axis-aligned 2D bounding box type along with a few handy routines. - -var numBB = 0; - -// Bounding boxes are JS objects with {l, b, r, t} = left, bottom, right, top, respectively. -var BB = cp.BB = function(l, b, r, t) -{ - this.l = l; - this.b = b; - this.r = r; - this.t = t; - - numBB++; -}; - -cp.bb = function(l, b, r, t) { return new BB(l, b, r, t); }; - -var bbNewForCircle = function(p, r) -{ - return new BB( - p.x - r, - p.y - r, - p.x + r, - p.y + r - ); -}; - -/// Returns true if @c a and @c b intersect. -var bbIntersects = function(a, b) -{ - return (a.l <= b.r && b.l <= a.r && a.b <= b.t && b.b <= a.t); -}; -var bbIntersects2 = function(bb, l, b, r, t) -{ - return (bb.l <= r && l <= bb.r && bb.b <= t && b <= bb.t); -}; - -/// Returns true if @c other lies completely within @c bb. -var bbContainsBB = function(bb, other) -{ - return (bb.l <= other.l && bb.r >= other.r && bb.b <= other.b && bb.t >= other.t); -}; - -/// Returns true if @c bb contains @c v. -var bbContainsVect = function(bb, v) -{ - return (bb.l <= v.x && bb.r >= v.x && bb.b <= v.y && bb.t >= v.y); -}; -var bbContainsVect2 = function(l, b, r, t, v) -{ - return (l <= v.x && r >= v.x && b <= v.y && t >= v.y); -}; - -/// Returns a bounding box that holds both bounding boxes. -var bbMerge = function(a, b){ - return new BB( - min(a.l, b.l), - min(a.b, b.b), - max(a.r, b.r), - max(a.t, b.t) - ); -}; - -/// Returns a bounding box that holds both @c bb and @c v. -var bbExpand = function(bb, v){ - return new BB( - min(bb.l, v.x), - min(bb.b, v.y), - max(bb.r, v.x), - max(bb.t, v.y) - ); -}; - -/// Returns the area of the bounding box. -var bbArea = function(bb) -{ - return (bb.r - bb.l)*(bb.t - bb.b); -}; - -/// Merges @c a and @c b and returns the area of the merged bounding box. -var bbMergedArea = function(a, b) -{ - return (max(a.r, b.r) - min(a.l, b.l))*(max(a.t, b.t) - min(a.b, b.b)); -}; - -var bbMergedArea2 = function(bb, l, b, r, t) -{ - return (max(bb.r, r) - min(bb.l, l))*(max(bb.t, t) - min(bb.b, b)); -}; - -/// Return true if the bounding box intersects the line segment with ends @c a and @c b. -var bbIntersectsSegment = function(bb, a, b) -{ - return (bbSegmentQuery(bb, a, b) != Infinity); -}; - -/// Clamp a vector to a bounding box. -var bbClampVect = function(bb, v) -{ - var x = min(max(bb.l, v.x), bb.r); - var y = min(max(bb.b, v.y), bb.t); - return new Vect(x, y); -}; - -// TODO edge case issue -/// Wrap a vector to a bounding box. -var bbWrapVect = function(bb, v) -{ - var ix = Math.abs(bb.r - bb.l); - var modx = (v.x - bb.l) % ix; - var x = (modx > 0) ? modx : modx + ix; - - var iy = Math.abs(bb.t - bb.b); - var mody = (v.y - bb.b) % iy; - var y = (mody > 0) ? mody : mody + iy; - - return new Vect(x + bb.l, y + bb.b); -}; -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -/// Segment query info struct. -/* These are created using literals where needed. -typedef struct cpSegmentQueryInfo { - /// The shape that was hit, null if no collision occured. - cpShape *shape; - /// The normalized distance along the query segment in the range [0, 1]. - cpFloat t; - /// The normal of the surface hit. - cpVect n; -} cpSegmentQueryInfo; -*/ - -var shapeIDCounter = 0; - -var CP_NO_GROUP = cp.NO_GROUP = 0; -var CP_ALL_LAYERS = cp.ALL_LAYERS = ~0; - -cp.resetShapeIdCounter = function() -{ - shapeIDCounter = 0; -}; - -/// The cpShape struct defines the shape of a rigid body. -// -/// Opaque collision shape struct. Do not create directly - instead use -/// PolyShape, CircleShape and SegmentShape. -var Shape = cp.Shape = function(body) { - /// The rigid body this collision shape is attached to. - this.body = body; - - /// The current bounding box of the shape. - this.bb_l = this.bb_b = this.bb_r = this.bb_t = 0; - - this.hashid = shapeIDCounter++; - - /// Sensor flag. - /// Sensor shapes call collision callbacks but don't produce collisions. - this.sensor = false; - - /// Coefficient of restitution. (elasticity) - this.e = 0; - /// Coefficient of friction. - this.u = 0; - /// Surface velocity used when solving for friction. - this.surface_v = vzero; - - /// Collision type of this shape used when picking collision handlers. - this.collision_type = 0; - /// Group of this shape. Shapes in the same group don't collide. - this.group = 0; - // Layer bitmask for this shape. Shapes only collide if the bitwise and of their layers is non-zero. - this.layers = CP_ALL_LAYERS; - - this.space = null; - - // Copy the collision code from the prototype into the actual object. This makes collision - // function lookups slightly faster. - this.collisionCode = this.collisionCode; -}; - -Shape.prototype.setElasticity = function(e) { this.e = e; }; -Shape.prototype.setFriction = function(u) { this.body.activate(); this.u = u; }; -Shape.prototype.setLayers = function(layers) { this.body.activate(); this.layers = layers; }; -Shape.prototype.setSensor = function(sensor) { this.body.activate(); this.sensor = sensor; }; -Shape.prototype.setCollisionType = function(collision_type) { this.body.activate(); this.collision_type = collision_type; }; -Shape.prototype.getBody = function() { return this.body; }; - -Shape.prototype.active = function() -{ -// return shape->prev || (shape->body && shape->body->shapeList == shape); - return this.body && this.body.shapeList.indexOf(this) !== -1; -}; - -Shape.prototype.setBody = function(body) -{ - assert(!this.active(), "You cannot change the body on an active shape. You must remove the shape from the space before changing the body."); - this.body = body; -}; - -Shape.prototype.cacheBB = function() -{ - return this.update(this.body.p, this.body.rot); -}; - -Shape.prototype.update = function(pos, rot) -{ - assert(!isNaN(rot.x), 'Rotation is NaN'); - assert(!isNaN(pos.x), 'Position is NaN'); - this.cacheData(pos, rot); -}; - -Shape.prototype.pointQuery = function(p) -{ - var info = this.nearestPointQuery(p); - if (info.d < 0) return info; -}; - -Shape.prototype.getBB = function() -{ - return new BB(this.bb_l, this.bb_b, this.bb_r, this.bb_t); -}; - -/* Not implemented - all these getters and setters. Just edit the object directly. -CP_DefineShapeStructGetter(cpBody*, body, Body); -void cpShapeSetBody(cpShape *shape, cpBody *body); - -CP_DefineShapeStructGetter(cpBB, bb, BB); -CP_DefineShapeStructProperty(cpBool, sensor, Sensor, cpTrue); -CP_DefineShapeStructProperty(cpFloat, e, Elasticity, cpFalse); -CP_DefineShapeStructProperty(cpFloat, u, Friction, cpTrue); -CP_DefineShapeStructProperty(cpVect, surface_v, SurfaceVelocity, cpTrue); -CP_DefineShapeStructProperty(cpDataPointer, data, UserData, cpFalse); -CP_DefineShapeStructProperty(cpCollisionType, collision_type, CollisionType, cpTrue); -CP_DefineShapeStructProperty(cpGroup, group, Group, cpTrue); -CP_DefineShapeStructProperty(cpLayers, layers, Layers, cpTrue); -*/ - -/// Extended point query info struct. Returned from calling pointQuery on a shape. -var PointQueryExtendedInfo = function(shape) -{ - /// Shape that was hit, NULL if no collision occurred. - this.shape = shape; - /// Depth of the point inside the shape. - this.d = Infinity; - /// Direction of minimum norm to the shape's surface. - this.n = vzero; -}; - -var NearestPointQueryInfo = function(shape, p, d) -{ - /// The nearest shape, NULL if no shape was within range. - this.shape = shape; - /// The closest point on the shape's surface. (in world space coordinates) - this.p = p; - /// The distance to the point. The distance is negative if the point is inside the shape. - this.d = d; -}; - -var SegmentQueryInfo = function(shape, t, n) -{ - /// The shape that was hit, NULL if no collision occured. - this.shape = shape; - /// The normalized distance along the query segment in the range [0, 1]. - this.t = t; - /// The normal of the surface hit. - this.n = n; -}; - -/// Get the hit point for a segment query. -SegmentQueryInfo.prototype.hitPoint = function(start, end) -{ - return vlerp(start, end, this.t); -}; - -/// Get the hit distance for a segment query. -SegmentQueryInfo.prototype.hitDist = function(start, end) -{ - return vdist(start, end) * this.t; -}; - -// Circles. - -var CircleShape = cp.CircleShape = function(body, radius, offset) -{ - this.c = this.tc = offset; - this.r = radius; - - this.type = 'circle'; - - Shape.call(this, body); -}; - -CircleShape.prototype = Object.create(Shape.prototype); - -CircleShape.prototype.cacheData = function(p, rot) -{ - //var c = this.tc = vadd(p, vrotate(this.c, rot)); - var c = this.tc = vrotate(this.c, rot).add(p); - //this.bb = bbNewForCircle(c, this.r); - var r = this.r; - this.bb_l = c.x - r; - this.bb_b = c.y - r; - this.bb_r = c.x + r; - this.bb_t = c.y + r; -}; - -/// Test if a point lies within a shape. -/*CircleShape.prototype.pointQuery = function(p) -{ - var delta = vsub(p, this.tc); - var distsq = vlengthsq(delta); - var r = this.r; - - if(distsq < r*r){ - var info = new PointQueryExtendedInfo(this); - - var dist = Math.sqrt(distsq); - info.d = r - dist; - info.n = vmult(delta, 1/dist); - return info; - } -};*/ - -CircleShape.prototype.nearestPointQuery = function(p) -{ - var deltax = p.x - this.tc.x; - var deltay = p.y - this.tc.y; - var d = vlength2(deltax, deltay); - var r = this.r; - - var nearestp = new Vect(this.tc.x + deltax * r/d, this.tc.y + deltay * r/d); - return new NearestPointQueryInfo(this, nearestp, d - r); -}; - -var circleSegmentQuery = function(shape, center, r, a, b, info) -{ - // offset the line to be relative to the circle - a = vsub(a, center); - b = vsub(b, center); - - var qa = vdot(a, a) - 2*vdot(a, b) + vdot(b, b); - var qb = -2*vdot(a, a) + 2*vdot(a, b); - var qc = vdot(a, a) - r*r; - - var det = qb*qb - 4*qa*qc; - - if(det >= 0) - { - var t = (-qb - Math.sqrt(det))/(2*qa); - if(0 <= t && t <= 1){ - return new SegmentQueryInfo(shape, t, vnormalize(vlerp(a, b, t))); - } - } -}; - -CircleShape.prototype.segmentQuery = function(a, b) -{ - return circleSegmentQuery(this, this.tc, this.r, a, b); -}; - -// The C API has these, and also getters. Its not idiomatic to -// write getters and setters in JS. -/* -CircleShape.prototype.setRadius = function(radius) -{ - this.r = radius; -} - -CircleShape.prototype.setOffset = function(offset) -{ - this.c = offset; -}*/ - -// Segment shape - -var SegmentShape = cp.SegmentShape = function(body, a, b, r) -{ - this.a = a; - this.b = b; - this.n = vperp(vnormalize(vsub(b, a))); - - this.ta = this.tb = this.tn = null; - - this.r = r; - - this.a_tangent = vzero; - this.b_tangent = vzero; - - this.type = 'segment'; - Shape.call(this, body); -}; - -SegmentShape.prototype = Object.create(Shape.prototype); - -SegmentShape.prototype.cacheData = function(p, rot) -{ - this.ta = vadd(p, vrotate(this.a, rot)); - this.tb = vadd(p, vrotate(this.b, rot)); - this.tn = vrotate(this.n, rot); - - var l,r,b,t; - - if(this.ta.x < this.tb.x){ - l = this.ta.x; - r = this.tb.x; - } else { - l = this.tb.x; - r = this.ta.x; - } - - if(this.ta.y < this.tb.y){ - b = this.ta.y; - t = this.tb.y; - } else { - b = this.tb.y; - t = this.ta.y; - } - - var rad = this.r; - - this.bb_l = l - rad; - this.bb_b = b - rad; - this.bb_r = r + rad; - this.bb_t = t + rad; -}; - -SegmentShape.prototype.nearestPointQuery = function(p) -{ - var closest = closestPointOnSegment(p, this.ta, this.tb); - - var deltax = p.x - closest.x; - var deltay = p.y - closest.y; - var d = vlength2(deltax, deltay); - var r = this.r; - - var nearestp = (d ? vadd(closest, vmult(new Vect(deltax, deltay), r/d)) : closest); - return new NearestPointQueryInfo(this, nearestp, d - r); -}; - -SegmentShape.prototype.segmentQuery = function(a, b) -{ - var n = this.tn; - var d = vdot(vsub(this.ta, a), n); - var r = this.r; - - var flipped_n = (d > 0 ? vneg(n) : n); - var n_offset = vsub(vmult(flipped_n, r), a); - - var seg_a = vadd(this.ta, n_offset); - var seg_b = vadd(this.tb, n_offset); - var delta = vsub(b, a); - - if(vcross(delta, seg_a)*vcross(delta, seg_b) <= 0){ - var d_offset = d + (d > 0 ? -r : r); - var ad = -d_offset; - var bd = vdot(delta, n) - d_offset; - - if(ad*bd < 0){ - return new SegmentQueryInfo(this, ad/(ad - bd), flipped_n); - } - } else if(r !== 0){ - var info1 = circleSegmentQuery(this, this.ta, this.r, a, b); - var info2 = circleSegmentQuery(this, this.tb, this.r, a, b); - - if (info1){ - return info2 && info2.t < info1.t ? info2 : info1; - } else { - return info2; - } - } -}; - -SegmentShape.prototype.setNeighbors = function(prev, next) -{ - this.a_tangent = vsub(prev, this.a); - this.b_tangent = vsub(next, this.b); -}; - -SegmentShape.prototype.setEndpoints = function(a, b) -{ - this.a = a; - this.b = b; - this.n = vperp(vnormalize(vsub(b, a))); -}; - -/* -cpSegmentShapeSetRadius(cpShape *shape, cpFloat radius) -{ - this.r = radius; -}*/ - -/* -CP_DeclareShapeGetter(cpSegmentShape, cpVect, A); -CP_DeclareShapeGetter(cpSegmentShape, cpVect, B); -CP_DeclareShapeGetter(cpSegmentShape, cpVect, Normal); -CP_DeclareShapeGetter(cpSegmentShape, cpFloat, Radius); -*/ - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -/// Check that a set of vertexes is convex and has a clockwise winding. -var polyValidate = function(verts) -{ - var len = verts.length; - for(var i=0; i 0){ - if(vcross2(bx - ax, by - ay, cx - bx, cy - by) > 0){ - return false; - } - } - - return true; -}; - -/// Initialize a polygon shape. -/// The vertexes must be convex and have a clockwise winding. -var PolyShape = cp.PolyShape = function(body, verts, offset) -{ - this.setVerts(verts, offset); - this.type = 'poly'; - Shape.call(this, body); -}; - -PolyShape.prototype = Object.create(Shape.prototype); - -var SplittingPlane = function(n, d) -{ - this.n = n; - this.d = d; -}; - -SplittingPlane.prototype.compare = function(v) -{ - return vdot(this.n, v) - this.d; -}; - -PolyShape.prototype.setVerts = function(verts, offset) -{ - assert(verts.length >= 4, "Polygons require some verts"); - assert(typeof(verts[0]) === 'number', - 'Polygon verticies should be specified in a flattened list (eg [x1,y1,x2,y2,x3,y3,...])'); - - // Fail if the user attempts to pass a concave poly, or a bad winding. - assert(polyValidate(verts), "Polygon is concave or has a reversed winding. Consider using cpConvexHull()"); - - var len = verts.length; - var numVerts = len >> 1; - - // This a pretty bad way to do this in javascript. As a first pass, I want to keep - // the code similar to the C. - this.verts = new Array(len); - this.tVerts = new Array(len); - this.planes = new Array(numVerts); - this.tPlanes = new Array(numVerts); - - for(var i=0; i>1] = new SplittingPlane(n, vdot2(n.x, n.y, ax, ay)); - this.tPlanes[i>>1] = new SplittingPlane(new Vect(0,0), 0); - } -}; - -/// Initialize a box shaped polygon shape. -var BoxShape = cp.BoxShape = function(body, width, height) -{ - var hw = width/2; - var hh = height/2; - - return BoxShape2(body, new BB(-hw, -hh, hw, hh)); -}; - -/// Initialize an offset box shaped polygon shape. -var BoxShape2 = cp.BoxShape2 = function(body, box) -{ - var verts = [ - box.l, box.b, - box.l, box.t, - box.r, box.t, - box.r, box.b - ]; - - return new PolyShape(body, verts, vzero); -}; - -PolyShape.prototype.transformVerts = function(p, rot) -{ - var src = this.verts; - var dst = this.tVerts; - - var l = Infinity, r = -Infinity; - var b = Infinity, t = -Infinity; - - for(var i=0; i (' + vx + ',' + vy + ')'); - - dst[i] = vx; - dst[i+1] = vy; - - l = min(l, vx); - r = max(r, vx); - b = min(b, vy); - t = max(t, vy); - } - - this.bb_l = l; - this.bb_b = b; - this.bb_r = r; - this.bb_t = t; -}; - -PolyShape.prototype.transformAxes = function(p, rot) -{ - var src = this.planes; - var dst = this.tPlanes; - - for(var i=0; i 0) outside = true; - - var v1x = verts[i*2]; - var v1y = verts[i*2 + 1]; - var closest = closestPointOnSegment2(p.x, p.y, v0x, v0y, v1x, v1y); - - var dist = vdist(p, closest); - if(dist < minDist){ - minDist = dist; - closestPoint = closest; - } - - v0x = v1x; - v0y = v1y; - } - - return new NearestPointQueryInfo(this, closestPoint, (outside ? minDist : -minDist)); -}; - -PolyShape.prototype.segmentQuery = function(a, b) -{ - var axes = this.tPlanes; - var verts = this.tVerts; - var numVerts = axes.length; - var len = numVerts * 2; - - for(var i=0; i an) continue; - - var bn = vdot(b, n); - var t = (axes[i].d - an)/(bn - an); - if(t < 0 || 1 < t) continue; - - var point = vlerp(a, b, t); - var dt = -vcross(n, point); - var dtMin = -vcross2(n.x, n.y, verts[i*2], verts[i*2+1]); - var dtMax = -vcross2(n.x, n.y, verts[(i*2+2)%len], verts[(i*2+3)%len]); - - if(dtMin <= dt && dt <= dtMax){ - // josephg: In the original C code, this function keeps - // looping through axes after finding a match. I *think* - // this code is equivalent... - return new SegmentQueryInfo(this, t, n); - } - } -}; - -PolyShape.prototype.valueOnAxis = function(n, d) -{ - var verts = this.tVerts; - var m = vdot2(n.x, n.y, verts[0], verts[1]); - - for(var i=2; i 0) return false; - } - - return true; -}; - -PolyShape.prototype.containsVertPartial = function(vx, vy, n) -{ - var planes = this.tPlanes; - - for(var i=0; i 0) return false; - } - - return true; -}; - -// These methods are provided for API compatibility with Chipmunk. I recommend against using -// them - just access the poly.verts list directly. -PolyShape.prototype.getNumVerts = function() { return this.verts.length / 2; }; -PolyShape.prototype.getVert = function(i) -{ - return new Vect(this.verts[i * 2], this.verts[i * 2 + 1]); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -/// @defgroup cpBody cpBody -/// Chipmunk's rigid body type. Rigid bodies hold the physical properties of an object like -/// it's mass, and position and velocity of it's center of gravity. They don't have an shape on their own. -/// They are given a shape by creating collision shapes (cpShape) that point to the body. -/// @{ - -var Body = cp.Body = function(m, i) { - /// Mass of the body. - /// Must agree with cpBody.m_inv! Use body.setMass() when changing the mass for this reason. - //this.m; - /// Mass inverse. - //this.m_inv; - - /// Moment of inertia of the body. - /// Must agree with cpBody.i_inv! Use body.setMoment() when changing the moment for this reason. - //this.i; - /// Moment of inertia inverse. - //this.i_inv; - - /// Position of the rigid body's center of gravity. - this.p = new Vect(0,0); - /// Velocity of the rigid body's center of gravity. - this.vx = this.vy = 0; - /// Force acting on the rigid body's center of gravity. - this.f = new Vect(0,0); - - /// Rotation of the body around it's center of gravity in radians. - /// Must agree with cpBody.rot! Use cpBodySetAngle() when changing the angle for this reason. - //this.a; - /// Angular velocity of the body around it's center of gravity in radians/second. - this.w = 0; - /// Torque applied to the body around it's center of gravity. - this.t = 0; - - /// Cached unit length vector representing the angle of the body. - /// Used for fast rotations using cpvrotate(). - //cpVect rot; - - /// Maximum velocity allowed when updating the velocity. - this.v_limit = Infinity; - /// Maximum rotational rate (in radians/second) allowed when updating the angular velocity. - this.w_limit = Infinity; - - // This stuff is all private. - this.v_biasx = this.v_biasy = 0; - this.w_bias = 0; - - this.space = null; - - this.shapeList = []; - this.arbiterList = null; // These are both wacky linked lists. - this.constraintList = null; - - // This stuff is used to track information on the collision graph. - this.nodeRoot = null; - this.nodeNext = null; - this.nodeIdleTime = 0; - - // Set this.m and this.m_inv - this.setMass(m); - - // Set this.i and this.i_inv - this.setMoment(i); - - // Set this.a and this.rot - this.rot = new Vect(0,0); - this.setAngle(0); -}; - -// I wonder if this should use the constructor style like Body... -var createStaticBody = function() -{ - var body = new Body(Infinity, Infinity); - body.nodeIdleTime = Infinity; - - return body; -}; - cp.StaticBody = createStaticBody; - -if (typeof DEBUG !== 'undefined' && DEBUG) { - var v_assert_nan = function(v, message){assert(v.x == v.x && v.y == v.y, message); }; - var v_assert_infinite = function(v, message){assert(Math.abs(v.x) !== Infinity && Math.abs(v.y) !== Infinity, message);}; - var v_assert_sane = function(v, message){v_assert_nan(v, message); v_assert_infinite(v, message);}; - - Body.prototype.sanityCheck = function() - { - assert(this.m === this.m && this.m_inv === this.m_inv, "Body's mass is invalid."); - assert(this.i === this.i && this.i_inv === this.i_inv, "Body's moment is invalid."); - - v_assert_sane(this.p, "Body's position is invalid."); - v_assert_sane(this.f, "Body's force is invalid."); - assert(this.vx === this.vx && Math.abs(this.vx) !== Infinity, "Body's velocity is invalid."); - assert(this.vy === this.vy && Math.abs(this.vy) !== Infinity, "Body's velocity is invalid."); - - assert(this.a === this.a && Math.abs(this.a) !== Infinity, "Body's angle is invalid."); - assert(this.w === this.w && Math.abs(this.w) !== Infinity, "Body's angular velocity is invalid."); - assert(this.t === this.t && Math.abs(this.t) !== Infinity, "Body's torque is invalid."); - - v_assert_sane(this.rot, "Body's rotation vector is invalid."); - - assert(this.v_limit === this.v_limit, "Body's velocity limit is invalid."); - assert(this.w_limit === this.w_limit, "Body's angular velocity limit is invalid."); - }; -} else { - Body.prototype.sanityCheck = function(){}; -} - -Body.prototype.getPos = function() { return this.p; }; -Body.prototype.getVel = function() { return new Vect(this.vx, this.vy); }; -Body.prototype.getAngVel = function() { return this.w; }; - -/// Returns true if the body is sleeping. -Body.prototype.isSleeping = function() -{ - return this.nodeRoot !== null; -}; - -/// Returns true if the body is static. -Body.prototype.isStatic = function() -{ - return this.nodeIdleTime === Infinity; -}; - -/// Returns true if the body has not been added to a space. -Body.prototype.isRogue = function() -{ - return this.space === null; -}; - -// It would be nicer to use defineProperty for this, but its about 30x slower: -// http://jsperf.com/defineproperty-vs-setter -Body.prototype.setMass = function(mass) -{ - assert(mass > 0, "Mass must be positive and non-zero."); - - //activate is defined in cpSpaceComponent - this.activate(); - this.m = mass; - this.m_inv = 1/mass; -}; - -Body.prototype.setMoment = function(moment) -{ - assert(moment > 0, "Moment of Inertia must be positive and non-zero."); - - this.activate(); - this.i = moment; - this.i_inv = 1/moment; -}; - -Body.prototype.addShape = function(shape) -{ - this.shapeList.push(shape); -}; - -Body.prototype.removeShape = function(shape) -{ - // This implementation has a linear time complexity with the number of shapes. - // The original implementation used linked lists instead, which might be faster if - // you're constantly editing the shape of a body. I expect most bodies will never - // have their shape edited, so I'm just going to use the simplest possible implemention. - deleteObjFromList(this.shapeList, shape); -}; - -var filterConstraints = function(node, body, filter) -{ - if(node === filter){ - return node.next(body); - } else if(node.a === body){ - node.next_a = filterConstraints(node.next_a, body, filter); - } else { - node.next_b = filterConstraints(node.next_b, body, filter); - } - - return node; -}; - -Body.prototype.removeConstraint = function(constraint) -{ - // The constraint must be in the constraints list when this is called. - this.constraintList = filterConstraints(this.constraintList, this, constraint); -}; - -Body.prototype.setPos = function(pos) -{ - this.activate(); - this.sanityCheck(); - // If I allow the position to be set to vzero, vzero will get changed. - if (pos === vzero) { - pos = cp.v(0,0); - } - this.p = pos; -}; - -Body.prototype.setVel = function(velocity) -{ - this.activate(); - this.vx = velocity.x; - this.vy = velocity.y; -}; - -Body.prototype.setAngVel = function(w) -{ - this.activate(); - this.w = w; -}; - -Body.prototype.setAngleInternal = function(angle) -{ - assert(!isNaN(angle), "Internal Error: Attempting to set body's angle to NaN"); - this.a = angle;//fmod(a, (cpFloat)M_PI*2.0f); - - //this.rot = vforangle(angle); - this.rot.x = Math.cos(angle); - this.rot.y = Math.sin(angle); -}; - -Body.prototype.setAngle = function(angle) -{ - this.activate(); - this.sanityCheck(); - this.setAngleInternal(angle); -}; - -Body.prototype.velocity_func = function(gravity, damping, dt) -{ - //this.v = vclamp(vadd(vmult(this.v, damping), vmult(vadd(gravity, vmult(this.f, this.m_inv)), dt)), this.v_limit); - var vx = this.vx * damping + (gravity.x + this.f.x * this.m_inv) * dt; - var vy = this.vy * damping + (gravity.y + this.f.y * this.m_inv) * dt; - - //var v = vclamp(new Vect(vx, vy), this.v_limit); - //this.vx = v.x; this.vy = v.y; - var v_limit = this.v_limit; - var lensq = vx * vx + vy * vy; - var scale = (lensq > v_limit*v_limit) ? v_limit / Math.sqrt(lensq) : 1; - this.vx = vx * scale; - this.vy = vy * scale; - - var w_limit = this.w_limit; - this.w = clamp(this.w*damping + this.t*this.i_inv*dt, -w_limit, w_limit); - - this.sanityCheck(); -}; - -Body.prototype.position_func = function(dt) -{ - //this.p = vadd(this.p, vmult(vadd(this.v, this.v_bias), dt)); - - //this.p = this.p + (this.v + this.v_bias) * dt; - this.p.x += (this.vx + this.v_biasx) * dt; - this.p.y += (this.vy + this.v_biasy) * dt; - - this.setAngleInternal(this.a + (this.w + this.w_bias)*dt); - - this.v_biasx = this.v_biasy = 0; - this.w_bias = 0; - - this.sanityCheck(); -}; - -Body.prototype.resetForces = function() -{ - this.activate(); - this.f = new Vect(0,0); - this.t = 0; -}; - -Body.prototype.applyForce = function(force, r) -{ - this.activate(); - this.f = vadd(this.f, force); - this.t += vcross(r, force); -}; - -Body.prototype.applyImpulse = function(j, r) -{ - this.activate(); - apply_impulse(this, j.x, j.y, r); -}; - -Body.prototype.getVelAtPoint = function(r) -{ - return vadd(new Vect(this.vx, this.vy), vmult(vperp(r), this.w)); -}; - -/// Get the velocity on a body (in world units) at a point on the body in world coordinates. -Body.prototype.getVelAtWorldPoint = function(point) -{ - return this.getVelAtPoint(vsub(point, this.p)); -}; - -/// Get the velocity on a body (in world units) at a point on the body in local coordinates. -Body.prototype.getVelAtLocalPoint = function(point) -{ - return this.getVelAtPoint(vrotate(point, this.rot)); -}; - -Body.prototype.eachShape = function(func) -{ - for(var i = 0, len = this.shapeList.length; i < len; i++) { - func(this.shapeList[i]); - } -}; - -Body.prototype.eachConstraint = function(func) -{ - var constraint = this.constraintList; - while(constraint) { - var next = constraint.next(this); - func(constraint); - constraint = next; - } -}; - -Body.prototype.eachArbiter = function(func) -{ - var arb = this.arbiterList; - while(arb){ - var next = arb.next(this); - - arb.swappedColl = (this === arb.body_b); - func(arb); - - arb = next; - } -}; - -/// Convert body relative/local coordinates to absolute/world coordinates. -Body.prototype.local2World = function(v) -{ - return vadd(this.p, vrotate(v, this.rot)); -}; - -/// Convert body absolute/world coordinates to relative/local coordinates. -Body.prototype.world2Local = function(v) -{ - return vunrotate(vsub(v, this.p), this.rot); -}; - -/// Get the kinetic energy of a body. -Body.prototype.kineticEnergy = function() -{ - // Need to do some fudging to avoid NaNs - var vsq = this.vx*this.vx + this.vy*this.vy; - var wsq = this.w * this.w; - return (vsq ? vsq*this.m : 0) + (wsq ? wsq*this.i : 0); -}; - -/* Copyright (c) 2010 Scott Lembcke - * - * 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. - */ - -/** - @defgroup cpSpatialIndex cpSpatialIndex - - Spatial indexes are data structures that are used to accelerate collision detection - and spatial queries. Chipmunk provides a number of spatial index algorithms to pick from - and they are programmed in a generic way so that you can use them for holding more than - just Shapes. - - It works by using pointers to the objects you add and using a callback to ask your code - for bounding boxes when it needs them. Several types of queries can be performed an index as well - as reindexing and full collision information. All communication to the spatial indexes is performed - through callback functions. - - Spatial indexes should be treated as opaque structs. - This means you shouldn't be reading any of the fields directly. - - All spatial indexes define the following methods: - - // The number of objects in the spatial index. - count = 0; - - // Iterate the objects in the spatial index. @c func will be called once for each object. - each(func); - - // Returns true if the spatial index contains the given object. - // Most spatial indexes use hashed storage, so you must provide a hash value too. - contains(obj, hashid); - - // Add an object to a spatial index. - insert(obj, hashid); - - // Remove an object from a spatial index. - remove(obj, hashid); - - // Perform a full reindex of a spatial index. - reindex(); - - // Reindex a single object in the spatial index. - reindexObject(obj, hashid); - - // Perform a point query against the spatial index, calling @c func for each potential match. - // A pointer to the point will be passed as @c obj1 of @c func. - // func(shape); - pointQuery(point, func); - - // Perform a segment query against the spatial index, calling @c func for each potential match. - // func(shape); - segmentQuery(vect a, vect b, t_exit, func); - - // Perform a rectangle query against the spatial index, calling @c func for each potential match. - // func(shape); - query(bb, func); - - // Simultaneously reindex and find all colliding objects. - // @c func will be called once for each potentially overlapping pair of objects found. - // If the spatial index was initialized with a static index, it will collide it's objects against that as well. - reindexQuery(func); -*/ - -var SpatialIndex = cp.SpatialIndex = function(staticIndex) -{ - this.staticIndex = staticIndex; - - - if(staticIndex){ - if(staticIndex.dynamicIndex){ - throw new Error("This static index is already associated with a dynamic index."); - } - staticIndex.dynamicIndex = this; - } -}; - -// Collide the objects in an index against the objects in a staticIndex using the query callback function. -SpatialIndex.prototype.collideStatic = function(staticIndex, func) -{ - if(staticIndex.count > 0){ - var query = staticIndex.query; - - this.each(function(obj) { - query(obj, new BB(obj.bb_l, obj.bb_b, obj.bb_r, obj.bb_t), func); - }); - } -}; - - -/* Copyright (c) 2009 Scott Lembcke - * - * 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. - */ - -// This file implements a modified AABB tree for collision detection. - -var BBTree = cp.BBTree = function(staticIndex) -{ - SpatialIndex.call(this, staticIndex); - - this.velocityFunc = null; - - // This is a hash from object ID -> object for the objects stored in the BBTree. - this.leaves = {}; - // A count of the number of leaves in the BBTree. - this.count = 0; - - this.root = null; - - // A linked list containing an object pool of tree nodes and pairs. - this.pooledNodes = null; - this.pooledPairs = null; - - this.stamp = 0; -}; - -BBTree.prototype = Object.create(SpatialIndex.prototype); - -var numNodes = 0; - -var Node = function(tree, a, b) -{ - this.obj = null; - this.bb_l = min(a.bb_l, b.bb_l); - this.bb_b = min(a.bb_b, b.bb_b); - this.bb_r = max(a.bb_r, b.bb_r); - this.bb_t = max(a.bb_t, b.bb_t); - this.parent = null; - - this.setA(a); - this.setB(b); -}; - -BBTree.prototype.makeNode = function(a, b) -{ - var node = this.pooledNodes; - if(node){ - this.pooledNodes = node.parent; - node.constructor(this, a, b); - return node; - } else { - numNodes++; - return new Node(this, a, b); - } -}; - -var numLeaves = 0; -var Leaf = function(tree, obj) -{ - this.obj = obj; - tree.getBB(obj, this); - - this.parent = null; - - this.stamp = 1; - this.pairs = null; - numLeaves++; -}; - -// **** Misc Functions - -BBTree.prototype.getBB = function(obj, dest) -{ - var velocityFunc = this.velocityFunc; - if(velocityFunc){ - var coef = 0.1; - var x = (obj.bb_r - obj.bb_l)*coef; - var y = (obj.bb_t - obj.bb_b)*coef; - - var v = vmult(velocityFunc(obj), 0.1); - - dest.bb_l = obj.bb_l + min(-x, v.x); - dest.bb_b = obj.bb_b + min(-y, v.y); - dest.bb_r = obj.bb_r + max( x, v.x); - dest.bb_t = obj.bb_t + max( y, v.y); - } else { - dest.bb_l = obj.bb_l; - dest.bb_b = obj.bb_b; - dest.bb_r = obj.bb_r; - dest.bb_t = obj.bb_t; - } -}; - -BBTree.prototype.getStamp = function() -{ - var dynamic = this.dynamicIndex; - return (dynamic && dynamic.stamp ? dynamic.stamp : this.stamp); -}; - -BBTree.prototype.incrementStamp = function() -{ - if(this.dynamicIndex && this.dynamicIndex.stamp){ - this.dynamicIndex.stamp++; - } else { - this.stamp++; - } -} - -// **** Pair/Thread Functions - -var numPairs = 0; -// Objects created with constructors are faster than object literals. :( -var Pair = function(leafA, nextA, leafB, nextB) -{ - this.prevA = null; - this.leafA = leafA; - this.nextA = nextA; - - this.prevB = null; - this.leafB = leafB; - this.nextB = nextB; -}; - -BBTree.prototype.makePair = function(leafA, nextA, leafB, nextB) -{ - //return new Pair(leafA, nextA, leafB, nextB); - var pair = this.pooledPairs; - if (pair) - { - this.pooledPairs = pair.prevA; - - pair.prevA = null; - pair.leafA = leafA; - pair.nextA = nextA; - - pair.prevB = null; - pair.leafB = leafB; - pair.nextB = nextB; - - //pair.constructor(leafA, nextA, leafB, nextB); - return pair; - } else { - numPairs++; - return new Pair(leafA, nextA, leafB, nextB); - } -}; - -Pair.prototype.recycle = function(tree) -{ - this.prevA = tree.pooledPairs; - tree.pooledPairs = this; -}; - -var unlinkThread = function(prev, leaf, next) -{ - if(next){ - if(next.leafA === leaf) next.prevA = prev; else next.prevB = prev; - } - - if(prev){ - if(prev.leafA === leaf) prev.nextA = next; else prev.nextB = next; - } else { - leaf.pairs = next; - } -}; - -Leaf.prototype.clearPairs = function(tree) -{ - var pair = this.pairs, - next; - - this.pairs = null; - - while(pair){ - if(pair.leafA === this){ - next = pair.nextA; - unlinkThread(pair.prevB, pair.leafB, pair.nextB); - } else { - next = pair.nextB; - unlinkThread(pair.prevA, pair.leafA, pair.nextA); - } - pair.recycle(tree); - pair = next; - } -}; - -var pairInsert = function(a, b, tree) -{ - var nextA = a.pairs, nextB = b.pairs; - var pair = tree.makePair(a, nextA, b, nextB); - a.pairs = b.pairs = pair; - - if(nextA){ - if(nextA.leafA === a) nextA.prevA = pair; else nextA.prevB = pair; - } - - if(nextB){ - if(nextB.leafA === b) nextB.prevA = pair; else nextB.prevB = pair; - } -}; - -// **** Node Functions - -Node.prototype.recycle = function(tree) -{ - this.parent = tree.pooledNodes; - tree.pooledNodes = this; -}; - -Leaf.prototype.recycle = function(tree) -{ - // Its not worth the overhead to recycle leaves. -}; - -Node.prototype.setA = function(value) -{ - this.A = value; - value.parent = this; -}; - -Node.prototype.setB = function(value) -{ - this.B = value; - value.parent = this; -}; - -Leaf.prototype.isLeaf = true; -Node.prototype.isLeaf = false; - -Node.prototype.otherChild = function(child) -{ - return (this.A == child ? this.B : this.A); -}; - -Node.prototype.replaceChild = function(child, value, tree) -{ - assertSoft(child == this.A || child == this.B, "Node is not a child of parent."); - - if(this.A == child){ - this.A.recycle(tree); - this.setA(value); - } else { - this.B.recycle(tree); - this.setB(value); - } - - for(var node=this; node; node = node.parent){ - //node.bb = bbMerge(node.A.bb, node.B.bb); - var a = node.A; - var b = node.B; - node.bb_l = min(a.bb_l, b.bb_l); - node.bb_b = min(a.bb_b, b.bb_b); - node.bb_r = max(a.bb_r, b.bb_r); - node.bb_t = max(a.bb_t, b.bb_t); - } -}; - -Node.prototype.bbArea = Leaf.prototype.bbArea = function() -{ - return (this.bb_r - this.bb_l)*(this.bb_t - this.bb_b); -}; - -var bbTreeMergedArea = function(a, b) -{ - return (max(a.bb_r, b.bb_r) - min(a.bb_l, b.bb_l))*(max(a.bb_t, b.bb_t) - min(a.bb_b, b.bb_b)); -}; - -// **** Subtree Functions - -// Would it be better to make these functions instance methods on Node and Leaf? - -var bbProximity = function(a, b) -{ - return Math.abs(a.bb_l + a.bb_r - b.bb_l - b.bb_r) + Math.abs(a.bb_b + a.bb_t - b.bb_b - b.bb_t); -}; - -var subtreeInsert = function(subtree, leaf, tree) -{ -// var s = new Error().stack; -// traces[s] = traces[s] ? traces[s]+1 : 1; - - if(subtree == null){ - return leaf; - } else if(subtree.isLeaf){ - return tree.makeNode(leaf, subtree); - } else { - var cost_a = subtree.B.bbArea() + bbTreeMergedArea(subtree.A, leaf); - var cost_b = subtree.A.bbArea() + bbTreeMergedArea(subtree.B, leaf); - - if(cost_a === cost_b){ - cost_a = bbProximity(subtree.A, leaf); - cost_b = bbProximity(subtree.B, leaf); - } - - if(cost_b < cost_a){ - subtree.setB(subtreeInsert(subtree.B, leaf, tree)); - } else { - subtree.setA(subtreeInsert(subtree.A, leaf, tree)); - } - -// subtree.bb = bbMerge(subtree.bb, leaf.bb); - subtree.bb_l = min(subtree.bb_l, leaf.bb_l); - subtree.bb_b = min(subtree.bb_b, leaf.bb_b); - subtree.bb_r = max(subtree.bb_r, leaf.bb_r); - subtree.bb_t = max(subtree.bb_t, leaf.bb_t); - - return subtree; - } -}; - -Node.prototype.intersectsBB = Leaf.prototype.intersectsBB = function(bb) -{ - return (this.bb_l <= bb.r && bb.l <= this.bb_r && this.bb_b <= bb.t && bb.b <= this.bb_t); -}; - -var subtreeQuery = function(subtree, bb, func) -{ - //if(bbIntersectsBB(subtree.bb, bb)){ - if(subtree.intersectsBB(bb)){ - if(subtree.isLeaf){ - func(subtree.obj); - } else { - subtreeQuery(subtree.A, bb, func); - subtreeQuery(subtree.B, bb, func); - } - } -}; - -/// Returns the fraction along the segment query the node hits. Returns Infinity if it doesn't hit. -var nodeSegmentQuery = function(node, a, b) -{ - var idx = 1/(b.x - a.x); - var tx1 = (node.bb_l == a.x ? -Infinity : (node.bb_l - a.x)*idx); - var tx2 = (node.bb_r == a.x ? Infinity : (node.bb_r - a.x)*idx); - var txmin = min(tx1, tx2); - var txmax = max(tx1, tx2); - - var idy = 1/(b.y - a.y); - var ty1 = (node.bb_b == a.y ? -Infinity : (node.bb_b - a.y)*idy); - var ty2 = (node.bb_t == a.y ? Infinity : (node.bb_t - a.y)*idy); - var tymin = min(ty1, ty2); - var tymax = max(ty1, ty2); - - if(tymin <= txmax && txmin <= tymax){ - var min_ = max(txmin, tymin); - var max_ = min(txmax, tymax); - - if(0.0 <= max_ && min_ <= 1.0) return max(min_, 0.0); - } - - return Infinity; -}; - -var subtreeSegmentQuery = function(subtree, a, b, t_exit, func) -{ - if(subtree.isLeaf){ - return func(subtree.obj); - } else { - var t_a = nodeSegmentQuery(subtree.A, a, b); - var t_b = nodeSegmentQuery(subtree.B, a, b); - - if(t_a < t_b){ - if(t_a < t_exit) t_exit = min(t_exit, subtreeSegmentQuery(subtree.A, a, b, t_exit, func)); - if(t_b < t_exit) t_exit = min(t_exit, subtreeSegmentQuery(subtree.B, a, b, t_exit, func)); - } else { - if(t_b < t_exit) t_exit = min(t_exit, subtreeSegmentQuery(subtree.B, a, b, t_exit, func)); - if(t_a < t_exit) t_exit = min(t_exit, subtreeSegmentQuery(subtree.A, a, b, t_exit, func)); - } - - return t_exit; - } -}; - -BBTree.prototype.subtreeRecycle = function(node) -{ - if(node.isLeaf){ - this.subtreeRecycle(node.A); - this.subtreeRecycle(node.B); - node.recycle(this); - } -}; - -var subtreeRemove = function(subtree, leaf, tree) -{ - if(leaf == subtree){ - return null; - } else { - var parent = leaf.parent; - if(parent == subtree){ - var other = subtree.otherChild(leaf); - other.parent = subtree.parent; - subtree.recycle(tree); - return other; - } else { - parent.parent.replaceChild(parent, parent.otherChild(leaf), tree); - return subtree; - } - } -}; - -// **** Marking Functions - -/* -typedef struct MarkContext { - bbTree *tree; - Node *staticRoot; - cpSpatialIndexQueryFunc func; -} MarkContext; -*/ - -var bbTreeIntersectsNode = function(a, b) -{ - return (a.bb_l <= b.bb_r && b.bb_l <= a.bb_r && a.bb_b <= b.bb_t && b.bb_b <= a.bb_t); -}; - -Leaf.prototype.markLeafQuery = function(leaf, left, tree, func) -{ - if(bbTreeIntersectsNode(leaf, this)){ - if(left){ - pairInsert(leaf, this, tree); - } else { - if(this.stamp < leaf.stamp) pairInsert(this, leaf, tree); - if(func) func(leaf.obj, this.obj); - } - } -}; - -Node.prototype.markLeafQuery = function(leaf, left, tree, func) -{ - if(bbTreeIntersectsNode(leaf, this)){ - this.A.markLeafQuery(leaf, left, tree, func); - this.B.markLeafQuery(leaf, left, tree, func); - } -}; - -Leaf.prototype.markSubtree = function(tree, staticRoot, func) -{ - if(this.stamp == tree.getStamp()){ - if(staticRoot) staticRoot.markLeafQuery(this, false, tree, func); - - for(var node = this; node.parent; node = node.parent){ - if(node == node.parent.A){ - node.parent.B.markLeafQuery(this, true, tree, func); - } else { - node.parent.A.markLeafQuery(this, false, tree, func); - } - } - } else { - var pair = this.pairs; - while(pair){ - if(this === pair.leafB){ - if(func) func(pair.leafA.obj, this.obj); - pair = pair.nextB; - } else { - pair = pair.nextA; - } - } - } -}; - -Node.prototype.markSubtree = function(tree, staticRoot, func) -{ - this.A.markSubtree(tree, staticRoot, func); - this.B.markSubtree(tree, staticRoot, func); -}; - -// **** Leaf Functions - -Leaf.prototype.containsObj = function(obj) -{ - return (this.bb_l <= obj.bb_l && this.bb_r >= obj.bb_r && this.bb_b <= obj.bb_b && this.bb_t >= obj.bb_t); -}; - -Leaf.prototype.update = function(tree) -{ - var root = tree.root; - var obj = this.obj; - - //if(!bbContainsBB(this.bb, bb)){ - if(!this.containsObj(obj)){ - tree.getBB(this.obj, this); - - root = subtreeRemove(root, this, tree); - tree.root = subtreeInsert(root, this, tree); - - this.clearPairs(tree); - this.stamp = tree.getStamp(); - - return true; - } - - return false; -}; - -Leaf.prototype.addPairs = function(tree) -{ - var dynamicIndex = tree.dynamicIndex; - if(dynamicIndex){ - var dynamicRoot = dynamicIndex.root; - if(dynamicRoot){ - dynamicRoot.markLeafQuery(this, true, dynamicIndex, null); - } - } else { - var staticRoot = tree.staticIndex.root; - this.markSubtree(tree, staticRoot, null); - } -}; - -// **** Insert/Remove - -BBTree.prototype.insert = function(obj, hashid) -{ - var leaf = new Leaf(this, obj); - - this.leaves[hashid] = leaf; - this.root = subtreeInsert(this.root, leaf, this); - this.count++; - - leaf.stamp = this.getStamp(); - leaf.addPairs(this); - this.incrementStamp(); -}; - -BBTree.prototype.remove = function(obj, hashid) -{ - var leaf = this.leaves[hashid]; - - delete this.leaves[hashid]; - this.root = subtreeRemove(this.root, leaf, this); - this.count--; - - leaf.clearPairs(this); - leaf.recycle(this); -}; - -BBTree.prototype.contains = function(obj, hashid) -{ - return this.leaves[hashid] != null; -}; - -// **** Reindex -var voidQueryFunc = function(obj1, obj2){}; - -BBTree.prototype.reindexQuery = function(func) -{ - if(!this.root) return; - - // LeafUpdate() may modify this.root. Don't cache it. - var hashid, - leaves = this.leaves; - for (hashid in leaves) - { - leaves[hashid].update(this); - } - - var staticIndex = this.staticIndex; - var staticRoot = staticIndex && staticIndex.root; - - this.root.markSubtree(this, staticRoot, func); - if(staticIndex && !staticRoot) this.collideStatic(this, staticIndex, func); - - this.incrementStamp(); -}; - -BBTree.prototype.reindex = function() -{ - this.reindexQuery(voidQueryFunc); -}; - -BBTree.prototype.reindexObject = function(obj, hashid) -{ - var leaf = this.leaves[hashid]; - if(leaf){ - if(leaf.update(this)) leaf.addPairs(this); - this.incrementStamp(); - } -}; - -// **** Query - -// This has since been removed from upstream Chipmunk - which recommends you just use query() below -// directly. -BBTree.prototype.pointQuery = function(point, func) -{ - this.query(new BB(point.x, point.y, point.x, point.y), func); -}; - -BBTree.prototype.segmentQuery = function(a, b, t_exit, func) -{ - if(this.root) subtreeSegmentQuery(this.root, a, b, t_exit, func); -}; - -BBTree.prototype.query = function(bb, func) -{ - if(this.root) subtreeQuery(this.root, bb, func); -}; - -// **** Misc - -BBTree.prototype.count = function() -{ - return this.count; -}; - -BBTree.prototype.each = function(func) -{ - var hashid; - for(hashid in this.leaves) - { - func(this.leaves[hashid].obj); - } -}; - -// **** Tree Optimization - -var bbTreeMergedArea2 = function(node, l, b, r, t) -{ - return (max(node.bb_r, r) - min(node.bb_l, l))*(max(node.bb_t, t) - min(node.bb_b, b)); -}; - -var partitionNodes = function(tree, nodes, offset, count) -{ - if(count == 1){ - return nodes[offset]; - } else if(count == 2) { - return tree.makeNode(nodes[offset], nodes[offset + 1]); - } - - // Find the AABB for these nodes - //var bb = nodes[offset].bb; - var node = nodes[offset]; - var bb_l = node.bb_l, - bb_b = node.bb_b, - bb_r = node.bb_r, - bb_t = node.bb_t; - - var end = offset + count; - for(var i=offset + 1; i bb_t - bb_b); - - // Sort the bounds and use the median as the splitting point - var bounds = new Array(count*2); - if(splitWidth){ - for(var i=offset; inext = next; - if(prev.body_a === body) { - prev.thread_a_next = next; - } else { - prev.thread_b_next = next; - } - } else { - body.arbiterList = next; - } - - if(next){ - // cpArbiterThreadForBody(next, body)->prev = prev; - if(next.body_a === body){ - next.thread_a_prev = prev; - } else { - next.thread_b_prev = prev; - } - } -}; - -Arbiter.prototype.unthread = function() -{ - unthreadHelper(this, this.body_a, this.thread_a_prev, this.thread_a_next); - unthreadHelper(this, this.body_b, this.thread_b_prev, this.thread_b_next); - this.thread_a_prev = this.thread_a_next = null; - this.thread_b_prev = this.thread_b_next = null; -}; - -//cpFloat -//cpContactsEstimateCrushingImpulse(cpContact *contacts, int numContacts) -//{ -// cpFloat fsum = 0; -// cpVect vsum = vzero; -// -// for(int i=0; i= mindist*mindist) return; - - var dist = Math.sqrt(distsq); - - // Allocate and initialize the contact. - return new Contact( - vadd(p1, vmult(delta, 0.5 + (r1 - 0.5*mindist)/(dist ? dist : Infinity))), - (dist ? vmult(delta, 1/dist) : new Vect(1, 0)), - dist - mindist, - 0 - ); -}; - -// Collide circle shapes. -var circle2circle = function(circ1, circ2) -{ - var contact = circle2circleQuery(circ1.tc, circ2.tc, circ1.r, circ2.r); - return contact ? [contact] : NONE; -}; - -var circle2segment = function(circleShape, segmentShape) -{ - var seg_a = segmentShape.ta; - var seg_b = segmentShape.tb; - var center = circleShape.tc; - - var seg_delta = vsub(seg_b, seg_a); - var closest_t = clamp01(vdot(seg_delta, vsub(center, seg_a))/vlengthsq(seg_delta)); - var closest = vadd(seg_a, vmult(seg_delta, closest_t)); - - var contact = circle2circleQuery(center, closest, circleShape.r, segmentShape.r); - if(contact){ - var n = contact.n; - - // Reject endcap collisions if tangents are provided. - return ( - (closest_t === 0 && vdot(n, segmentShape.a_tangent) < 0) || - (closest_t === 1 && vdot(n, segmentShape.b_tangent) < 0) - ) ? NONE : [contact]; - } else { - return NONE; - } -} - -// Find the minimum separating axis for the given poly and axis list. -// -// This function needs to return two values - the index of the min. separating axis and -// the value itself. Short of inlining MSA, returning values through a global like this -// is the fastest implementation. -// -// See: http://jsperf.com/return-two-values-from-function/2 -var last_MSA_min = 0; -var findMSA = function(poly, planes) -{ - var min_index = 0; - var min = poly.valueOnAxis(planes[0].n, planes[0].d); - if(min > 0) return -1; - - for(var i=1; i 0) { - return -1; - } else if(dist > min){ - min = dist; - min_index = i; - } - } - - last_MSA_min = min; - return min_index; -}; - -// Add contacts for probably penetrating vertexes. -// This handles the degenerate case where an overlap was detected, but no vertexes fall inside -// the opposing polygon. (like a star of david) -var findVertsFallback = function(poly1, poly2, n, dist) -{ - var arr = []; - - var verts1 = poly1.tVerts; - for(var i=0; i>1))); - } - } - - var verts2 = poly2.tVerts; - for(var i=0; i>1))); - } - } - - return (arr.length ? arr : findVertsFallback(poly1, poly2, n, dist)); -}; - -// Collide poly shapes together. -var poly2poly = function(poly1, poly2) -{ - var mini1 = findMSA(poly2, poly1.tPlanes); - if(mini1 == -1) return NONE; - var min1 = last_MSA_min; - - var mini2 = findMSA(poly1, poly2.tPlanes); - if(mini2 == -1) return NONE; - var min2 = last_MSA_min; - - // There is overlap, find the penetrating verts - if(min1 > min2) - return findVerts(poly1, poly2, poly1.tPlanes[mini1].n, min1); - else - return findVerts(poly1, poly2, vneg(poly2.tPlanes[mini2].n), min2); -}; - -// Like cpPolyValueOnAxis(), but for segments. -var segValueOnAxis = function(seg, n, d) -{ - var a = vdot(n, seg.ta) - seg.r; - var b = vdot(n, seg.tb) - seg.r; - return min(a, b) - d; -}; - -// Identify vertexes that have penetrated the segment. -var findPointsBehindSeg = function(arr, seg, poly, pDist, coef) -{ - var dta = vcross(seg.tn, seg.ta); - var dtb = vcross(seg.tn, seg.tb); - var n = vmult(seg.tn, coef); - - var verts = poly.tVerts; - for(var i=0; i= dt && dt >= dtb){ - arr.push(new Contact(new Vect(vx, vy), n, pDist, hashPair(poly.hashid, i))); - } - } - } -}; - -// This one is complicated and gross. Just don't go there... -// TODO: Comment me! -var seg2poly = function(seg, poly) -{ - var arr = []; - - var planes = poly.tPlanes; - var numVerts = planes.length; - - var segD = vdot(seg.tn, seg.ta); - var minNorm = poly.valueOnAxis(seg.tn, segD) - seg.r; - var minNeg = poly.valueOnAxis(vneg(seg.tn), -segD) - seg.r; - if(minNeg > 0 || minNorm > 0) return NONE; - - var mini = 0; - var poly_min = segValueOnAxis(seg, planes[0].n, planes[0].d); - if(poly_min > 0) return NONE; - for(var i=0; i 0){ - return NONE; - } else if(dist > poly_min){ - poly_min = dist; - mini = i; - } - } - - var poly_n = vneg(planes[mini].n); - - var va = vadd(seg.ta, vmult(poly_n, seg.r)); - var vb = vadd(seg.tb, vmult(poly_n, seg.r)); - if(poly.containsVert(va.x, va.y)) - arr.push(new Contact(va, poly_n, poly_min, hashPair(seg.hashid, 0))); - if(poly.containsVert(vb.x, vb.y)) - arr.push(new Contact(vb, poly_n, poly_min, hashPair(seg.hashid, 1))); - - // Floating point precision problems here. - // This will have to do for now. -// poly_min -= cp_collision_slop; // TODO is this needed anymore? - - if(minNorm >= poly_min || minNeg >= poly_min) { - if(minNorm > minNeg) - findPointsBehindSeg(arr, seg, poly, minNorm, 1); - else - findPointsBehindSeg(arr, seg, poly, minNeg, -1); - } - - // If no other collision points are found, try colliding endpoints. - if(arr.length === 0){ - var mini2 = mini * 2; - var verts = poly.tVerts; - - var poly_a = new Vect(verts[mini2], verts[mini2+1]); - - var con; - if((con = circle2circleQuery(seg.ta, poly_a, seg.r, 0, arr))) return [con]; - if((con = circle2circleQuery(seg.tb, poly_a, seg.r, 0, arr))) return [con]; - - var len = numVerts * 2; - var poly_b = new Vect(verts[(mini2+2)%len], verts[(mini2+3)%len]); - if((con = circle2circleQuery(seg.ta, poly_b, seg.r, 0, arr))) return [con]; - if((con = circle2circleQuery(seg.tb, poly_b, seg.r, 0, arr))) return [con]; - } - -// console.log(poly.tVerts, poly.tPlanes); -// console.log('seg2poly', arr); - return arr; -}; - -// This one is less gross, but still gross. -// TODO: Comment me! -var circle2poly = function(circ, poly) -{ - var planes = poly.tPlanes; - - var mini = 0; - var min = vdot(planes[0].n, circ.tc) - planes[0].d - circ.r; - for(var i=0; i 0){ - return NONE; - } else if(dist > min) { - min = dist; - mini = i; - } - } - - var n = planes[mini].n; - - var verts = poly.tVerts; - var len = verts.length; - var mini2 = mini<<1; - - //var a = poly.tVerts[mini]; - //var b = poly.tVerts[(mini + 1)%poly.tVerts.length]; - var ax = verts[mini2]; - var ay = verts[mini2+1]; - var bx = verts[(mini2+2)%len]; - var by = verts[(mini2+3)%len]; - - var dta = vcross2(n.x, n.y, ax, ay); - var dtb = vcross2(n.x, n.y, bx, by); - var dt = vcross(n, circ.tc); - - if(dt < dtb){ - var con = circle2circleQuery(circ.tc, new Vect(bx, by), circ.r, 0, con); - return con ? [con] : NONE; - } else if(dt < dta) { - return [new Contact( - vsub(circ.tc, vmult(n, circ.r + min/2)), - vneg(n), - min, - 0 - )]; - } else { - var con = circle2circleQuery(circ.tc, new Vect(ax, ay), circ.r, 0, con); - return con ? [con] : NONE; - } -}; - -// The javascripty way to do this would be either nested object or methods on the prototypes. -// -// However, the *fastest* way is the method below. -// See: http://jsperf.com/dispatch - -// These are copied from the prototypes into the actual objects in the Shape constructor. -CircleShape.prototype.collisionCode = 0; -SegmentShape.prototype.collisionCode = 1; -PolyShape.prototype.collisionCode = 2; - -CircleShape.prototype.collisionTable = [ - circle2circle, - circle2segment, - circle2poly -]; - -SegmentShape.prototype.collisionTable = [ - null, - function(segA, segB) { return NONE; }, // seg2seg - seg2poly -]; - -PolyShape.prototype.collisionTable = [ - null, - null, - poly2poly -]; - -var collideShapes = cp.collideShapes = function(a, b) -{ - assert(a.collisionCode <= b.collisionCode, 'Collided shapes must be sorted by type'); - return a.collisionTable[b.collisionCode](a, b); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var defaultCollisionHandler = new CollisionHandler(); - -/// Basic Unit of Simulation in Chipmunk -var Space = cp.Space = function() { - this.stamp = 0; - this.curr_dt = 0; - - this.bodies = []; - this.rousedBodies = []; - this.sleepingComponents = []; - - this.staticShapes = new BBTree(null); - this.activeShapes = new BBTree(this.staticShapes); - - this.arbiters = []; - this.contactBuffersHead = null; - this.cachedArbiters = {}; - //this.pooledArbiters = []; - - this.constraints = []; - - this.locked = 0; - - this.collisionHandlers = {}; - this.defaultHandler = defaultCollisionHandler; - - this.postStepCallbacks = []; - - /// Number of iterations to use in the impulse solver to solve contacts. - this.iterations = 10; - - /// Gravity to pass to rigid bodies when integrating velocity. - this.gravity = vzero; - - /// Damping rate expressed as the fraction of velocity bodies retain each second. - /// A value of 0.9 would mean that each body's velocity will drop 10% per second. - /// The default value is 1.0, meaning no damping is applied. - /// @note This damping value is different than those of cpDampedSpring and cpDampedRotarySpring. - this.damping = 1; - - /// Speed threshold for a body to be considered idle. - /// The default value of 0 means to let the space guess a good threshold based on gravity. - this.idleSpeedThreshold = 0; - - /// Time a group of bodies must remain idle in order to fall asleep. - /// Enabling sleeping also implicitly enables the the contact graph. - /// The default value of Infinity disables the sleeping algorithm. - this.sleepTimeThreshold = Infinity; - - /// Amount of encouraged penetration between colliding shapes.. - /// Used to reduce oscillating contacts and keep the collision cache warm. - /// Defaults to 0.1. If you have poor simulation quality, - /// increase this number as much as possible without allowing visible amounts of overlap. - this.collisionSlop = 0.1; - - /// Determines how fast overlapping shapes are pushed apart. - /// Expressed as a fraction of the error remaining after each second. - /// Defaults to pow(1.0 - 0.1, 60.0) meaning that Chipmunk fixes 10% of overlap each frame at 60Hz. - this.collisionBias = Math.pow(1 - 0.1, 60); - - /// Number of frames that contact information should persist. - /// Defaults to 3. There is probably never a reason to change this value. - this.collisionPersistence = 3; - - /// Rebuild the contact graph during each step. Must be enabled to use the cpBodyEachArbiter() function. - /// Disabled by default for a small performance boost. Enabled implicitly when the sleeping feature is enabled. - this.enableContactGraph = false; - - /// The designated static body for this space. - /// You can modify this body, or replace it with your own static body. - /// By default it points to a statically allocated cpBody in the cpSpace struct. - this.staticBody = new Body(Infinity, Infinity); - this.staticBody.nodeIdleTime = Infinity; - - // Cache the collideShapes callback function for the space. - this.collideShapes = this.makeCollideShapes(); -}; - -Space.prototype.getCurrentTimeStep = function() { return this.curr_dt; }; - -Space.prototype.setIterations = function(iter) { this.iterations = iter; }; - -/// returns true from inside a callback and objects cannot be added/removed. -Space.prototype.isLocked = function() -{ - return this.locked; -}; - -var assertSpaceUnlocked = function(space) -{ - assert(!space.locked, "This addition/removal cannot be done safely during a call to cpSpaceStep() \ - or during a query. Put these calls into a post-step callback."); -}; - -// **** Collision handler function management - -/// Set a collision handler to be used whenever the two shapes with the given collision types collide. -/// You can pass null for any function you don't want to implement. -Space.prototype.addCollisionHandler = function(a, b, begin, preSolve, postSolve, separate) -{ - assertSpaceUnlocked(this); - - // Remove any old function so the new one will get added. - this.removeCollisionHandler(a, b); - - var handler = new CollisionHandler(); - handler.a = a; - handler.b = b; - if(begin) handler.begin = begin; - if(preSolve) handler.preSolve = preSolve; - if(postSolve) handler.postSolve = postSolve; - if(separate) handler.separate = separate; - - this.collisionHandlers[hashPair(a, b)] = handler; -}; - -/// Unset a collision handler. -Space.prototype.removeCollisionHandler = function(a, b) -{ - assertSpaceUnlocked(this); - - delete this.collisionHandlers[hashPair(a, b)]; -}; - -/// Set a default collision handler for this space. -/// The default collision handler is invoked for each colliding pair of shapes -/// that isn't explicitly handled by a specific collision handler. -/// You can pass null for any function you don't want to implement. -Space.prototype.setDefaultCollisionHandler = function(begin, preSolve, postSolve, separate) -{ - assertSpaceUnlocked(this); - - var handler = new CollisionHandler(); - if(begin) handler.begin = begin; - if(preSolve) handler.preSolve = preSolve; - if(postSolve) handler.postSolve = postSolve; - if(separate) handler.separate = separate; - - this.defaultHandler = handler; -}; - -Space.prototype.lookupHandler = function(a, b) -{ - return this.collisionHandlers[hashPair(a, b)] || this.defaultHandler; -}; - -// **** Body, Shape, and Joint Management - -/// Add a collision shape to the simulation. -/// If the shape is attached to a static body, it will be added as a static shape. -Space.prototype.addShape = function(shape) -{ - var body = shape.body; - if(body.isStatic()) return this.addStaticShape(shape); - - assert(!shape.space, "This shape is already added to a space and cannot be added to another."); - assertSpaceUnlocked(this); - - body.activate(); - body.addShape(shape); - - shape.update(body.p, body.rot); - this.activeShapes.insert(shape, shape.hashid); - shape.space = this; - - return shape; -}; - -/// Explicity add a shape as a static shape to the simulation. -Space.prototype.addStaticShape = function(shape) -{ - assert(!shape.space, "This shape is already added to a space and cannot be added to another."); - assertSpaceUnlocked(this); - - var body = shape.body; - body.addShape(shape); - - shape.update(body.p, body.rot); - this.staticShapes.insert(shape, shape.hashid); - shape.space = this; - - return shape; -}; - -/// Add a rigid body to the simulation. -Space.prototype.addBody = function(body) -{ - assert(!body.isStatic(), "Static bodies cannot be added to a space as they are not meant to be simulated."); - assert(!body.space, "This body is already added to a space and cannot be added to another."); - assertSpaceUnlocked(this); - - this.bodies.push(body); - body.space = this; - - return body; -}; - -/// Add a constraint to the simulation. -Space.prototype.addConstraint = function(constraint) -{ - assert(!constraint.space, "This shape is already added to a space and cannot be added to another."); - assertSpaceUnlocked(this); - - var a = constraint.a, b = constraint.b; - - a.activate(); - b.activate(); - this.constraints.push(constraint); - - // Push onto the heads of the bodies' constraint lists - constraint.next_a = a.constraintList; a.constraintList = constraint; - constraint.next_b = b.constraintList; b.constraintList = constraint; - constraint.space = this; - - return constraint; -}; - -Space.prototype.filterArbiters = function(body, filter) -{ - for (var hash in this.cachedArbiters) - { - var arb = this.cachedArbiters[hash]; - - // Match on the filter shape, or if it's null the filter body - if( - (body === arb.body_a && (filter === arb.a || filter === null)) || - (body === arb.body_b && (filter === arb.b || filter === null)) - ){ - // Call separate when removing shapes. - if(filter && arb.state !== 'cached') arb.callSeparate(this); - - arb.unthread(); - - deleteObjFromList(this.arbiters, arb); - //this.pooledArbiters.push(arb); - - delete this.cachedArbiters[hash]; - } - } -}; - -/// Remove a collision shape from the simulation. -Space.prototype.removeShape = function(shape) -{ - var body = shape.body; - if(body.isStatic()){ - this.removeStaticShape(shape); - } else { - assert(this.containsShape(shape), - "Cannot remove a shape that was not added to the space. (Removed twice maybe?)"); - assertSpaceUnlocked(this); - - body.activate(); - body.removeShape(shape); - this.filterArbiters(body, shape); - this.activeShapes.remove(shape, shape.hashid); - shape.space = null; - } -}; - -/// Remove a collision shape added using addStaticShape() from the simulation. -Space.prototype.removeStaticShape = function(shape) -{ - assert(this.containsShape(shape), - "Cannot remove a static or sleeping shape that was not added to the space. (Removed twice maybe?)"); - assertSpaceUnlocked(this); - - var body = shape.body; - if(body.isStatic()) body.activateStatic(shape); - body.removeShape(shape); - this.filterArbiters(body, shape); - this.staticShapes.remove(shape, shape.hashid); - shape.space = null; -}; - -/// Remove a rigid body from the simulation. -Space.prototype.removeBody = function(body) -{ - assert(this.containsBody(body), - "Cannot remove a body that was not added to the space. (Removed twice maybe?)"); - assertSpaceUnlocked(this); - - body.activate(); -// this.filterArbiters(body, null); - deleteObjFromList(this.bodies, body); - body.space = null; -}; - -/// Remove a constraint from the simulation. -Space.prototype.removeConstraint = function(constraint) -{ - assert(this.containsConstraint(constraint), - "Cannot remove a constraint that was not added to the space. (Removed twice maybe?)"); - assertSpaceUnlocked(this); - - constraint.a.activate(); - constraint.b.activate(); - deleteObjFromList(this.constraints, constraint); - - constraint.a.removeConstraint(constraint); - constraint.b.removeConstraint(constraint); - constraint.space = null; -}; - -/// Test if a collision shape has been added to the space. -Space.prototype.containsShape = function(shape) -{ - return (shape.space === this); -}; - -/// Test if a rigid body has been added to the space. -Space.prototype.containsBody = function(body) -{ - return (body.space == this); -}; - -/// Test if a constraint has been added to the space. -Space.prototype.containsConstraint = function(constraint) -{ - return (constraint.space == this); -}; - -Space.prototype.uncacheArbiter = function(arb) -{ - delete this.cachedArbiters[hashPair(arb.a.hashid, arb.b.hashid)]; - deleteObjFromList(this.arbiters, arb); -}; - - -// **** Iteration - -/// Call @c func for each body in the space. -Space.prototype.eachBody = function(func) -{ - this.lock(); { - var bodies = this.bodies; - - for(var i=0; i keThreshold ? 0 : body.nodeIdleTime + dt); - } - } - - // Awaken any sleeping bodies found and then push arbiters to the bodies' lists. - var arbiters = this.arbiters; - for(var i=0, count=arbiters.length; i= 0, "Internal Error: Space lock underflow."); - - if(this.locked === 0 && runPostStep){ - var waking = this.rousedBodies; - for(var i=0; i this.collisionPersistence){ - // The tail buffer is available, rotate the ring - var tail = head.next; - tail.stamp = stamp; - tail.contacts.length = 0; - this.contactBuffersHead = tail; - } else { - // Allocate a new buffer and push it into the ring - var buffer = new ContactBuffer(stamp, head); - this.contactBuffersHead = head.next = buffer; - } -}; - -cpContact * -cpContactBufferGetArray(cpSpace *space) -{ - if(space.contactBuffersHead.numContacts + CP_MAX_CONTACTS_PER_ARBITER > CP_CONTACTS_BUFFER_SIZE){ - // contact buffer could overflow on the next collision, push a fresh one. - space.pushFreshContactBuffer(); - } - - cpContactBufferHeader *head = space.contactBuffersHead; - return ((cpContactBuffer *)head)->contacts + head.numContacts; -} - -void -cpSpacePushContacts(cpSpace *space, int count) -{ - cpAssertHard(count <= CP_MAX_CONTACTS_PER_ARBITER, "Internal Error: Contact buffer overflow!"); - space.contactBuffersHead.numContacts += count; -} - -static void -cpSpacePopContacts(cpSpace *space, int count){ - space.contactBuffersHead.numContacts -= count; -} -*/ - -// **** Collision Detection Functions - -/* Use this to re-enable object pools. -static void * -cpSpaceArbiterSetTrans(cpShape **shapes, cpSpace *space) -{ - if(space.pooledArbiters.num == 0){ - // arbiter pool is exhausted, make more - int count = CP_BUFFER_BYTES/sizeof(cpArbiter); - cpAssertHard(count, "Internal Error: Buffer size too small."); - - cpArbiter *buffer = (cpArbiter *)cpcalloc(1, CP_BUFFER_BYTES); - cpArrayPush(space.allocatedBuffers, buffer); - - for(int i=0; i b.collisionCode){ - var temp = a; - a = b; - b = temp; - } - - // Narrow-phase collision detection. - //cpContact *contacts = cpContactBufferGetArray(space); - //int numContacts = cpCollideShapes(a, b, contacts); - var contacts = collideShapes(a, b); - if(contacts.length === 0) return; // Shapes are not colliding. - //cpSpacePushContacts(space, numContacts); - - // Get an arbiter from space.arbiterSet for the two shapes. - // This is where the persistant contact magic comes from. - var arbHash = hashPair(a.hashid, b.hashid); - var arb = space.cachedArbiters[arbHash]; - if (!arb){ - arb = space.cachedArbiters[arbHash] = new Arbiter(a, b); - } - - arb.update(contacts, handler, a, b); - - // Call the begin function first if it's the first step - if(arb.state == 'first coll' && !handler.begin(arb, space)){ - arb.ignore(); // permanently ignore the collision until separation - } - - if( - // Ignore the arbiter if it has been flagged - (arb.state !== 'ignore') && - // Call preSolve - handler.preSolve(arb, space) && - // Process, but don't add collisions for sensors. - !sensor - ){ - space.arbiters.push(arb); - } else { - //cpSpacePopContacts(space, numContacts); - - arb.contacts = null; - - // Normally arbiters are set as used after calling the post-solve callback. - // However, post-solve callbacks are not called for sensors or arbiters rejected from pre-solve. - if(arb.state !== 'ignore') arb.state = 'normal'; - } - - // Time stamp the arbiter so we know it was used recently. - arb.stamp = space.stamp; - }; -}; - -// Hashset filter func to throw away old arbiters. -Space.prototype.arbiterSetFilter = function(arb) -{ - var ticks = this.stamp - arb.stamp; - - var a = arb.body_a, b = arb.body_b; - - // TODO should make an arbiter state for this so it doesn't require filtering arbiters for - // dangling body pointers on body removal. - // Preserve arbiters on sensors and rejected arbiters for sleeping objects. - // This prevents errant separate callbacks from happenening. - if( - (a.isStatic() || a.isSleeping()) && - (b.isStatic() || b.isSleeping()) - ){ - return true; - } - - // Arbiter was used last frame, but not this one - if(ticks >= 1 && arb.state != 'cached'){ - arb.callSeparate(this); - arb.state = 'cached'; - } - - if(ticks >= this.collisionPersistence){ - arb.contacts = null; - - //cpArrayPush(this.pooledArbiters, arb); - return false; - } - - return true; -}; - -// **** All Important cpSpaceStep() Function - -var updateFunc = function(shape) -{ - var body = shape.body; - shape.update(body.p, body.rot); -}; - -/// Step the space forward in time by @c dt. -Space.prototype.step = function(dt) -{ - // don't step if the timestep is 0! - if(dt === 0) return; - - assert(vzero.x === 0 && vzero.y === 0, "vzero is invalid"); - - this.stamp++; - - var prev_dt = this.curr_dt; - this.curr_dt = dt; - - var i; - var j; - var hash; - var bodies = this.bodies; - var constraints = this.constraints; - var arbiters = this.arbiters; - - // Reset and empty the arbiter lists. - for(i=0; imaxForce*(dt)) - -// a and b are bodies. -var relative_velocity = function(a, b, r1, r2){ - //var v1_sum = vadd(a.v, vmult(vperp(r1), a.w)); - var v1_sumx = a.vx + (-r1.y) * a.w; - var v1_sumy = a.vy + ( r1.x) * a.w; - - //var v2_sum = vadd(b.v, vmult(vperp(r2), b.w)); - var v2_sumx = b.vx + (-r2.y) * b.w; - var v2_sumy = b.vy + ( r2.x) * b.w; - -// return vsub(v2_sum, v1_sum); - return new Vect(v2_sumx - v1_sumx, v2_sumy - v1_sumy); -}; - -var normal_relative_velocity = function(a, b, r1, r2, n){ - //return vdot(relative_velocity(a, b, r1, r2), n); - var v1_sumx = a.vx + (-r1.y) * a.w; - var v1_sumy = a.vy + ( r1.x) * a.w; - var v2_sumx = b.vx + (-r2.y) * b.w; - var v2_sumy = b.vy + ( r2.x) * b.w; - - return vdot2(v2_sumx - v1_sumx, v2_sumy - v1_sumy, n.x, n.y); -}; - -/* -var apply_impulse = function(body, j, r){ - body.v = vadd(body.v, vmult(j, body.m_inv)); - body.w += body.i_inv*vcross(r, j); -}; - -var apply_impulses = function(a, b, r1, r2, j) -{ - apply_impulse(a, vneg(j), r1); - apply_impulse(b, j, r2); -}; -*/ - -var apply_impulse = function(body, jx, jy, r){ -// body.v = body.v.add(vmult(j, body.m_inv)); - body.vx += jx * body.m_inv; - body.vy += jy * body.m_inv; -// body.w += body.i_inv*vcross(r, j); - body.w += body.i_inv*(r.x*jy - r.y*jx); -}; - -var apply_impulses = function(a, b, r1, r2, jx, jy) -{ - apply_impulse(a, -jx, -jy, r1); - apply_impulse(b, jx, jy, r2); -}; - -var apply_bias_impulse = function(body, jx, jy, r) -{ - //body.v_bias = vadd(body.v_bias, vmult(j, body.m_inv)); - body.v_biasx += jx * body.m_inv; - body.v_biasy += jy * body.m_inv; - body.w_bias += body.i_inv*vcross2(r.x, r.y, jx, jy); -}; - -/* -var apply_bias_impulses = function(a, b, r1, r2, j) -{ - apply_bias_impulse(a, vneg(j), r1); - apply_bias_impulse(b, j, r2); -};*/ - -var k_scalar_body = function(body, r, n) -{ - var rcn = vcross(r, n); - return body.m_inv + body.i_inv*rcn*rcn; -}; - -var k_scalar = function(a, b, r1, r2, n) -{ - var value = k_scalar_body(a, r1, n) + k_scalar_body(b, r2, n); - assertSoft(value !== 0, "Unsolvable collision or constraint."); - - return value; -}; - -// k1 and k2 are modified by the function to contain the outputs. -var k_tensor = function(a, b, r1, r2, k1, k2) -{ - // calculate mass matrix - // If I wasn't lazy and wrote a proper matrix class, this wouldn't be so gross... - var k11, k12, k21, k22; - var m_sum = a.m_inv + b.m_inv; - - // start with I*m_sum - k11 = m_sum; k12 = 0; - k21 = 0; k22 = m_sum; - - // add the influence from r1 - var a_i_inv = a.i_inv; - var r1xsq = r1.x * r1.x * a_i_inv; - var r1ysq = r1.y * r1.y * a_i_inv; - var r1nxy = -r1.x * r1.y * a_i_inv; - k11 += r1ysq; k12 += r1nxy; - k21 += r1nxy; k22 += r1xsq; - - // add the influnce from r2 - var b_i_inv = b.i_inv; - var r2xsq = r2.x * r2.x * b_i_inv; - var r2ysq = r2.y * r2.y * b_i_inv; - var r2nxy = -r2.x * r2.y * b_i_inv; - k11 += r2ysq; k12 += r2nxy; - k21 += r2nxy; k22 += r2xsq; - - // invert - var determinant = k11*k22 - k12*k21; - assertSoft(determinant !== 0, "Unsolvable constraint."); - - var det_inv = 1/determinant; - - k1.x = k22*det_inv; k1.y = -k12*det_inv; - k2.x = -k21*det_inv; k2.y = k11*det_inv; -}; - -var mult_k = function(vr, k1, k2) -{ - return new Vect(vdot(vr, k1), vdot(vr, k2)); -}; - -var bias_coef = function(errorBias, dt) -{ - return 1 - Math.pow(errorBias, dt); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -// TODO: Comment me! - -// a and b are bodies that the constraint applies to. -var Constraint = cp.Constraint = function(a, b) -{ - /// The first body connected to this constraint. - this.a = a; - /// The second body connected to this constraint. - this.b = b; - - this.space = null; - - this.next_a = null; - this.next_b = null; - - /// The maximum force that this constraint is allowed to use. - this.maxForce = Infinity; - /// The rate at which joint error is corrected. - /// Defaults to pow(1 - 0.1, 60) meaning that it will - /// correct 10% of the error every 1/60th of a second. - this.errorBias = Math.pow(1 - 0.1, 60); - /// The maximum rate at which joint error is corrected. - this.maxBias = Infinity; -}; - -Constraint.prototype.activateBodies = function() -{ - if(this.a) this.a.activate(); - if(this.b) this.b.activate(); -}; - -/// These methods are overridden by the constraint itself. -Constraint.prototype.preStep = function(dt) {}; -Constraint.prototype.applyCachedImpulse = function(dt_coef) {}; -Constraint.prototype.applyImpulse = function() {}; -Constraint.prototype.getImpulse = function() { return 0; }; - -/// Function called before the solver runs. This can be overridden by the user -/// to customize the constraint. -/// Animate your joint anchors, update your motor torque, etc. -Constraint.prototype.preSolve = function(space) {}; - -/// Function called after the solver runs. This can be overridden by the user -/// to customize the constraint. -/// Use the applied impulse to perform effects like breakable joints. -Constraint.prototype.postSolve = function(space) {}; - -Constraint.prototype.next = function(body) -{ - return (this.a === body ? this.next_a : this.next_b); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var PinJoint = cp.PinJoint = function(a, b, anchr1, anchr2) -{ - Constraint.call(this, a, b); - - this.anchr1 = anchr1; - this.anchr2 = anchr2; - - // STATIC_BODY_CHECK - var p1 = (a ? vadd(a.p, vrotate(anchr1, a.rot)) : anchr1); - var p2 = (b ? vadd(b.p, vrotate(anchr2, b.rot)) : anchr2); - this.dist = vlength(vsub(p2, p1)); - - assertSoft(this.dist > 0, "You created a 0 length pin joint. A pivot joint will be much more stable."); - - this.r1 = this.r2 = null; - this.n = null; - this.nMass = 0; - - this.jnAcc = this.jnMax = 0; - this.bias = 0; -}; - -PinJoint.prototype = Object.create(Constraint.prototype); - -PinJoint.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - this.r1 = vrotate(this.anchr1, a.rot); - this.r2 = vrotate(this.anchr2, b.rot); - - var delta = vsub(vadd(b.p, this.r2), vadd(a.p, this.r1)); - var dist = vlength(delta); - this.n = vmult(delta, 1/(dist ? dist : Infinity)); - - // calculate mass normal - this.nMass = 1/k_scalar(a, b, this.r1, this.r2, this.n); - - // calculate bias velocity - var maxBias = this.maxBias; - this.bias = clamp(-bias_coef(this.errorBias, dt)*(dist - this.dist)/dt, -maxBias, maxBias); - - // compute max impulse - this.jnMax = this.maxForce * dt; -}; - -PinJoint.prototype.applyCachedImpulse = function(dt_coef) -{ - var j = vmult(this.n, this.jnAcc*dt_coef); - apply_impulses(this.a, this.b, this.r1, this.r2, j.x, j.y); -}; - -PinJoint.prototype.applyImpulse = function() -{ - var a = this.a; - var b = this.b; - var n = this.n; - - // compute relative velocity - var vrn = normal_relative_velocity(a, b, this.r1, this.r2, n); - - // compute normal impulse - var jn = (this.bias - vrn)*this.nMass; - var jnOld = this.jnAcc; - this.jnAcc = clamp(jnOld + jn, -this.jnMax, this.jnMax); - jn = this.jnAcc - jnOld; - - // apply impulse - apply_impulses(a, b, this.r1, this.r2, n.x*jn, n.y*jn); -}; - -PinJoint.prototype.getImpulse = function() -{ - return Math.abs(this.jnAcc); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var SlideJoint = cp.SlideJoint = function(a, b, anchr1, anchr2, min, max) -{ - Constraint.call(this, a, b); - - this.anchr1 = anchr1; - this.anchr2 = anchr2; - this.min = min; - this.max = max; - - this.r1 = this.r2 = this.n = null; - this.nMass = 0; - - this.jnAcc = this.jnMax = 0; - this.bias = 0; -}; - -SlideJoint.prototype = Object.create(Constraint.prototype); - -SlideJoint.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - this.r1 = vrotate(this.anchr1, a.rot); - this.r2 = vrotate(this.anchr2, b.rot); - - var delta = vsub(vadd(b.p, this.r2), vadd(a.p, this.r1)); - var dist = vlength(delta); - var pdist = 0; - if(dist > this.max) { - pdist = dist - this.max; - this.n = vnormalize_safe(delta); - } else if(dist < this.min) { - pdist = this.min - dist; - this.n = vneg(vnormalize_safe(delta)); - } else { - this.n = vzero; - this.jnAcc = 0; - } - - // calculate mass normal - this.nMass = 1/k_scalar(a, b, this.r1, this.r2, this.n); - - // calculate bias velocity - var maxBias = this.maxBias; - this.bias = clamp(-bias_coef(this.errorBias, dt)*pdist/dt, -maxBias, maxBias); - - // compute max impulse - this.jnMax = this.maxForce * dt; -}; - -SlideJoint.prototype.applyCachedImpulse = function(dt_coef) -{ - var jn = this.jnAcc * dt_coef; - apply_impulses(this.a, this.b, this.r1, this.r2, this.n.x * jn, this.n.y * jn); -}; - -SlideJoint.prototype.applyImpulse = function() -{ - if(this.n.x === 0 && this.n.y === 0) return; // early exit - - var a = this.a; - var b = this.b; - - var n = this.n; - var r1 = this.r1; - var r2 = this.r2; - - // compute relative velocity - var vr = relative_velocity(a, b, r1, r2); - var vrn = vdot(vr, n); - - // compute normal impulse - var jn = (this.bias - vrn)*this.nMass; - var jnOld = this.jnAcc; - this.jnAcc = clamp(jnOld + jn, -this.jnMax, 0); - jn = this.jnAcc - jnOld; - - // apply impulse - apply_impulses(a, b, this.r1, this.r2, n.x * jn, n.y * jn); -}; - -SlideJoint.prototype.getImpulse = function() -{ - return Math.abs(this.jnAcc); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -// Pivot joints can also be created with (a, b, pivot); -var PivotJoint = cp.PivotJoint = function(a, b, anchr1, anchr2) -{ - Constraint.call(this, a, b); - - if(typeof anchr2 === 'undefined') { - var pivot = anchr1; - - anchr1 = (a ? a.world2Local(pivot) : pivot); - anchr2 = (b ? b.world2Local(pivot) : pivot); - } - - this.anchr1 = anchr1; - this.anchr2 = anchr2; - - this.r1 = this.r2 = vzero; - - this.k1 = new Vect(0,0); this.k2 = new Vect(0,0); - - this.jAcc = vzero; - - this.jMaxLen = 0; - this.bias = vzero; -}; - -PivotJoint.prototype = Object.create(Constraint.prototype); - -PivotJoint.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - this.r1 = vrotate(this.anchr1, a.rot); - this.r2 = vrotate(this.anchr2, b.rot); - - // Calculate mass tensor. Result is stored into this.k1 & this.k2. - k_tensor(a, b, this.r1, this.r2, this.k1, this.k2); - - // compute max impulse - this.jMaxLen = this.maxForce * dt; - - // calculate bias velocity - var delta = vsub(vadd(b.p, this.r2), vadd(a.p, this.r1)); - this.bias = vclamp(vmult(delta, -bias_coef(this.errorBias, dt)/dt), this.maxBias); -}; - -PivotJoint.prototype.applyCachedImpulse = function(dt_coef) -{ - apply_impulses(this.a, this.b, this.r1, this.r2, this.jAcc.x * dt_coef, this.jAcc.y * dt_coef); -}; - -PivotJoint.prototype.applyImpulse = function() -{ - var a = this.a; - var b = this.b; - - var r1 = this.r1; - var r2 = this.r2; - - // compute relative velocity - var vr = relative_velocity(a, b, r1, r2); - - // compute normal impulse - var j = mult_k(vsub(this.bias, vr), this.k1, this.k2); - var jOld = this.jAcc; - this.jAcc = vclamp(vadd(this.jAcc, j), this.jMaxLen); - - // apply impulse - apply_impulses(a, b, this.r1, this.r2, this.jAcc.x - jOld.x, this.jAcc.y - jOld.y); -}; - -PivotJoint.prototype.getImpulse = function() -{ - return vlength(this.jAcc); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var GrooveJoint = cp.GrooveJoint = function(a, b, groove_a, groove_b, anchr2) -{ - Constraint.call(this, a, b); - - this.grv_a = groove_a; - this.grv_b = groove_b; - this.grv_n = vperp(vnormalize(vsub(groove_b, groove_a))); - this.anchr2 = anchr2; - - this.grv_tn = null; - this.clamp = 0; - this.r1 = this.r2 = null; - - this.k1 = new Vect(0,0); - this.k2 = new Vect(0,0); - - this.jAcc = vzero; - this.jMaxLen = 0; - this.bias = null; -}; - -GrooveJoint.prototype = Object.create(Constraint.prototype); - -GrooveJoint.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - // calculate endpoints in worldspace - var ta = a.local2World(this.grv_a); - var tb = a.local2World(this.grv_b); - - // calculate axis - var n = vrotate(this.grv_n, a.rot); - var d = vdot(ta, n); - - this.grv_tn = n; - this.r2 = vrotate(this.anchr2, b.rot); - - // calculate tangential distance along the axis of r2 - var td = vcross(vadd(b.p, this.r2), n); - // calculate clamping factor and r2 - if(td <= vcross(ta, n)){ - this.clamp = 1; - this.r1 = vsub(ta, a.p); - } else if(td >= vcross(tb, n)){ - this.clamp = -1; - this.r1 = vsub(tb, a.p); - } else { - this.clamp = 0; - this.r1 = vsub(vadd(vmult(vperp(n), -td), vmult(n, d)), a.p); - } - - // Calculate mass tensor - k_tensor(a, b, this.r1, this.r2, this.k1, this.k2); - - // compute max impulse - this.jMaxLen = this.maxForce * dt; - - // calculate bias velocity - var delta = vsub(vadd(b.p, this.r2), vadd(a.p, this.r1)); - this.bias = vclamp(vmult(delta, -bias_coef(this.errorBias, dt)/dt), this.maxBias); -}; - -GrooveJoint.prototype.applyCachedImpulse = function(dt_coef) -{ - apply_impulses(this.a, this.b, this.r1, this.r2, this.jAcc.x * dt_coef, this.jAcc.y * dt_coef); -}; - -GrooveJoint.prototype.grooveConstrain = function(j){ - var n = this.grv_tn; - var jClamp = (this.clamp*vcross(j, n) > 0) ? j : vproject(j, n); - return vclamp(jClamp, this.jMaxLen); -}; - -GrooveJoint.prototype.applyImpulse = function() -{ - var a = this.a; - var b = this.b; - - var r1 = this.r1; - var r2 = this.r2; - - // compute impulse - var vr = relative_velocity(a, b, r1, r2); - - var j = mult_k(vsub(this.bias, vr), this.k1, this.k2); - var jOld = this.jAcc; - this.jAcc = this.grooveConstrain(vadd(jOld, j)); - - // apply impulse - apply_impulses(a, b, this.r1, this.r2, this.jAcc.x - jOld.x, this.jAcc.y - jOld.y); -}; - -GrooveJoint.prototype.getImpulse = function() -{ - return vlength(this.jAcc); -}; - -GrooveJoint.prototype.setGrooveA = function(value) -{ - this.grv_a = value; - this.grv_n = vperp(vnormalize(vsub(this.grv_b, value))); - - this.activateBodies(); -}; - -GrooveJoint.prototype.setGrooveB = function(value) -{ - this.grv_b = value; - this.grv_n = vperp(vnormalize(vsub(value, this.grv_a))); - - this.activateBodies(); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var defaultSpringForce = function(spring, dist){ - return (spring.restLength - dist)*spring.stiffness; -}; - -var DampedSpring = cp.DampedSpring = function(a, b, anchr1, anchr2, restLength, stiffness, damping) -{ - Constraint.call(this, a, b); - - this.anchr1 = anchr1; - this.anchr2 = anchr2; - - this.restLength = restLength; - this.stiffness = stiffness; - this.damping = damping; - this.springForceFunc = defaultSpringForce; - - this.target_vrn = this.v_coef = 0; - - this.r1 = this.r2 = null; - this.nMass = 0; - this.n = null; -}; - -DampedSpring.prototype = Object.create(Constraint.prototype); - -DampedSpring.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - this.r1 = vrotate(this.anchr1, a.rot); - this.r2 = vrotate(this.anchr2, b.rot); - - var delta = vsub(vadd(b.p, this.r2), vadd(a.p, this.r1)); - var dist = vlength(delta); - this.n = vmult(delta, 1/(dist ? dist : Infinity)); - - var k = k_scalar(a, b, this.r1, this.r2, this.n); - assertSoft(k !== 0, "Unsolvable this."); - this.nMass = 1/k; - - this.target_vrn = 0; - this.v_coef = 1 - Math.exp(-this.damping*dt*k); - - // apply this force - var f_spring = this.springForceFunc(this, dist); - apply_impulses(a, b, this.r1, this.r2, this.n.x * f_spring * dt, this.n.y * f_spring * dt); -}; - -DampedSpring.prototype.applyCachedImpulse = function(dt_coef){}; - -DampedSpring.prototype.applyImpulse = function() -{ - var a = this.a; - var b = this.b; - - var n = this.n; - var r1 = this.r1; - var r2 = this.r2; - - // compute relative velocity - var vrn = normal_relative_velocity(a, b, r1, r2, n); - - // compute velocity loss from drag - var v_damp = (this.target_vrn - vrn)*this.v_coef; - this.target_vrn = vrn + v_damp; - - v_damp *= this.nMass; - apply_impulses(a, b, this.r1, this.r2, this.n.x * v_damp, this.n.y * v_damp); -}; - -DampedSpring.prototype.getImpulse = function() -{ - return 0; -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var defaultSpringTorque = function(spring, relativeAngle){ - return (relativeAngle - spring.restAngle)*spring.stiffness; -} - -var DampedRotarySpring = cp.DampedRotarySpring = function(a, b, restAngle, stiffness, damping) -{ - Constraint.call(this, a, b); - - this.restAngle = restAngle; - this.stiffness = stiffness; - this.damping = damping; - this.springTorqueFunc = defaultSpringTorque; - - this.target_wrn = 0; - this.w_coef = 0; - this.iSum = 0; -}; - -DampedRotarySpring.prototype = Object.create(Constraint.prototype); - -DampedRotarySpring.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - var moment = a.i_inv + b.i_inv; - assertSoft(moment !== 0, "Unsolvable spring."); - this.iSum = 1/moment; - - this.w_coef = 1 - Math.exp(-this.damping*dt*moment); - this.target_wrn = 0; - - // apply this torque - var j_spring = this.springTorqueFunc(this, a.a - b.a)*dt; - a.w -= j_spring*a.i_inv; - b.w += j_spring*b.i_inv; -}; - -// DampedRotarySpring.prototype.applyCachedImpulse = function(dt_coef){}; - -DampedRotarySpring.prototype.applyImpulse = function() -{ - var a = this.a; - var b = this.b; - - // compute relative velocity - var wrn = a.w - b.w;//normal_relative_velocity(a, b, r1, r2, n) - this.target_vrn; - - // compute velocity loss from drag - // not 100% certain spring is derived correctly, though it makes sense - var w_damp = (this.target_wrn - wrn)*this.w_coef; - this.target_wrn = wrn + w_damp; - - //apply_impulses(a, b, this.r1, this.r2, vmult(this.n, v_damp*this.nMass)); - var j_damp = w_damp*this.iSum; - a.w += j_damp*a.i_inv; - b.w -= j_damp*b.i_inv; -}; - -// DampedRotarySpring.prototype.getImpulse = function(){ return 0; }; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var RotaryLimitJoint = cp.RotaryLimitJoint = function(a, b, min, max) -{ - Constraint.call(this, a, b); - - this.min = min; - this.max = max; - - this.jAcc = 0; - - this.iSum = this.bias = this.jMax = 0; -}; - -RotaryLimitJoint.prototype = Object.create(Constraint.prototype); - -RotaryLimitJoint.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - var dist = b.a - a.a; - var pdist = 0; - if(dist > this.max) { - pdist = this.max - dist; - } else if(dist < this.min) { - pdist = this.min - dist; - } - - // calculate moment of inertia coefficient. - this.iSum = 1/(1/a.i + 1/b.i); - - // calculate bias velocity - var maxBias = this.maxBias; - this.bias = clamp(-bias_coef(this.errorBias, dt)*pdist/dt, -maxBias, maxBias); - - // compute max impulse - this.jMax = this.maxForce * dt; - - // If the bias is 0, the joint is not at a limit. Reset the impulse. - if(!this.bias) this.jAcc = 0; -}; - -RotaryLimitJoint.prototype.applyCachedImpulse = function(dt_coef) -{ - var a = this.a; - var b = this.b; - - var j = this.jAcc*dt_coef; - a.w -= j*a.i_inv; - b.w += j*b.i_inv; -}; - -RotaryLimitJoint.prototype.applyImpulse = function() -{ - if(!this.bias) return; // early exit - - var a = this.a; - var b = this.b; - - // compute relative rotational velocity - var wr = b.w - a.w; - - // compute normal impulse - var j = -(this.bias + wr)*this.iSum; - var jOld = this.jAcc; - if(this.bias < 0){ - this.jAcc = clamp(jOld + j, 0, this.jMax); - } else { - this.jAcc = clamp(jOld + j, -this.jMax, 0); - } - j = this.jAcc - jOld; - - // apply impulse - a.w -= j*a.i_inv; - b.w += j*b.i_inv; -}; - -RotaryLimitJoint.prototype.getImpulse = function() -{ - return Math.abs(joint.jAcc); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var RatchetJoint = cp.RatchetJoint = function(a, b, phase, ratchet) -{ - Constraint.call(this, a, b); - - this.angle = 0; - this.phase = phase; - this.ratchet = ratchet; - - // STATIC_BODY_CHECK - this.angle = (b ? b.a : 0) - (a ? a.a : 0); - - this.iSum = this.bias = this.jAcc = this.jMax = 0; -}; - -RatchetJoint.prototype = Object.create(Constraint.prototype); - -RatchetJoint.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - var angle = this.angle; - var phase = this.phase; - var ratchet = this.ratchet; - - var delta = b.a - a.a; - var diff = angle - delta; - var pdist = 0; - - if(diff*ratchet > 0){ - pdist = diff; - } else { - this.angle = Math.floor((delta - phase)/ratchet)*ratchet + phase; - } - - // calculate moment of inertia coefficient. - this.iSum = 1/(a.i_inv + b.i_inv); - - // calculate bias velocity - var maxBias = this.maxBias; - this.bias = clamp(-bias_coef(this.errorBias, dt)*pdist/dt, -maxBias, maxBias); - - // compute max impulse - this.jMax = this.maxForce * dt; - - // If the bias is 0, the joint is not at a limit. Reset the impulse. - if(!this.bias) this.jAcc = 0; -}; - -RatchetJoint.prototype.applyCachedImpulse = function(dt_coef) -{ - var a = this.a; - var b = this.b; - - var j = this.jAcc*dt_coef; - a.w -= j*a.i_inv; - b.w += j*b.i_inv; -}; - -RatchetJoint.prototype.applyImpulse = function() -{ - if(!this.bias) return; // early exit - - var a = this.a; - var b = this.b; - - // compute relative rotational velocity - var wr = b.w - a.w; - var ratchet = this.ratchet; - - // compute normal impulse - var j = -(this.bias + wr)*this.iSum; - var jOld = this.jAcc; - this.jAcc = clamp((jOld + j)*ratchet, 0, this.jMax*Math.abs(ratchet))/ratchet; - j = this.jAcc - jOld; - - // apply impulse - a.w -= j*a.i_inv; - b.w += j*b.i_inv; -}; - -RatchetJoint.prototype.getImpulse = function(joint) -{ - return Math.abs(joint.jAcc); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var GearJoint = cp.GearJoint = function(a, b, phase, ratio) -{ - Constraint.call(this, a, b); - - this.phase = phase; - this.ratio = ratio; - this.ratio_inv = 1/ratio; - - this.jAcc = 0; - - this.iSum = this.bias = this.jMax = 0; -}; - -GearJoint.prototype = Object.create(Constraint.prototype); - -GearJoint.prototype.preStep = function(dt) -{ - var a = this.a; - var b = this.b; - - // calculate moment of inertia coefficient. - this.iSum = 1/(a.i_inv*this.ratio_inv + this.ratio*b.i_inv); - - // calculate bias velocity - var maxBias = this.maxBias; - this.bias = clamp(-bias_coef(this.errorBias, dt)*(b.a*this.ratio - a.a - this.phase)/dt, -maxBias, maxBias); - - // compute max impulse - this.jMax = this.maxForce * dt; -}; - -GearJoint.prototype.applyCachedImpulse = function(dt_coef) -{ - var a = this.a; - var b = this.b; - - var j = this.jAcc*dt_coef; - a.w -= j*a.i_inv*this.ratio_inv; - b.w += j*b.i_inv; -}; - -GearJoint.prototype.applyImpulse = function() -{ - var a = this.a; - var b = this.b; - - // compute relative rotational velocity - var wr = b.w*this.ratio - a.w; - - // compute normal impulse - var j = (this.bias - wr)*this.iSum; - var jOld = this.jAcc; - this.jAcc = clamp(jOld + j, -this.jMax, this.jMax); - j = this.jAcc - jOld; - - // apply impulse - a.w -= j*a.i_inv*this.ratio_inv; - b.w += j*b.i_inv; -}; - -GearJoint.prototype.getImpulse = function() -{ - return Math.abs(this.jAcc); -}; - -GearJoint.prototype.setRatio = function(value) -{ - this.ratio = value; - this.ratio_inv = 1/value; - this.activateBodies(); -}; - -/* Copyright (c) 2007 Scott Lembcke - * - * 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. - */ - -var SimpleMotor = cp.SimpleMotor = function(a, b, rate) -{ - Constraint.call(this, a, b); - - this.rate = rate; - - this.jAcc = 0; - - this.iSum = this.jMax = 0; -}; - -SimpleMotor.prototype = Object.create(Constraint.prototype); - -SimpleMotor.prototype.preStep = function(dt) -{ - // calculate moment of inertia coefficient. - this.iSum = 1/(this.a.i_inv + this.b.i_inv); - - // compute max impulse - this.jMax = this.maxForce * dt; -}; - -SimpleMotor.prototype.applyCachedImpulse = function(dt_coef) -{ - var a = this.a; - var b = this.b; - - var j = this.jAcc*dt_coef; - a.w -= j*a.i_inv; - b.w += j*b.i_inv; -}; - -SimpleMotor.prototype.applyImpulse = function() -{ - var a = this.a; - var b = this.b; - - // compute relative rotational velocity - var wr = b.w - a.w + this.rate; - - // compute normal impulse - var j = -wr*this.iSum; - var jOld = this.jAcc; - this.jAcc = clamp(jOld + j, -this.jMax, this.jMax); - j = this.jAcc - jOld; - - // apply impulse - a.w -= j*a.i_inv; - b.w += j*b.i_inv; -}; - -SimpleMotor.prototype.getImpulse = function() -{ - return Math.abs(this.jAcc); -}; diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index d2c20bb9f1..324a926cb2 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -99,7 +99,6 @@ var jsbSkipModules = [ '../../extensions/dragonbones/CCTextureData', '../../extensions/dragonbones/CCArmatureDisplay', '../../external/box2d/box2d.js', - '../../external/chipmunk/chipmunk.js', ]; exports.buildCocosJs = function (sourceFile, outputFile, excludes, opt_macroFlags, callback) { diff --git a/modules.json b/modules.json index 3a09324285..8e62cf0b36 100644 --- a/modules.json +++ b/modules.json @@ -225,12 +225,6 @@ "./cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js" ] }, - { - "name": "Chipmunk", - "entries": [ - "./external/chipmunk/chipmunk.js" - ] - }, { "name": "Camera", "entries": [ From 13d430fad4239c5e716484f925acecd7ee84199b Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Thu, 22 Feb 2018 17:20:16 +0800 Subject: [PATCH 43/74] add audio uncache for loader --- cocos2d/core/load-pipeline/CCLoader.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index c810c15d29..1833ffb304 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -37,6 +37,8 @@ var ReleasedAssetChecker = CC_DEBUG && require('./released-asset-checker'); var resources = new AssetTable(); +var AUDIO_TYPES = ['mp3', 'ogg', 'wav', 'm4a']; + function getXMLHttpRequest () { return window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('MSXML2.XMLHTTP'); } @@ -764,7 +766,6 @@ proto.release = function (asset) { if (item) { var removed = this.removeItem(id); asset = item.content; - // TODO: AUDIO if (asset instanceof cc.Asset) { if (CC_JSB && asset instanceof cc.SpriteFrame && removed) { // for the "Temporary solution" in deserialize.js @@ -778,6 +779,9 @@ proto.release = function (asset) { else if (asset instanceof cc.Texture2D) { cc.textureCache.removeTextureForKey(item.rawUrl || item.url); } + else if (AUDIO_TYPES.indexOf(item.type) !== -1) { + cc.audioEngine.uncache(item.rawUrl || item.url); + } if (CC_DEBUG && removed) { this._releasedAssetChecker_DEBUG.setReleased(item, id); } From b8d7dc05aa5ce93014a593a071d44838153da108 Mon Sep 17 00:00:00 2001 From: James Chen Date: Sat, 24 Feb 2018 10:45:31 +0800 Subject: [PATCH 44/74] Fixed that we forget to observe onTouchCancelled event. Reported at http://forum.cocos.com/t/touch-bug/56674 . --- cocos2d/core/CCNode.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 0ce9b497ea..0aa6ce9ca3 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -204,6 +204,23 @@ var _touchEndHandler = function (touch, event) { Event.EventTouch.pool.put(event); } }; +var _touchCancelHandler = function (touch, event) { + if (CC_JSB) { + event = Event.EventTouch.pool.get(event); + } + var pos = touch.getLocation(); + var node = this.owner; + + event.type = EventType.TOUCH_CANCEL; + event.touch = touch; + event.bubbles = true; + node.dispatchEvent(event); + if (CC_JSB) { + event.touch = null; + event._touches = null; + Event.EventTouch.pool.put(event); + } +}; var _mouseDownHandler = function (event) { var pos = event.getLocation(); @@ -1191,7 +1208,8 @@ var Node = cc.Class({ mask: _searchMaskInParent(this), onTouchBegan: _touchStartHandler, onTouchMoved: _touchMoveHandler, - onTouchEnded: _touchEndHandler + onTouchEnded: _touchEndHandler, + onTouchCancelled: _touchCancelHandler }); if (CC_JSB) { this._touchListener.retain(); From ac1d21932192a11a29e2043a645e1ef903f883c4 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 24 Feb 2018 16:37:48 +0800 Subject: [PATCH 45/74] Event manager set correct node to dirty when change sibling index --- cocos2d/core/CCNode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 0aa6ce9ca3..5dfcfd284c 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1040,7 +1040,7 @@ var Node = cc.Class({ for (; i < len; i++) { sibling = siblings[i]._sgNode; sibling._arrivalOrder = i; - eventManager._setDirtyForNode(sibling); + eventManager._setDirtyForNode(siblings[i]); } cc.renderer.childrenOrderDirty = true; parent._sgNode._reorderChildDirty = true; From 8dee57c7e309e5c0227740a579aeb07f8aa31a95 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 24 Feb 2018 17:45:02 +0800 Subject: [PATCH 46/74] Exclusivly set webgl antialias option to false --- cocos2d/core/CCGame.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index ae1f056b91..6521016514 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -708,6 +708,7 @@ var game = { if (cc._renderType === game.RENDER_TYPE_WEBGL) { var opts = { 'stencil': true, + 'antialias': false, 'alpha': cc.macro.ENABLE_TRANSPARENT_CANVAS }; if (isWeChatGame) { From f48bd63c3942d88d598e78af877534db0dd57d1c Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 24 Feb 2018 17:50:06 +0800 Subject: [PATCH 47/74] Add explanation for antialias option --- cocos2d/core/CCGame.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index 6521016514..8e80e5cd4e 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -708,6 +708,8 @@ var game = { if (cc._renderType === game.RENDER_TYPE_WEBGL) { var opts = { 'stencil': true, + // MSAA is causing serious performance dropdown on some browsers, + // it's temporarily desactivated until we found correct way to let user customize it. 'antialias': false, 'alpha': cc.macro.ENABLE_TRANSPARENT_CANVAS }; From 56d813634ed93f78adc4ef2f3d2280b3a70d742e Mon Sep 17 00:00:00 2001 From: huangyi Date: Tue, 27 Feb 2018 09:20:58 +0800 Subject: [PATCH 48/74] support MultiTouch to qqplay for fireball/issues/6879 --- cocos2d/core/platform/BKInputManager.js | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/cocos2d/core/platform/BKInputManager.js b/cocos2d/core/platform/BKInputManager.js index 810068ff6d..2d451b77d5 100644 --- a/cocos2d/core/platform/BKInputManager.js +++ b/cocos2d/core/platform/BKInputManager.js @@ -212,15 +212,6 @@ if (CC_QQPLAY) { * @return {Object} */ getHTMLElementPosition: function (element) { - if (sys.platform === sys.WECHAT_GAME) { - return { - left: 0, - top: 0, - width: window.innerWidth, - height: window.innerHeight - }; - } - var docElem = document.documentElement; var leftOffset = window.pageXOffset - docElem.clientLeft; var topOffset = window.pageYOffset - docElem.clientTop; @@ -329,14 +320,9 @@ if (CC_QQPLAY) { y: event.pageY }; - if (sys.platform === sys.WECHAT_GAME) { - pos.left = 0; - pos.top = 0; - } - else { - pos.left -= document.body.scrollLeft; - pos.top -= document.body.scrollTop; - } + pos.left -= document.body.scrollLeft; + pos.top -= document.body.scrollTop; + return { x: event.clientX, y: event.clientY @@ -360,8 +346,8 @@ if (CC_QQPLAY) { var location = locView.convertToLocationInView(touch_event.x, touch_event.y, this._relatedPos); location.y = cc.game.canvas.height - location.y; - if (touch_event.identifier != null) { - touch = new cc.Touch(location.x, location.y, touch_event.identifier); + if (touch_event.id != null) { + touch = new cc.Touch(location.x, location.y, touch_event.id); //use Touch Pool preLocation = this.getPreTouch(touch).getLocation(); touch._setPrevPoint(preLocation.x, preLocation.y); From 8f89d9dc32d357d11c4f07bc96c76f725409d5d4 Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 27 Feb 2018 09:53:34 +0800 Subject: [PATCH 49/74] Audio - Prevent repeated callbacks --- cocos2d/audio/CCAudio.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 8d446f2375..694f83e101 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -44,6 +44,8 @@ var Audio = function (src) { this._state = Audio.State.INITIALZING; this._loaded = false; + this._preloadSrc = null; + this._onended = function () { this.emit('ended'); }.bind(this); @@ -89,6 +91,11 @@ Audio.State = { proto.preload = function () { var src = this._src, audio = this; + if (this._preloadSrc === src) { + return; + } + this._preloadSrc = src; + if (!src) { this._src = ''; this._audioType = Audio.Type.UNKNOWN; From 8880e8e7da2573a71f30dcca84d7bc04bab1f04b Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 27 Feb 2018 10:08:01 +0800 Subject: [PATCH 50/74] Interrupt callback when _src changes. --- cocos2d/audio/CCAudio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 694f83e101..93dc5ffb5d 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -114,7 +114,7 @@ Audio.State = { // If the resource does not exist if (!item || !item.complete) { return cc.loader.load(src, function (error) { - if (!error) { + if (!error && src === audio._src) { var item = cc.loader.getItem(src); audio.mount(item.element || item.buffer); audio.emit('load'); From fdf6f15d98def6aca605da58427b4a45d8b0099a Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 27 Feb 2018 10:33:00 +0800 Subject: [PATCH 51/74] review code --- cocos2d/audio/CCAudio.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 93dc5ffb5d..acc2b101b8 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -44,7 +44,7 @@ var Audio = function (src) { this._state = Audio.State.INITIALZING; this._loaded = false; - this._preloadSrc = null; + this._isLoading = false; this._onended = function () { this.emit('ended'); @@ -91,10 +91,10 @@ Audio.State = { proto.preload = function () { var src = this._src, audio = this; - if (this._preloadSrc === src) { + if (this._isLoading) { return; } - this._preloadSrc = src; + this._isLoading = true; if (!src) { this._src = ''; @@ -280,6 +280,9 @@ Audio.State = { return this._src; }); proto.__defineSetter__('src', function (string) { + if (string !== this._src) { + this._isLoading = false; + } return this._src = string; }); From 44804e6103517aa4669554c1d3d8dfc2ce9946f4 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Tue, 27 Feb 2018 11:50:38 +0800 Subject: [PATCH 52/74] fixed animation lastframe event --- cocos2d/animation/animation-state.js | 34 +++++++++------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/cocos2d/animation/animation-state.js b/cocos2d/animation/animation-state.js index 97a58064f1..2229c9645c 100644 --- a/cocos2d/animation/animation-state.js +++ b/cocos2d/animation/animation-state.js @@ -204,23 +204,14 @@ function process () { var cache = this._hasListenerCache; if (cache && cache['lastframe']) { var lastInfo; - if (!lastInfo) { + if (!this._lastWrappedInfo) { lastInfo = this._lastWrappedInfo = new WrappedInfo(info); + } else { + lastInfo = this._lastWrappedInfo; } - if (this.repeatCount > 1 && - ((info.iterations | 0) > (lastInfo.iterations | 0)) // another iterations - ) { - if ((this.wrapMode & WrapModeMask.Reverse) === WrapModeMask.Reverse) { - if (lastInfo.direction < 0) { - this.emit('lastframe', this); - } - } - else { - if (lastInfo.direction > 0) { - this.emit('lastframe', this); - } - } + if (this.repeatCount > 1 && ((info.iterations | 0) > (lastInfo.iterations | 0))) { + this.emit('lastframe', this); } lastInfo.set(info); @@ -230,7 +221,7 @@ function process () { this.stop(); this.emit('finished', this); } -}; +} function simpleProcess () { var time = this.time; @@ -242,7 +233,7 @@ function simpleProcess () { } else if (time < 0) { time = time % duration; - if (time !== 0 ) time += duration; + if (time !== 0) time += duration; } var ratio = time / duration; @@ -255,18 +246,15 @@ function simpleProcess () { var cache = this._hasListenerCache; if (cache && cache['lastframe']) { - var currentIterations = time > 0 ? (time / duration) : -(time / duration); - - var lastIterations = this._lastIterations; - if (lastIterations === undefined) { - lastIterations = this._lastIterations = currentIterations; + if (this._lastIterations === undefined) { + this._lastIterations = ratio; } - if ((currentIterations | 0) > (lastIterations | 0)) { + if ((this.time > 0 && this._lastIterations > ratio) || (this.time < 0 && this._lastIterations < ratio)) { this.emit('lastframe', this); } - this._lastIterations = currentIterations; + this._lastIterations = ratio; } } From d6c1c5a0283399384b6770ff9278dfe713333328 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Tue, 27 Feb 2018 17:12:30 +0800 Subject: [PATCH 53/74] fix action.repeatForever on native --- README.md | 2 +- jsb/jsb-action.js | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 45f2f6b14b..605d650f9d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The framework is naturally integrated with Cocos Creator, so it's not designed t ### Prerequisite -- Install [node.js v4.2.1+](https://nodejs.org/) +- Install [node.js v8.0+](https://nodejs.org/) - Install [gulp-cli v3.9.0+](https://github.com/gulpjs/gulp/blob/master/docs/getting-started.md) ### Install diff --git a/jsb/jsb-action.js b/jsb/jsb-action.js index fe49f619ff..85ac45f4aa 100644 --- a/jsb/jsb-action.js +++ b/jsb/jsb-action.js @@ -424,5 +424,17 @@ var actionUpdate = { for (var key in actionUpdate) { var action = cc[key]; - action.prototype.update = actionUpdate[key]; + var prototype = action.prototype; + prototype.update = actionUpdate[key]; + + // polyfill to preserve chainable binding object + prototype.speed = function (speed) { + return new cc.Speed(this, speed); + }; + prototype.repeat = function (times) { + return new cc.Repeat(this, times); + }; + prototype.repeatForever = function () { + return new cc.RepeatForever(this); + }; } \ No newline at end of file From 86cfa26baff9d70b207f670dcfa607a7192cb996 Mon Sep 17 00:00:00 2001 From: Cocos Ass Date: Fri, 2 Mar 2018 11:29:39 +0800 Subject: [PATCH 54/74] forbid Hierarchy change test example add a new test in test-component-scheduler.js forbid Hierarchy change part and example update data make my local file get reset forbid Hierarchy change part test example update a new test content about setSiblingIndex change the report of error test --- DebugInfos.js | 1 + cocos2d/core/utils/base-node.js | 11 +++ .../unit-es5/test-component-scheduler.js | 79 +++++++++++++++++++ 3 files changed, 91 insertions(+) diff --git a/DebugInfos.js b/DebugInfos.js index dbb8e5381f..808ca6d68c 100644 --- a/DebugInfos.js +++ b/DebugInfos.js @@ -410,6 +410,7 @@ if (CC_DEBUG) { "3818": "Failed to read or parse project.json", //_loadConfig "3819": "Warning: target element is not a DIV or CANVAS", //_initRenderer "3820": "The renderer doesn't support the renderMode %s", //_initRenderer + "3821": "Cannot change hierarchy while activating or deactivating nodes.", //Animation: 3900 "3900": "Invalid clip to add", //addClip "3901": "Invalid clip to remove", //removeClip diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 60fbd34153..8c649c991b 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -33,6 +33,7 @@ var eventManager = require('../event-manager'); var JS = cc.js; var Destroying = Flags.Destroying; var DontDestroy = Flags.DontDestroy; +var Deactivating = Flags.Deactivating; var CHILD_ADDED = 'child-added'; var CHILD_REMOVED = 'child-removed'; @@ -366,10 +367,16 @@ var BaseNode = cc.Class({ this._onSetParent(value); + if (CC_DEBUG && (this._objFlags & Deactivating)) { + cc.errorID(3821); + } if (value) { if (!CC_JSB) { eventManager._setDirtyForNode(this); } + if (CC_DEBUG && (value._objFlags & Deactivating)) { + cc.errorID(3821); + } value._children.push(this); value.emit(CHILD_ADDED, this); } @@ -551,6 +558,10 @@ var BaseNode = cc.Class({ if (!this._parent) { return; } + if ((this._parent._objFlags & Deactivating)) { + cc.errorID(3821); + return; + } var siblings = this._parent._children; index = index !== -1 ? index : siblings.length - 1; var oldIndex = siblings.indexOf(this); diff --git a/test/qunit/unit-es5/test-component-scheduler.js b/test/qunit/unit-es5/test-component-scheduler.js index 5426f979e5..4f60b7bd3e 100644 --- a/test/qunit/unit-es5/test-component-scheduler.js +++ b/test/qunit/unit-es5/test-component-scheduler.js @@ -165,6 +165,85 @@ test('disable component during onEnable', function () { childComp.onEnable.once('could re-enable component'); }); +test('change parent during onDisable', function () { + + var rootNode , preNode , testNode , child , childComp; + + var vendorError = cc.errorID; + cc.errorID = new Callback().enable(); + + //Pattern one : the Hierarchy change during onDisable + + var nodes1 = createNodes({ + preNode: {}, + testNode: { + comps: cc.Component, + }, + }); + rootNode = nodes1.root; + preNode = nodes1.preNode; + testNode = nodes1.testNode; + testNodeComp = nodes1.testNodeComps[0]; + + testNodeComp.onDisable = function() { + testNode.parent = preNode; + }; + + nodes1.attachToScene(); + + testNode.active = false; + cc.errorID.once('Should report error when changing target node\'s parent during its deactivation'); + + //Pattern two : the Hierarchy change during onDisable + + var nodes2 = createNodes({ + preNode: {}, + testNode: { + comps: cc.Component, + }, + }); + rootNode = nodes2.root; + preNode = nodes2.preNode; + testNode = nodes2.testNode; + testNodeComp = nodes2.testNodeComps[0]; + + testNodeComp.onDisable = function() { + preNode.parent = testNode; + } + + nodes2.attachToScene(); + + testNode.active = false; + cc.errorID.once('Should report error when append new child to a target node during its deactivation'); + + //Pattern three : the Hierarchy change during onDisable + + var nodes3 = createNodes({ + testNode: { + child1: { + comps: cc.Component, + }, + child2: {} + }, + }); + rootNode = nodes3.root; + testNode = nodes3.testNode; + child1 = nodes3.child1; + child1Comp = nodes3.child1Comps[0]; + child2 = nodes3.child2; + + child1Comp.onDisable = function() { + child1.setSiblingIndex(1); + }; + + nodes3.attachToScene(); + + testNode.active = false; + cc.errorID.once('Should report error when setting node\'s sibling index during its parent\'s deactivation'); + + cc.errorID = vendorError; +}); + (function () { // Test deactivate during activating or conversely From 7a0bf554dd3e7c26b15b37a8970c675c0e07d1bb Mon Sep 17 00:00:00 2001 From: PP Date: Fri, 2 Mar 2018 18:29:34 +0800 Subject: [PATCH 55/74] fixed fnt parser --- cocos2d/core/label/CCSGLabel.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cocos2d/core/label/CCSGLabel.js b/cocos2d/core/label/CCSGLabel.js index 7f0acc8818..7c5b32ec43 100644 --- a/cocos2d/core/label/CCSGLabel.js +++ b/cocos2d/core/label/CCSGLabel.js @@ -1173,16 +1173,16 @@ _ccsg.Label = _ccsg.Node.extend({ var tempRect = locFontDict[fontDef].rect; - letterDefinition._offsetX = locFontDict[fontDef].xOffset; - letterDefinition._offsetY = locFontDict[fontDef].yOffset; - letterDefinition._width = tempRect.width; - letterDefinition._height = tempRect.height; - letterDefinition._u = tempRect.x + this._imageOffset.x; - letterDefinition._v = tempRect.y + this._imageOffset.y; + letterDefinition._offsetX = parseInt(locFontDict[fontDef].xOffset); + letterDefinition._offsetY = parseInt(locFontDict[fontDef].yOffset); + letterDefinition._width = parseInt(tempRect.width); + letterDefinition._height = parseInt(tempRect.height); + letterDefinition._u = parseInt(tempRect.x) + this._imageOffset.x; + letterDefinition._v = parseInt(tempRect.y) + this._imageOffset.y; //FIXME: only one texture supported for now letterDefinition._textureID = 0; letterDefinition._validDefinition = true; - letterDefinition._xAdvance = locFontDict[fontDef].xAdvance; + letterDefinition._xAdvance = parseInt(locFontDict[fontDef].xAdvance); this._fontAtlas.addLetterDefinitions(fontDef, letterDefinition); } From 5ebcef848cba87a8d3a6dc68440fc98ed8259fce Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Sat, 3 Mar 2018 00:23:41 +0800 Subject: [PATCH 56/74] improve test of changing hierarchy during onDisable --- DebugInfos.js | 2 +- cocos2d/core/utils/base-node.js | 16 +- .../unit-es5/test-component-scheduler.js | 140 +++++++++++------- 3 files changed, 95 insertions(+), 63 deletions(-) diff --git a/DebugInfos.js b/DebugInfos.js index 808ca6d68c..07725313e1 100644 --- a/DebugInfos.js +++ b/DebugInfos.js @@ -410,7 +410,7 @@ if (CC_DEBUG) { "3818": "Failed to read or parse project.json", //_loadConfig "3819": "Warning: target element is not a DIV or CANVAS", //_initRenderer "3820": "The renderer doesn't support the renderMode %s", //_initRenderer - "3821": "Cannot change hierarchy while activating or deactivating nodes.", + "3821": "Cannot change hierarchy while activating or deactivating the parent.", //Animation: 3900 "3900": "Invalid clip to add", //addClip "3901": "Invalid clip to remove", //removeClip diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 8c649c991b..cd5479bda4 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -361,22 +361,22 @@ var BaseNode = cc.Class({ return; } } - // var oldParent = this._parent; + if (CC_DEBUG && oldParent && (oldParent._objFlags & Deactivating)) { + cc.errorID(3821); + } + // this._parent = value || null; this._onSetParent(value); - if (CC_DEBUG && (this._objFlags & Deactivating)) { - cc.errorID(3821); - } if (value) { + if (CC_DEBUG && (value._objFlags & Deactivating)) { + cc.errorID(3821); + } if (!CC_JSB) { eventManager._setDirtyForNode(this); } - if (CC_DEBUG && (value._objFlags & Deactivating)) { - cc.errorID(3821); - } value._children.push(this); value.emit(CHILD_ADDED, this); } @@ -558,7 +558,7 @@ var BaseNode = cc.Class({ if (!this._parent) { return; } - if ((this._parent._objFlags & Deactivating)) { + if (this._parent._objFlags & Deactivating) { cc.errorID(3821); return; } diff --git a/test/qunit/unit-es5/test-component-scheduler.js b/test/qunit/unit-es5/test-component-scheduler.js index 4f60b7bd3e..c5c8974889 100644 --- a/test/qunit/unit-es5/test-component-scheduler.js +++ b/test/qunit/unit-es5/test-component-scheduler.js @@ -165,81 +165,113 @@ test('disable component during onEnable', function () { childComp.onEnable.once('could re-enable component'); }); -test('change parent during onDisable', function () { - - var rootNode , preNode , testNode , child , childComp; - +test('change hierarchy during own deactivation', function () { var vendorError = cc.errorID; - cc.errorID = new Callback().enable(); - - //Pattern one : the Hierarchy change during onDisable + cc.errorID = new Callback(); var nodes1 = createNodes({ preNode: {}, testNode: { comps: cc.Component, }, - }); - rootNode = nodes1.root; - preNode = nodes1.preNode; - testNode = nodes1.testNode; - testNodeComp = nodes1.testNodeComps[0]; - - testNodeComp.onDisable = function() { - testNode.parent = preNode; - }; - - nodes1.attachToScene(); - - testNode.active = false; - cc.errorID.once('Should report error when changing target node\'s parent during its deactivation'); - - //Pattern two : the Hierarchy change during onDisable - - var nodes2 = createNodes({ - preNode: {}, - testNode: { + testNode2: { comps: cc.Component, }, }); - rootNode = nodes2.root; - preNode = nodes2.preNode; - testNode = nodes2.testNode; - testNodeComp = nodes2.testNodeComps[0]; + nodes1.attachToScene(); - testNodeComp.onDisable = function() { - preNode.parent = testNode; - } + cc.errorID.disable('Should allow change hierarchy during own deactivation'); - nodes2.attachToScene(); + nodes1.testNodeComps[0].onDisable = function() { + this.node.parent = nodes1.preNode; + }; + nodes1.testNode.active = false; - testNode.active = false; - cc.errorID.once('Should report error when append new child to a target node during its deactivation'); + nodes1.testNode2Comps[0].onDisable = function() { + this.node.parent = null; + }; + nodes1.testNode2.active = false; - //Pattern three : the Hierarchy change during onDisable + expect(0); - var nodes3 = createNodes({ - testNode: { - child1: { + cc.errorID = vendorError; +}); + +test('change hierarchy during parent\'s deactivation', function () { + var vendorError = cc.errorID; + cc.errorID = new Callback().enable(); + + var nodes = createNodes({ + parent1: { + preNode: {}, + testNode1: { + comps: cc.Component, + }, + }, + parent2: { + testNode2: { + comps: cc.Component, + }, + }, + parent3: { + testNode3: { comps: cc.Component, }, - child2: {} }, }); - rootNode = nodes3.root; - testNode = nodes3.testNode; - child1 = nodes3.child1; - child1Comp = nodes3.child1Comps[0]; - child2 = nodes3.child2; + nodes.attachToScene(); - child1Comp.onDisable = function() { - child1.setSiblingIndex(1); + nodes.testNode1Comps[0].onDisable = function() { + this.node.parent = nodes.preNode; }; - - nodes3.attachToScene(); - - testNode.active = false; - cc.errorID.once('Should report error when setting node\'s sibling index during its parent\'s deactivation'); + nodes.parent1.active = false; + cc.errorID.once('Should report error if change child'); + + nodes.testNode2Comps[0].onDisable = function() { + this.node.parent = null; + }; + nodes.parent2.active = false; + cc.errorID.once('Should report error if detach child'); + + nodes.testNode3Comps[0].onDisable = function() { + this.node.parent.addChild(new cc.Node()); + }; + nodes.parent3.active = false; + cc.errorID.once('Should report error if add child'); + + cc.errorID = vendorError; +}); + +test('set sibling index during onDisable', function () { + var vendorError = cc.errorID; + cc.errorID = new Callback().enable(); + + var nodes = createNodes({ + parent: { + node1: { + comps: cc.Component, + }, + node: {} + }, + node2: { + comps: cc.Component, + } + }); + var node1Comp = nodes.node1Comps[0]; + var node2Comp = nodes.node2Comps[0]; + node1Comp.onDisable = function() { + this.node.setSiblingIndex(1); + }; + node2Comp.onDisable = function() { + this.node.setSiblingIndex(0); + }; + nodes.attachToScene(); + + nodes.parent.active = false; + cc.errorID.once('Should report error when setting node\'s sibling index during its parent\'s deactivation'); + + cc.errorID.disable('Should allow setting node\'s sibling index during its deactivation'); + nodes.node2.active = false; cc.errorID = vendorError; }); From 535dbabaa5162ba1703c109c99f57542e8295a76 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Sat, 3 Mar 2018 16:21:52 +0800 Subject: [PATCH 57/74] restore eventManager api --- cocos2d/core/event-manager/CCEventManager.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/cocos2d/core/event-manager/CCEventManager.js b/cocos2d/core/event-manager/CCEventManager.js index ee65db2fff..284938e206 100644 --- a/cocos2d/core/event-manager/CCEventManager.js +++ b/cocos2d/core/event-manager/CCEventManager.js @@ -85,22 +85,23 @@ var __getListenerID = function (event) { return ""; }; -/* +/** * !#en - *

- * cc.eventManager is a singleton object which manages event listener subscriptions and event dispatching.
- *
- * The EventListener list is managed in such way so that event listeners can be added and removed
- * while events are being dispatched. - *

+ * This class has been deprecated, please use cc.systemEvent or cc.EventTarget instead. See [Listen to and launch events](../../../manual/en/scripting/events.md) for details.
+ *
+ * cc.eventManager is a singleton object which manages event listener subscriptions and event dispatching. + * The EventListener list is managed in such way so that event listeners can be added and removed + * while events are being dispatched. + * * !#zh + * 该类已废弃,请使用 cc.systemEvent 或 cc.EventTarget 代替,详见 [监听和发射事件](../../../manual/zh/scripting/events.md)。
+ *
* 事件管理器,它主要管理事件监听器注册和派发系统事件。 - * 原始设计中,它支持鼠标,触摸,键盘,陀螺仪和自定义事件。 - * 在 Creator 的设计中,鼠标,触摸和自定义事件的监听和派发请参考 http://cocos.com/docs/creator/scripting/events.html。 * * @class eventManager * @static * @example {@link utils/api/engine/docs/cocos2d/core/event-manager/CCEventManager/addListener.js} + * @deprecated */ var eventManager = { //Priority dirty flag From 337e0c8be284068e9e106065dc527e0675e84eeb Mon Sep 17 00:00:00 2001 From: knox Date: Tue, 6 Mar 2018 14:59:42 +0800 Subject: [PATCH 58/74] disabled CC_SUPPORT_JIT for qqplay --- index.js | 2 +- jsb/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 8cc1e9159c..e8dc964b49 100644 --- a/index.js +++ b/index.js @@ -136,7 +136,7 @@ defineMacro('CC_JSB', defined('jsb')); defineMacro('CC_BUILD', false); defineMacro('CC_WECHATGAME', false); defineMacro('CC_QQPLAY', false); -defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); +defineMacro('CC_SUPPORT_JIT', !(CC_WECHATGAME || CC_QQPLAY)); // PREDEFINE diff --git a/jsb/index.js b/jsb/index.js index 2231f5c5ad..9d09b57bcf 100644 --- a/jsb/index.js +++ b/jsb/index.js @@ -46,7 +46,7 @@ defineMacro('CC_JSB', defined('jsb')); defineMacro('CC_BUILD', false); defineMacro('CC_WECHATGAME', false); defineMacro('CC_QQPLAY', false); -defineMacro('CC_SUPPORT_JIT', !CC_WECHATGAME); +defineMacro('CC_SUPPORT_JIT', !(CC_WECHATGAME || CC_QQPLAY)); if (!cc.ClassManager) { From 141d2a1d0988f825ea8756dd3902b76f36a8a250 Mon Sep 17 00:00:00 2001 From: knox Date: Tue, 6 Mar 2018 15:04:38 +0800 Subject: [PATCH 59/74] update disabled CC_SUPPORT_JIT --- gulp/util/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulp/util/utils.js b/gulp/util/utils.js index ec8d63f96d..3c896b00c3 100644 --- a/gulp/util/utils.js +++ b/gulp/util/utils.js @@ -36,7 +36,7 @@ exports.getMacros = function (platform, flags) { // debug macros res['CC_DEV'] = res['CC_EDITOR'] || res['CC_PREVIEW'] || res['CC_TEST']; res['CC_DEBUG'] = res['CC_DEBUG'] || res['CC_DEV']; - res['CC_SUPPORT_JIT'] = !res['CC_WECHATGAME']; + res['CC_SUPPORT_JIT'] = !(res['CC_WECHATGAME'] || res['CC_QQPLAY']); return res; }; From 02effd8f925d59befb988ef5758e8f985fc53f83 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Tue, 6 Mar 2018 20:42:56 +0800 Subject: [PATCH 60/74] fix webview visibility on iOS 9/10 Safari --- README.md | 4 ++-- cocos2d/core/platform/deserialize.js | 2 +- cocos2d/core/webview/CCSGWebView.js | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 45f2f6b14b..5be532fd9d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The framework is naturally integrated with Cocos Creator, so it's not designed t ### Prerequisite -- Install [node.js v4.2.1+](https://nodejs.org/) +- Install [node.js v8.0.0+](https://nodejs.org/) - Install [gulp-cli v3.9.0+](https://github.com/gulpjs/gulp/blob/master/docs/getting-started.md) ### Install @@ -38,7 +38,7 @@ gulp build #### Prerequisite - Install [express](http://expressjs.com/): `npm install express` - - Install gulp-qunit: `npm install gulp-qunit@1.3.0` + - Install gulp-qunit: `npm install gulp-qunit` #### Unit Test diff --git a/cocos2d/core/platform/deserialize.js b/cocos2d/core/platform/deserialize.js index e72c163f97..3b3efc58d0 100644 --- a/cocos2d/core/platform/deserialize.js +++ b/cocos2d/core/platform/deserialize.js @@ -551,7 +551,7 @@ var _Deserializer = (function () { } else { var defaultType = typeof defaultValue; - isPrimitiveType = (defaultType === 'string' && !attrs[propName + SAVE_URL_AS_ASSET]) || + isPrimitiveType = (defaultType === 'string' && !stillUseUrl) || defaultType === 'number' || defaultType === 'boolean'; } diff --git a/cocos2d/core/webview/CCSGWebView.js b/cocos2d/core/webview/CCSGWebView.js index fc178693ac..1d9fbe32e3 100644 --- a/cocos2d/core/webview/CCSGWebView.js +++ b/cocos2d/core/webview/CCSGWebView.js @@ -207,10 +207,12 @@ _ccsg.WebView.EventType = { var polyfill = _ccsg.WebView._polyfill = { devicePixelRatio: false, - enableDiv: false + enableDiv: false, + enableBG: false, + closeHistory: true }; - if (cc.sys.os === cc.sys.OS_IOS) + if (cc.sys.os === cc.sys.OS_IOS || cc.sys.browserType === cc.sys.BROWSER_TYPE_SAFARI) polyfill.enableDiv = true; if (cc.sys.isMobile) { @@ -312,8 +314,8 @@ _ccsg.WebView.EventType = { }; proto.initStyle = function () { - if (!this._div) return; var div = this._div; + if (!div) return; div.style.position = "absolute"; div.style.bottom = "0px"; div.style.left = "0px"; @@ -383,14 +385,13 @@ _ccsg.WebView.EventType = { }; proto.updateVisibility = function () { - var node = this._node; - if (!this._div) return; var div = this._div; - if (node.visible) { - div.style.visibility = 'visible'; - } - else { - div.style.visibility = 'hidden'; + if (!div) return; + var visible = this._node.visible; + div.style.visibility = visible ? '' : 'hidden'; + if (div !== this._iframe) { + // fix visibility on iOS 9/10 Safari + this._iframe.style.display = visible ? '' : 'none'; } }; From b65545d8f466ade88a63e33feda13d90525585c4 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Wed, 7 Mar 2018 15:28:19 +0800 Subject: [PATCH 61/74] minor tweak --- cocos2d/core/webview/CCSGWebView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/webview/CCSGWebView.js b/cocos2d/core/webview/CCSGWebView.js index 1d9fbe32e3..c6775ff4ed 100644 --- a/cocos2d/core/webview/CCSGWebView.js +++ b/cocos2d/core/webview/CCSGWebView.js @@ -209,7 +209,7 @@ _ccsg.WebView.EventType = { devicePixelRatio: false, enableDiv: false, enableBG: false, - closeHistory: true + closeHistory: false }; if (cc.sys.os === cc.sys.OS_IOS || cc.sys.browserType === cc.sys.BROWSER_TYPE_SAFARI) From 32175eecc4faf0abf67281b78696d8535be2d231 Mon Sep 17 00:00:00 2001 From: PP Date: Thu, 8 Mar 2018 15:34:38 +0800 Subject: [PATCH 62/74] add align ONCE_WINDOW_RESIZED to widget some changes in widget alignMode defined AlignMode in CCWidgetManager.js inspector edit --- cocos2d/core/base-ui/CCWidgetManager.js | 45 +++++++++++++++++++++++-- cocos2d/core/components/CCWidget.js | 28 +++++++++++++-- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index c683715bfb..cbea69c795 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -33,6 +33,12 @@ var RIGHT = 1 << 5; var HORIZONTAL = LEFT | CENTER | RIGHT; var VERTICAL = TOP | MID | BOT; +var AlignMode = cc.Enum({ + ONCE: 0, + ON_WINDOW_RESIZED: 1, + ALWAYS: 2, +}); + // returns a readonly size of the node function getReadonlyNodeSize (parent) { if (parent instanceof cc.Scene) { @@ -234,7 +240,7 @@ function visitNode (node) { } } align(node, widget); - if ((!CC_EDITOR || animationState.animatedSinceLastFrame) && widget.isAlignOnce) { + if ((!CC_EDITOR || animationState.animatedSinceLastFrame) && widget.alignMode !== AlignMode.ALWAYS) { widget.enabled = false; } else { @@ -435,6 +441,21 @@ var widgetManager = cc._widgetManager = module.exports = { init: function (director) { director.on(cc.Director.EVENT_BEFORE_VISIT, refreshScene); + + if (CC_EDITOR) { + cc.engine.on('design-resolution-changed', this.onResized.bind(this)); + } + else if (!CC_JSB) { + if (cc.sys.isMobile) { + window.addEventListener('resize', this.onResized.bind(this)); + } + else { + cc.eventManager.addCustomListener('canvas-resize', this.onResized.bind(this)); + } + } + else { + cc.eventManager.addListener(this.onResized.bind(this), 1); + } }, add: function (widget) { widget.node._widget = widget; @@ -452,7 +473,27 @@ var widgetManager = cc._widgetManager = module.exports = { widget.node.off('size-changed', adjustWidgetToAllowResizingInEditor, widget); } }, - updateAlignment: updateAlignment + onResized() { + var scene = cc.director.getScene(); + if (scene) { + this.refreshWidgetOnResized(scene); + } + }, + refreshWidgetOnResized(node){ + var widget = cc.Node.isNode(node) && node.getComponent(cc.Widget); + if (widget) { + if (widget.alignMode === AlignMode.ON_WINDOW_RESIZED) { + widget.enabled = true; + } + } + var children = node._children; + for (var i = 0; i < children.length; i++) { + var child = children[i]; + this.refreshWidgetOnResized(child); + } + }, + updateAlignment: updateAlignment, + AlignMode: AlignMode, }; if (CC_EDITOR) { diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index e6abb4ec5e..99a1da50ff 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -488,9 +488,27 @@ var Widget = cc.Class({ * @default false */ isAlignOnce: { - default: true, - tooltip: CC_DEV && 'i18n:COMPONENT.widget.align_once', - displayName: "AlignOnce" + get: function () { + return this.alignMode === WidgetManager.AlignMode.ONCE; + }, + set: function (value) { + this.alignMode = value ? WidgetManager.AlignMode.ONCE : WidgetManager.AlignMode.ALWAYS; + }, + visible: false, + }, + + /** + * !#en specify the align mode + * !#zh 指定对齐模式 + * @property alignMode + * @type {Widget.AlignMode} + * @example + * widget.alignMode = cc.Widget.AlignMode.ON_WINDOW_RESIZED + */ + alignMode: { + default: WidgetManager.AlignMode.ON_WINDOW_RESIZED, + type: WidgetManager.AlignMode, + tooltip: CC_DEV && 'i18n:COMPONENT.widget.align_mode', }, // @@ -525,6 +543,10 @@ var Widget = cc.Class({ _originalHeight: 0 }, + statics: { + AlignMode: WidgetManager.AlignMode, + }, + onEnable: function () { WidgetManager.add(this); }, From f750a575f1d7dfa87e9402ccf455e37f4b02a73e Mon Sep 17 00:00:00 2001 From: PP Date: Thu, 8 Mar 2018 15:44:18 +0800 Subject: [PATCH 63/74] deal with the compatibility of alignMode --- cocos2d/core/base-ui/CCWidgetManager.js | 7 +++++- cocos2d/core/components/CCWidget.js | 32 +++++++++++++++++++++---- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index cbea69c795..a07ead35db 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -242,6 +242,7 @@ function visitNode (node) { align(node, widget); if ((!CC_EDITOR || animationState.animatedSinceLastFrame) && widget.alignMode !== AlignMode.ALWAYS) { widget.enabled = false; + widget._isUserDisable = false; } else { activeWidgets.push(widget); @@ -302,6 +303,7 @@ function refreshScene () { if (widget.isAlignOnce && animationState.animatedSinceLastFrame && node.isChildOf(editingNode)) { // widget contains in activeWidgets should aligned at least once widget.enabled = false; + widget._isUserDisable = false; } else { align(node, widget); @@ -483,7 +485,10 @@ var widgetManager = cc._widgetManager = module.exports = { var widget = cc.Node.isNode(node) && node.getComponent(cc.Widget); if (widget) { if (widget.alignMode === AlignMode.ON_WINDOW_RESIZED) { - widget.enabled = true; + if (widget._isUserDisable === false){ + widget.enabled = true; + widget._isUserDisable = true; + } } } var children = node._children; diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index 99a1da50ff..f17a1fedcc 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -25,6 +25,7 @@ ****************************************************************************/ var WidgetManager = require('../base-ui/CCWidgetManager'); +var AlignMode = WidgetManager.AlignMode; var AlignFlags = WidgetManager._AlignFlags; var TOP = AlignFlags.TOP; var MID = AlignFlags.MID; @@ -489,13 +490,23 @@ var Widget = cc.Class({ */ isAlignOnce: { get: function () { - return this.alignMode === WidgetManager.AlignMode.ONCE; + if (CC_DEV) { + cc.warn('cc.Widget.isAlignOnce is deprecated, use alignMode instead please.'); + } + return this.alignMode === AlignMode.ONCE; }, set: function (value) { - this.alignMode = value ? WidgetManager.AlignMode.ONCE : WidgetManager.AlignMode.ALWAYS; + if (CC_DEV) { + cc.warn('cc.Widget.isAlignOnce is deprecated, use alignMode instead please.'); + } + this.alignMode = value ? AlignMode.ONCE : AlignMode.ALWAYS; }, visible: false, }, + _wasAlignOnce: { + default: undefined, + formerlySerializedAs: 'isAlignOnce', + }, /** * !#en specify the align mode @@ -506,8 +517,8 @@ var Widget = cc.Class({ * widget.alignMode = cc.Widget.AlignMode.ON_WINDOW_RESIZED */ alignMode: { - default: WidgetManager.AlignMode.ON_WINDOW_RESIZED, - type: WidgetManager.AlignMode, + default: AlignMode.ON_WINDOW_RESIZED, + type: AlignMode, tooltip: CC_DEV && 'i18n:COMPONENT.widget.align_mode', }, @@ -537,6 +548,7 @@ var Widget = cc.Class({ _isAbsBottom: true, _isAbsHorizontalCenter: true, _isAbsVerticalCenter: true, + _isUserDisable: true, // original size before align _originalWidth: 0, @@ -544,9 +556,19 @@ var Widget = cc.Class({ }, statics: { - AlignMode: WidgetManager.AlignMode, + AlignMode: AlignMode, }, + onLoad: function() { + if (this._wasAlignOnce !== undefined){ + if (this._wasAlignOnce === true){ + this.alignMode = AlignMode.ONCE; + }else if (this._wasAlignOnce === false){ + this.alignMode = AlignMode.ALWAYS; + } + this._wasAlignOnce = undefined; + } + }, onEnable: function () { WidgetManager.add(this); }, From 9c269c972d621a786ad3597ef9bc9c01daf7263b Mon Sep 17 00:00:00 2001 From: PP Date: Thu, 8 Mar 2018 17:08:29 +0800 Subject: [PATCH 64/74] delete _isUserDisable --- cocos2d/core/base-ui/CCWidgetManager.js | 12 ++++-------- cocos2d/core/components/CCWidget.js | 26 +++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index a07ead35db..1f19a29ec2 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -242,7 +242,6 @@ function visitNode (node) { align(node, widget); if ((!CC_EDITOR || animationState.animatedSinceLastFrame) && widget.alignMode !== AlignMode.ALWAYS) { widget.enabled = false; - widget._isUserDisable = false; } else { activeWidgets.push(widget); @@ -303,7 +302,6 @@ function refreshScene () { if (widget.isAlignOnce && animationState.animatedSinceLastFrame && node.isChildOf(editingNode)) { // widget contains in activeWidgets should aligned at least once widget.enabled = false; - widget._isUserDisable = false; } else { align(node, widget); @@ -475,22 +473,20 @@ var widgetManager = cc._widgetManager = module.exports = { widget.node.off('size-changed', adjustWidgetToAllowResizingInEditor, widget); } }, - onResized() { + onResized () { var scene = cc.director.getScene(); if (scene) { this.refreshWidgetOnResized(scene); } }, - refreshWidgetOnResized(node){ + refreshWidgetOnResized (node) { var widget = cc.Node.isNode(node) && node.getComponent(cc.Widget); if (widget) { if (widget.alignMode === AlignMode.ON_WINDOW_RESIZED) { - if (widget._isUserDisable === false){ - widget.enabled = true; - widget._isUserDisable = true; - } + widget.enabled = true; } } + var children = node._children; for (var i = 0; i < children.length; i++) { var child = children[i]; diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index f17a1fedcc..35117a74ca 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -25,7 +25,29 @@ ****************************************************************************/ var WidgetManager = require('../base-ui/CCWidgetManager'); + +/** + * !en Enum for align mode. + * !zh AlignMode 类型 + * @enum Widget.AlignMode + */ +/** + * !en Only align once when component is enabled, then immediately disable it. + * !zh 仅在 onEnable 的当帧结束时对齐一次,然后立刻禁用当前组件。 + * @property {Number} ONCE + */ +/** + * !en Align when window is resized + * !zh 在窗口 resize 时对齐。 + * @property {Number} ON_WINDOW_RESIZED + */ +/** + * !en Keep aligning all the way. + * !zh 一直保持对齐。 + * @property {Number} ALWAYS + */ var AlignMode = WidgetManager.AlignMode; + var AlignFlags = WidgetManager._AlignFlags; var TOP = AlignFlags.TOP; var MID = AlignFlags.MID; @@ -487,6 +509,7 @@ var Widget = cc.Class({ * @property isAlignOnce * @type {Boolean} * @default false + * @deprecated */ isAlignOnce: { get: function () { @@ -548,7 +571,6 @@ var Widget = cc.Class({ _isAbsBottom: true, _isAbsHorizontalCenter: true, _isAbsVerticalCenter: true, - _isUserDisable: true, // original size before align _originalWidth: 0, @@ -559,7 +581,7 @@ var Widget = cc.Class({ AlignMode: AlignMode, }, - onLoad: function() { + onLoad: function () { if (this._wasAlignOnce !== undefined){ if (this._wasAlignOnce === true){ this.alignMode = AlignMode.ONCE; From 1a6053788dbd7e1dcac8062479b050b9817455a4 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Thu, 8 Mar 2018 18:31:20 +0800 Subject: [PATCH 65/74] refine api doc --- cocos2d/core/components/CCWidget.js | 47 +++++++++++++++++------------ 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index 35117a74ca..4a61e18043 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -27,23 +27,29 @@ var WidgetManager = require('../base-ui/CCWidgetManager'); /** - * !en Enum for align mode. - * !zh AlignMode 类型 + * !#en Enum for Widget's alignment mode, indicating when the widget should refresh. + * !#zh Widget 的对齐模式,表示 Widget 应该何时刷新。 * @enum Widget.AlignMode */ /** - * !en Only align once when component is enabled, then immediately disable it. - * !zh 仅在 onEnable 的当帧结束时对齐一次,然后立刻禁用当前组件。 + * !#en + * Only align once when the Widget is enabled for the first time. + * This will allow the script or animation to continue controlling the current node. + * It will only be aligned once before the end of frame when onEnable is called, + * then immediately disables the Widget. + * !#zh + * 仅在 Widget 第一次激活时对齐一次,便于脚本或动画继续控制当前节点。 + * 开启后会在 onEnable 时所在的那一帧结束前对齐一次,然后立刻禁用该 Widget。 * @property {Number} ONCE */ /** - * !en Align when window is resized - * !zh 在窗口 resize 时对齐。 + * !#en Align first from the beginning as ONCE, and then realign it every time the window is resized. + * !#zh 一开始会像 ONCE 一样对齐一次,之后每当窗口大小改变时还会重新对齐。 * @property {Number} ON_WINDOW_RESIZED */ /** - * !en Keep aligning all the way. - * !zh 一直保持对齐。 + * !#en Keep aligning all the way. + * !#zh 始终保持对齐。 * @property {Number} ALWAYS */ var AlignMode = WidgetManager.AlignMode; @@ -501,7 +507,11 @@ var Widget = cc.Class({ }, /** - * !#en TODO + * !#en + * When turned on, it will only be aligned once at the end of the onEnable frame, + * then immediately disables the current component. + * This will allow the script or animation to continue controlling the current node. + * Note: It will still be aligned at the frame when onEnable is called. * !#zh * 开启后仅会在 onEnable 的当帧结束时对齐一次,然后立刻禁用当前组件。 * 这样便于脚本或动画继续控制当前节点。 @@ -532,12 +542,11 @@ var Widget = cc.Class({ }, /** - * !#en specify the align mode - * !#zh 指定对齐模式 - * @property alignMode - * @type {Widget.AlignMode} + * !#en Specifies the alignment mode of the Widget, which determines when the widget should refresh. + * !#zh 指定 Widget 的对齐模式,用于决定 Widget 应该何时刷新。 + * @property {Widget.AlignMode} alignMode * @example - * widget.alignMode = cc.Widget.AlignMode.ON_WINDOW_RESIZED + * widget.alignMode = cc.Widget.AlignMode.ON_WINDOW_RESIZED; */ alignMode: { default: AlignMode.ON_WINDOW_RESIZED, @@ -582,15 +591,13 @@ var Widget = cc.Class({ }, onLoad: function () { - if (this._wasAlignOnce !== undefined){ - if (this._wasAlignOnce === true){ - this.alignMode = AlignMode.ONCE; - }else if (this._wasAlignOnce === false){ - this.alignMode = AlignMode.ALWAYS; - } + if (this._wasAlignOnce !== undefined) { + // migrate for old version + this.alignMode = this._wasAlignOnce ? AlignMode.ONCE : AlignMode.ALWAYS; this._wasAlignOnce = undefined; } }, + onEnable: function () { WidgetManager.add(this); }, From 595c223e152db7a060013d590b0b6911e3ff26e7 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 9 Mar 2018 01:07:26 +0800 Subject: [PATCH 66/74] fix widget warning --- cocos2d/core/base-ui/CCWidgetManager.js | 5 +- cocos2d/core/components/CCWidget.js | 69 ++++++++++++------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index 1f19a29ec2..df7f027af1 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -299,7 +299,10 @@ function refreshScene () { for (i = activeWidgets.length - 1; i >= 0; i--) { widget = activeWidgets[i]; var node = widget.node; - if (widget.isAlignOnce && animationState.animatedSinceLastFrame && node.isChildOf(editingNode)) { + if (widget.alignMode !== AlignMode.ALWAYS && + animationState.animatedSinceLastFrame && + node.isChildOf(editingNode) + ) { // widget contains in activeWidgets should aligned at least once widget.enabled = false; } diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index 4a61e18043..b7ce66c840 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -506,41 +506,6 @@ var Widget = cc.Class({ animatable: false }, - /** - * !#en - * When turned on, it will only be aligned once at the end of the onEnable frame, - * then immediately disables the current component. - * This will allow the script or animation to continue controlling the current node. - * Note: It will still be aligned at the frame when onEnable is called. - * !#zh - * 开启后仅会在 onEnable 的当帧结束时对齐一次,然后立刻禁用当前组件。 - * 这样便于脚本或动画继续控制当前节点。 - * 注意:onEnable 时所在的那一帧仍然会进行对齐。 - * @property isAlignOnce - * @type {Boolean} - * @default false - * @deprecated - */ - isAlignOnce: { - get: function () { - if (CC_DEV) { - cc.warn('cc.Widget.isAlignOnce is deprecated, use alignMode instead please.'); - } - return this.alignMode === AlignMode.ONCE; - }, - set: function (value) { - if (CC_DEV) { - cc.warn('cc.Widget.isAlignOnce is deprecated, use alignMode instead please.'); - } - this.alignMode = value ? AlignMode.ONCE : AlignMode.ALWAYS; - }, - visible: false, - }, - _wasAlignOnce: { - default: undefined, - formerlySerializedAs: 'isAlignOnce', - }, - /** * !#en Specifies the alignment mode of the Widget, which determines when the widget should refresh. * !#zh 指定 Widget 的对齐模式,用于决定 Widget 应该何时刷新。 @@ -556,6 +521,11 @@ var Widget = cc.Class({ // + _wasAlignOnce: { + default: undefined, + formerlySerializedAs: 'isAlignOnce', + }, + _target: null, /** @@ -682,5 +652,34 @@ var Widget = cc.Class({ }, }); +/** + * !#en + * When turned on, it will only be aligned once at the end of the onEnable frame, + * then immediately disables the current component. + * This will allow the script or animation to continue controlling the current node. + * Note: It will still be aligned at the frame when onEnable is called. + * !#zh + * 开启后仅会在 onEnable 的当帧结束时对齐一次,然后立刻禁用当前组件。 + * 这样便于脚本或动画继续控制当前节点。 + * 注意:onEnable 时所在的那一帧仍然会进行对齐。 + * @property {Boolean} isAlignOnce + * @default false + * @deprecated + */ +Object.defineProperty(Widget.prototype, 'isAlignOnce', { + get () { + if (CC_DEBUG) { + cc.warn('`widget.isAlignOnce` is deprecated, use `widget.alignMode === cc.Widget.AlignMode.ONCE` instead please.'); + } + return this.alignMode === AlignMode.ONCE; + }, + set (value) { + if (CC_DEBUG) { + cc.warn('`widget.isAlignOnce` is deprecated, use `widget.alignMode = cc.Widget.AlignMode.*` instead please.'); + } + this.alignMode = value ? AlignMode.ONCE : AlignMode.ALWAYS; + } +}); + cc.Widget = module.exports = Widget; From fad39faede76c6b92453f13d5cb070ed21504694 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 9 Mar 2018 02:03:43 +0800 Subject: [PATCH 67/74] change ON_WINDOW_RESIZED to ON_WINDOW_RESIZE --- cocos2d/core/base-ui/CCWidgetManager.js | 4 ++-- cocos2d/core/components/CCWidget.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index df7f027af1..df49d1ed88 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -35,7 +35,7 @@ var VERTICAL = TOP | MID | BOT; var AlignMode = cc.Enum({ ONCE: 0, - ON_WINDOW_RESIZED: 1, + ON_WINDOW_RESIZE: 1, ALWAYS: 2, }); @@ -485,7 +485,7 @@ var widgetManager = cc._widgetManager = module.exports = { refreshWidgetOnResized (node) { var widget = cc.Node.isNode(node) && node.getComponent(cc.Widget); if (widget) { - if (widget.alignMode === AlignMode.ON_WINDOW_RESIZED) { + if (widget.alignMode === AlignMode.ON_WINDOW_RESIZE) { widget.enabled = true; } } diff --git a/cocos2d/core/components/CCWidget.js b/cocos2d/core/components/CCWidget.js index b7ce66c840..be95904646 100644 --- a/cocos2d/core/components/CCWidget.js +++ b/cocos2d/core/components/CCWidget.js @@ -45,7 +45,7 @@ var WidgetManager = require('../base-ui/CCWidgetManager'); /** * !#en Align first from the beginning as ONCE, and then realign it every time the window is resized. * !#zh 一开始会像 ONCE 一样对齐一次,之后每当窗口大小改变时还会重新对齐。 - * @property {Number} ON_WINDOW_RESIZED + * @property {Number} ON_WINDOW_RESIZE */ /** * !#en Keep aligning all the way. @@ -511,10 +511,10 @@ var Widget = cc.Class({ * !#zh 指定 Widget 的对齐模式,用于决定 Widget 应该何时刷新。 * @property {Widget.AlignMode} alignMode * @example - * widget.alignMode = cc.Widget.AlignMode.ON_WINDOW_RESIZED; + * widget.alignMode = cc.Widget.AlignMode.ON_WINDOW_RESIZE; */ alignMode: { - default: AlignMode.ON_WINDOW_RESIZED, + default: AlignMode.ON_WINDOW_RESIZE, type: AlignMode, tooltip: CC_DEV && 'i18n:COMPONENT.widget.align_mode', }, From 144bd9ec6bd43603704fccd60247b0a61125ef3b Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 9 Mar 2018 09:37:16 +0800 Subject: [PATCH 68/74] fix internal deserialize issue on wechat game --- cocos2d/core/platform/deserialize.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/platform/deserialize.js b/cocos2d/core/platform/deserialize.js index 3b3efc58d0..ec4803a0ad 100644 --- a/cocos2d/core/platform/deserialize.js +++ b/cocos2d/core/platform/deserialize.js @@ -580,6 +580,7 @@ var _Deserializer = (function () { } return Function('s', 'o', 'd', 'k', 't', sources.join('')); } : function (self, klass) { + var TYPE = Attr.DELIMETER + 'type'; var EDITOR_ONLY = Attr.DELIMETER + 'editorOnly'; var SERIALIZABLE = Attr.DELIMETER + 'serializable'; var DEFAULT = Attr.DELIMETER + 'default'; @@ -616,10 +617,21 @@ var _Deserializer = (function () { // function undefined object(null) string boolean number var defaultValue = CCClass.getDefault(attrs[propName + DEFAULT]); if (fastMode) { - var defaultType = typeof defaultValue; - var isPrimitiveType = (defaultType === 'string' && !stillUseUrl) || - defaultType === 'number' || - defaultType === 'boolean'; + var isPrimitiveType; + var userType = attrs[propName + TYPE]; + if (defaultValue === undefined && userType) { + isPrimitiveType = userType === cc.String || + userType === cc.Integer || + userType === cc.Float || + userType === cc.Boolean; + } + else { + var defaultType = typeof defaultValue; + isPrimitiveType = (defaultType === 'string' && !stillUseUrl) || + defaultType === 'number' || + defaultType === 'boolean'; + } + if (isPrimitiveType) { o[propName] = prop; } From 844f171f7a1613d6361fdbaca369e4639f9e7f2a Mon Sep 17 00:00:00 2001 From: Wasin Thonkaew Date: Sat, 10 Mar 2018 07:19:12 +0700 Subject: [PATCH 69/74] Fix typos --- CHANGELOG.txt | 2 +- cocos2d/actions/CCActionEase.js | 2 +- cocos2d/core/load-pipeline/loading-items.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 14124a4cdc..6c0475d26c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -223,7 +223,7 @@ Cocos2d-JS v3.4 Beta0 @ March 19 2015 * Bug fixes: 1. Added `getSpriteFrame` to `cc.Sprite` to fix API inconsistency. - 2. Added `getObejct` to `cc.TMXObjectGroup` to fix API inconsistency. + 2. Added `getObject` to `cc.TMXObjectGroup` to fix API inconsistency. 3. Added `addImageAsync` to `cc.textureCache` to fix API inconsistency. 4. Fixed a bug of `cc.text` that its default font name is incorrect. 5. Fixed a bug of `ccui.PageView` that its `getPage` doesn't work. diff --git a/cocos2d/actions/CCActionEase.js b/cocos2d/actions/CCActionEase.js index 456e5f35b6..c8d4cab1c6 100644 --- a/cocos2d/actions/CCActionEase.js +++ b/cocos2d/actions/CCActionEase.js @@ -784,7 +784,7 @@ cc._easeElasticInObj = { /** * !#en - * Creates the action easing obejct with the period in radians (default is 0.3).
+ * Creates the action easing object with the period in radians (default is 0.3).
* Reference easeInElastic:
* http://www.zhihu.com/question/21981571/answer/19925418 * !#zh diff --git a/cocos2d/core/load-pipeline/loading-items.js b/cocos2d/core/load-pipeline/loading-items.js index 4ccadbc03b..16959c2b7f 100644 --- a/cocos2d/core/load-pipeline/loading-items.js +++ b/cocos2d/core/load-pipeline/loading-items.js @@ -297,7 +297,7 @@ LoadingItems.ItemState = new cc.Enum(ItemState); * @param {Array} urlList The items array. * @param {Function} onProgress The progression callback, refer to {{#crossLink "LoadingItems.onProgress"}}{{/crossLink}} * @param {Function} onComplete The completion callback, refer to {{#crossLink "LoadingItems.onComplete"}}{{/crossLink}} - * @return {LoadingItems} The LoadingItems queue obejct + * @return {LoadingItems} The LoadingItems queue object * @example * LoadingItems.create(cc.loader, ['a.png', 'b.plist'], function (completedCount, totalCount, item) { * var progress = (100 * completedCount / totalCount).toFixed(2); @@ -359,7 +359,7 @@ LoadingItems.create = function (pipeline, urlList, onProgress, onComplete) { * @method getQueue * @static * @param {Object} item The item to query - * @return {LoadingItems} The LoadingItems queue obejct + * @return {LoadingItems} The LoadingItems queue object */ LoadingItems.getQueue = function (item) { return item.queueId ? _queues[item.queueId] : null; From 2f811285954f1cb343f8b6b3095854d88375d5cb Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Mon, 12 Mar 2018 10:32:01 +0800 Subject: [PATCH 70/74] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5be532fd9d..b35ad76025 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ npm test * [Official site](http://cocos2d-x.org/creator) * [Download](http://cocos2d-x.org/download) -* [Documentation](http://cocos2d-x.org/docs/editors_and_tools/creator/index.html) -* [API References](http://cocos2d-x.org/docs/api-ref/creator/v1.0/) +* [Documentation](http://www.cocos2d-x.org/docs/creator/manual/en/) +* [API References](http://www.cocos2d-x.org/docs/creator/api/en/) * [Forum](http://discuss.cocos2d-x.org/c/editors-and-tools/cocos-creator) -* [Road Map](http://discuss.cocos2d-x.org/t/cocos-creator-roadmap) +* [Road Map](https://trello.com/b/JWVRRxMG/cocos-creator-roadmap) From 4a1087e92d18400846f8a81ee138c795c316291f Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Mon, 12 Mar 2018 14:18:12 +0800 Subject: [PATCH 71/74] ensure play the right time after change animation time --- cocos2d/animation/animation-state.js | 1 + test/qunit/unit-es5/test-animation.js | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/cocos2d/animation/animation-state.js b/cocos2d/animation/animation-state.js index 2229c9645c..af972e20fa 100644 --- a/cocos2d/animation/animation-state.js +++ b/cocos2d/animation/animation-state.js @@ -186,6 +186,7 @@ proto.onPause = function () { }; proto.setTime = function (time) { + this._firstFramePlayed = false; this.time = time || 0; var curves = this.curves; diff --git a/test/qunit/unit-es5/test-animation.js b/test/qunit/unit-es5/test-animation.js index 12f6573a59..51c614b27f 100644 --- a/test/qunit/unit-es5/test-animation.js +++ b/test/qunit/unit-es5/test-animation.js @@ -532,6 +532,7 @@ test('EventAnimCurve', function () { animation.play('test'); state.wrapMode = cc.WrapMode.Loop; state.repeatCount = Infinity; + manager.update(0); manager.update(1.7); calls = []; manager.update(0.3); @@ -551,6 +552,7 @@ test('EventAnimCurve', function () { animation.play('test'); state.wrapMode = cc.WrapMode.Loop; state.repeatCount = Infinity; + manager.update(0); manager.update(1.7); calls = []; manager.update(0.5); @@ -570,6 +572,7 @@ test('EventAnimCurve', function () { animation.play('test'); state.wrapMode = cc.WrapMode.Reverse; state.repeatCount = 1; + manager.update(0); calls = []; manager.update(0.1); deepEqual(calls, [], 'should triggered no events if wrapMode is Reverse'); @@ -626,6 +629,7 @@ test('EventAnimCurve', function () { animation.play('test'); state.wrapMode = cc.WrapMode.PingPong; state.repeatCount = Infinity; + manager.update(0); manager.update(1.7); calls = []; manager.update(0.5); @@ -653,6 +657,7 @@ test('EventAnimCurve', function () { animation.play('test'); state.wrapMode = cc.WrapMode.PingPongReverse; state.repeatCount = Infinity; + manager.update(0); manager.update(1.7); calls = []; manager.update(0.5); @@ -668,6 +673,7 @@ test('EventAnimCurve', function () { state.speed = -1; state.wrapMode = cc.WrapMode.Normal; state.repeatCount = Infinity; + manager.update(0); calls = []; manager.update(0.5); deepEqual(calls, [ @@ -684,6 +690,7 @@ test('EventAnimCurve', function () { state.speed = -1; state.wrapMode = cc.WrapMode.PingPongReverse; state.repeatCount = Infinity; + manager.update(0); manager.update(1.7); calls = []; manager.update(0.5); @@ -773,6 +780,7 @@ test('EventAnimCurve', function () { animation.play('test'); state.wrapMode = cc.WrapMode.PingPong; state.setTime(0); + manager.update(0); calls = []; manager.update(1); manager.update(2); @@ -794,6 +802,7 @@ test('EventAnimCurve', function () { state.wrapMode = cc.WrapMode.LoopReverse; state.setTime(0); calls = []; + manager.update(0); manager.update(2); deepEqual(calls, [ { From a87ade00478f9a472984b9d1fcc08ed7734b663d Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Mon, 12 Mar 2018 16:16:12 +0800 Subject: [PATCH 72/74] refine code --- cocos2d/animation/animation-state.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cocos2d/animation/animation-state.js b/cocos2d/animation/animation-state.js index af972e20fa..f7f8f6a29d 100644 --- a/cocos2d/animation/animation-state.js +++ b/cocos2d/animation/animation-state.js @@ -28,7 +28,9 @@ function AnimationState (clip, name) { Playable.call(this); cc.EventTarget.call(this); - this._firstFramePlayed = false; + // Mark whether the current frame is played. + // When set new time to animation state, we should ensure the frame at the specified time being played at next update. + this._currentFramePlayed = false; this._delay = 0; this._delayTime = 0; @@ -186,7 +188,7 @@ proto.onPause = function () { }; proto.setTime = function (time) { - this._firstFramePlayed = false; + this._currentFramePlayed = false; this.time = time || 0; var curves = this.curves; @@ -273,11 +275,11 @@ proto.update = function (delta) { // make first frame perfect //var playPerfectFirstFrame = (this.time === 0); - if (this._firstFramePlayed) { + if (this._currentFramePlayed) { this.time += (delta * this.speed); } else { - this._firstFramePlayed = true; + this._currentFramePlayed = true; } this._process(); From 803a84ab47a433f3d92aca61ce5d2384dc55ea0a Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Mon, 12 Mar 2018 22:22:44 +0800 Subject: [PATCH 73/74] fix cc._throw --- CCDebugger.js | 2 +- cocos2d/tilemap/CCSGTMXObject.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CCDebugger.js b/CCDebugger.js index b7e4ef1a0e..d3d85af141 100644 --- a/CCDebugger.js +++ b/CCDebugger.js @@ -104,7 +104,7 @@ cc.DebugMode = Enum({ */ cc._initDebugSetting = function (mode) { // reset - cc.log = cc.logID = cc.warn = cc.warnID = cc.error = cc.errorID = cc._throw = cc.assert = cc.assertID = function () { }; + cc.log = cc.logID = cc.warn = cc.warnID = cc.error = cc.errorID = cc.assert = cc.assertID = function () { }; if (mode === cc.DebugMode.NONE) return; diff --git a/cocos2d/tilemap/CCSGTMXObject.js b/cocos2d/tilemap/CCSGTMXObject.js index e48524ba91..8f7806bf8e 100644 --- a/cocos2d/tilemap/CCSGTMXObject.js +++ b/cocos2d/tilemap/CCSGTMXObject.js @@ -79,6 +79,7 @@ _ccsg.TMXObject = cc.Class({ * !#en Get the property of object * !#zh 获取对象的属性 * @method getProperty + * @param {String} propertyName * @return {Object} */ getProperty: function (propName) { From 37ecfc334c49ec757389e6e09733aa039279c08f Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 13 Mar 2018 11:44:50 +0800 Subject: [PATCH 74/74] =?UTF-8?q?The=20loading=20process=20should=20determ?= =?UTF-8?q?ine=20whether=20or=20not=20=E2=80=98cc.engine=E2=80=99=20exists?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cocos2d/core/base-ui/CCWidgetManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index df49d1ed88..f55c6b6606 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -445,7 +445,7 @@ var widgetManager = cc._widgetManager = module.exports = { init: function (director) { director.on(cc.Director.EVENT_BEFORE_VISIT, refreshScene); - if (CC_EDITOR) { + if (CC_EDITOR && cc.engine) { cc.engine.on('design-resolution-changed', this.onResized.bind(this)); } else if (!CC_JSB) {