同步拉取

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
     EN: Here only receive bug report or suggestions for improvement. Feature request please send to the forum: http://discuss.cocos2d-x.org/c/creator
-    中: 这里只接收 bug 反馈或改进建议。新功能需求请发到论坛：http://forum.cocos.com/c/Creator
+    中: 这里只接收 bug 反馈或改进建议。新功能需求请发到论坛：https://forum.cocos.com/c/Creator
 -->
 
 ### Creator version?（版本号）

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,16 @@
-Re: cocos-creator/fireball#
+Re: cocos-creator/2d-tasks#
 
-Changelog:
+Changes:
  * 
 
 <!-- Note: Makes sure these boxes are checked before submitting your PR - thank you!
 
 - [ ] If your pull request has gone "stale", you should **rebase** your work on top of the latest version of the upstream branch.
 - [ ] If your commit history is full of small, unimportant commits (such as "fix pep8" or "update tests"), **squash** your commits down to a few, or one, discreet changesets before submitting a pull request.
 
-- To official teams:
-  - [ ] Check that your javascript is following our [style guide](https://github.com/cocos-creator/fireball/blob/dev/.github/CONTRIBUTING.md) and end files with a newline
+- For official teams:
+  - [ ] Check that your javascript is following our [style guide](https://docs.cocos.com/creator/manual/zh/scripting/reference/coding-standards.html) and end files with a newline
   - [ ] Document new code with comments in source code based on [API Docs](https://github.com/cocos-creator/fireball#api-docs)
-  - [ ] Make sure any runtime log information in `cc.log` , `cc.error` or `new Error('')` has been moved into `DebugInfos.js` with an ID, and use `cc.logID(id)` or `new Error(cc._getErrorID(id))` instead.
+  - [ ] Make sure any **runtime** log information in `cc.log`, `cc.error` or `new Error()` has been moved into `EngineErrorMap.md` with an ID, and use `cc.logID(id)` or `new Error(cc.debug.getError(id))` instead.
 
--->
+-->

.gitignore

@@ -12,3 +12,5 @@ node_modules
 /.project
 npm-debug.log
 DebugInfos.json
+cocos2d/core/platform/deserialize-compiled.js
+cocos2d/core/value-types/*.js

CHANGELOG.txt

@@ -323,7 +323,7 @@ Cocos2d-JS v3.2 @ Dec.29, 2014
 * Replaced `transform` function with `setTransform` function under canvas render mode for better performance.
 * Added a timer in `cc.audioEngine` to check audio element loading event, prevent the loading process being stucked when load audio file failed.
 * Added some new browser types to `cc.sys`.
-* Added some audio resource loading codes to ensure compatibility with Wechat browser.
+* Added some audio resource loading codes to ensure compatibility with WeChat browser.
 * Added check for WebAudio support to ensure compatibility.
 
 * Bug fixes: