Skip to content

Commit c9c3741

Browse files
author
Jialong Zhai
committed
Merge pull request #1 from cocos2d/master
Master
2 parents bb03526 + 594cd04 commit c9c3741

File tree

458 files changed

+157500
-100207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+157500
-100207
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ CMakeCache.txt
9393
CMakeFiles
9494
Makefile
9595
cmake_install.cmake
96+
CMakeLists.txt.user
9697
templates/js-template-default/frameworks/js-bindings
9798

9899
# Ignore files generated by console

‎AUTHORS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Current Core Developers of Cocos2d-JS:
2121
Zhiming Wu
2222
Sijie Wang
2323
Jialong Zhai
24+
Long Jiang
2425

2526
For the full list of all contributors and retired core developers, please refer to the authors list of cocos2d-x and cocos2d-html5.
2627

@@ -29,6 +30,7 @@ Name GithubID Main contribution
2930

3031
seobyeongky @seobyeongky XMLHTTPRequest bug fixes
3132
GLProgram_setUniformLocationWith4f bug fixed
33+
Corrent value of cc.REPEAT_FOREVER
3234

3335
Liang Wu @akira-cn No default font Arial on android bug fix
3436

@@ -51,6 +53,16 @@ Nat Weiss @NatWeiss Mimics the behavior of cc.p function
5153
Ninja Lau @mutoo Fix cocoslib_path issue
5254
Move jsb scripts to assets/script/
5355

56+
tkowalski @tkowalski Add missing affine transform functions rename
57+
58+
Minh Quy @MQuy Fix url matching regex issue
59+
60+
Park Hyun Chen @sincntx Fix cc.ScrollView constructor issue in JSB
61+
62+
Vincent Chou @go3k Update README.md, add submodule update command suggestion
63+
Fix bug: Runtime.cpp protobuf object parseFromString may result in an incomplete protobuf object
64+
65+
5466
Cocos2d-JS can not grow so fast without the active community.
5567
Thanks to all developers who report & trace bugs, discuss the engine usage in forum & QQ groups!
5668
Special thanks to Ricardo Quesada for giving us lots of guidances & suggestions.

‎CHANGELOG

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,208 @@
11
ChangeLog:
22

3+
Cocos2d-JS v3.1 @ Oct.22, 2014
4+
5+
* Released Facebook Integration for Cocos2d-JS v1.0, all APIs have been significantly polished and stabilized. Improved test cases for Facebook with more features demonstrated.
6+
* Upgraded Cocos2d-x to v3.3 rc0
7+
* Supported Cocos Studio v2.0 including Timeline animation support and proto buffers format support for both web engine and JSB engine.
8+
* Refactored load event of texture, sprite frame and sprite for better maintainability.
9+
* Refactored `cc.rendererCanvas` for improving performance.
10+
* Moved the `CC_Texture0` definition of fragment shader to cc.GLProgram to ensure compatibility with JSB.
11+
* Added normalized position functions to cc.Node.
12+
* Refactored the constructor of Cocos Studio's classes and deprecated all create functions.
13+
* Refactored Cocos Studio reader for better maintainability.
14+
* Improved Facebook SDK.
15+
* Modified `cc.ProgressTo`'s behavior, its progression didn't reset to zero when the progression is 100.
16+
* Changed `ccui.Widget`'s default anchor point to (0, 0) in widget reader.
17+
* Removed all deprecated create function usage in engine and in the test cases.
18+
* [JSB] Refactor `cc.GLNode` for new renderer and re-enable OpenGL test case.
19+
20+
* Bug fixes:
21+
1. Fixed an issue of `cc.UILayout` that its scissor mode didn't work.
22+
2. Fixed an issue of `ccui.TextBMFont` that its 'string' property setting was incorrect.
23+
3. Fixed an issue of `cc.DrawNode` that its element's position was incorrect in Canvas mode.
24+
4. Fixed an issue of `cc.Layer` that its bake function didn't work in new renderer.
25+
5. Fixed an issue of `cc.Scale9Sprite` that its cached canvas size was incorrect.
26+
6. Fixed an issue of `cc.Director` that its position was incorrect when calling `setProjection` in new renderer.
27+
7. Fixed an issue of `cc.view` that the reinitialization logic of frame size was incorrect.
28+
8. Fixed incorrect usage of `cc.progressTo` in progress action test.
29+
9. Fixed an issue of CocosNodeTest for the new renderer.
30+
10. Fixed minor issues in test cases.
31+
11. [JSB] Fixed an issue of `cc.EditBox`'s constructor.
32+
12. [JSB] Refactored an issue that `ccui.CheckBox`'s deprecated function `setSelectedState` is used instead of `setSelected`.
33+
13. [JSB] Fixed an issue of `cc.ScrollView`'s constructor.
34+
14. [JSB] Fixed an issue in Moon Warriors sample that a label's height was too small so it was cutting off its content.
35+
15. [JSB] Fixed user object conflict in `ccui.Widget`'s `addTouchEventListener` function binding.
36+
16. [JSB] Fixed an issue that null parameter was not correctly processed in `ccs.ArmatureAnimations`'s `setFrameEventCallFunc` and `setMovementEventCallFunc` functions.
37+
17. [JSB] Fixed an issue that `cc.Scale9Sprite`'s `updateWithBatchNode` had been deprecated in JSB.
38+
18. [JSB] Fixed an issue that `cc.SpriteBatchNode` could not be extended in JSB.
39+
19. [JSB] Fixed an issue that Cocos Studio extension classes could not be extended in JSB.
40+
20. [JSB] Fixed API inconsistency issues by renaming `cc.Node`'s `getRotationSkewX/Y` and `setRotationSkewX/Y` to `getRotationX/Y` and `setRotationX/Y`.
41+
42+
* Known Issues:
43+
1. `jsb.AssetsManager` doesn't work on windows due to a bug in libcurl
44+
45+
Cocos2d-JS v3.1 beta @ Oct.13, 2014
46+
47+
* Refactoration of the web engine with new renderer on the architecture level, optimization is under going.
48+
* Released Facebook SDK for Cocos2d-JS beta2, its API have been significantly improved and stablized.
49+
* Upgraded MoonWarriors sample with new set of graphical assets.
50+
* Automatically enabled WebGL on iOS 8 safari.
51+
* Upgraded chipmunk.js to the newest version.
52+
* Supported setting color of shadow for `cc.LabelTTF`.
53+
* Added `getTitleRenderer` function to ccui.Button.
54+
* Supported Coco Studio timeline animation.
55+
* Set the default value of LabelAtlas's `cascadeOpacityEnabled` and `cascadeColorEnabled` to true.
56+
* Added a listener of texture to `cc.Sprite#setTexture` when the texture hasn't loaded.
57+
* Activated `cc.pool` for all kind of objects.
58+
* Added query test for chipmunk and added necessary JavaScript bindings.
59+
* [JSB] Added properties for `cp.Shape`, added missed methods for `cp.Vect` and `cp.v`.
60+
* [JSB] Added missed constant for `ccui.ListView`.
61+
* [JSB] Ignored alpha value in `cc.Node#setColor`.
62+
* [JSB] Used Object.create for creating prototype during inheritance to avoid potential memory leak.
63+
* [JSB] Made regular expression for URL check more reliable using third party code.
64+
65+
* Bugs fix:
66+
1. Fixed a bug of `cc.ComponentContainer` that a 'if' statement behavior is incorrect.
67+
2. Fixed a bug of `cc.Scale9Sprite` that the behavior of Canvas and WebGL is different.
68+
3. Fixed a bug of `cc.EventListener` that its pause state should set to true.
69+
4. Fixed a bug of `cc.ParticleSystem` that it should apply canvas scaling on canvas rendering mode.
70+
5. Fixed a bug of CCBoot.js that `cc.loader` should add a condition to check whether `crossOrign` property is undefined on IE9 and IE10.
71+
6. Fixed a bug of `ccui.Widget` that its `setPosition` function's behavior is incorrect.
72+
7. Fixed a bug of `ccui.LoadingBar` that its `barRenderer` should add to protected children array.
73+
8. Fixed a bug of `cc.Texture2D` that its `TEXTURE_MAG_FILTER` should set to LINEAR.
74+
9. Fixed a bug of `cc.TMXMapInfo` that its doesn't parse `rotation` property.
75+
10. Fixed a bug of `cc.TMXLayer` that it should apply canvas scaling on Canvas rendering mode.
76+
11. [JSB] Fixed an issue of incorrect return value in `cc.textureCache.addImage`.
77+
12. [JSB] Fixed an issue of `cc.loader.getRes` for supporting cached resources.
78+
13. [JSB] Fixed an issue of `cc.loader.loadImg` for supporting local image loading.
79+
14. [JSB] Fixed `cocos run -p ios` command issue with Xcode 6.
80+
15. [JSB] Fixed `cc.EditBox` behavior issue on iOS8.
81+
16. [JSB] Fixed an issue of `cc.Scale9Sprite` that it may mask its child node content.
82+
17. [JSB] Fixed an issue that `arrivalOrder` get reset after being visited and cause children order chaos.
83+
18. [JSB] Fixed an issue of `_ctor` function check in construction.
84+
19. [JSB] Fixed a bug of `cpGroup` type definition inconsistence between iOS 8 and other platforms.
85+
20. [JSB] Fixed API inconsistence between web and JSB engine for `cc.Touch#getID`.
86+
21. [JSB] Fixed memory leak issue of cc.pool in JSB.
87+
22. [JSB] Fixed a bug that `cc.ScrollView`'s construction haven't been implemented in JSB.
88+
23. [JSB] Fixed arguments processing error in chipmunk bindings by adding safe guard.
89+
24. [JSB] Fixed a bug in particle system test case.
90+
25. [JSB] Fixed a potential crash issue for `cc.CallFunc`.
91+
92+
* Known Issues:
93+
1. AssetsManager doesn't work on windows due to a bug in libcurl
94+
2. Timeline animation haven't been bound to JSB
95+
96+
Cocos2d-JS-v3.0 Final @ Sep.10, 2014
97+
98+
* Facebook SDK Beta2: Added `appRequest` API.
99+
* Facebook SDK Beta2: Added permission request in `login` API, removed `requestPermission` API.
100+
* Facebook SDK Beta2: Renamed `request` API to `api`.
101+
* Facebook SDK Beta2: Renamed `publishInstall` API to `activateApp`.
102+
* Added getter and setter function for browser's density dpi: `cc.view.setTargetDensityDPI`, `cc.view.getTargetDensityDPI`.
103+
* Added some type check functions.
104+
* Added audio support for wechat browser.
105+
* Added setPlaceHolderColor and setTextColor to ccui.TextField.
106+
* Added API reference for Cocos Studio extension.
107+
* [JSB] Polished AssetsManager for better iOS simulator support.
108+
* [JSB] Move `EventAssetsManager` and `EventListenerAssetsManager` to jsb namespace.
109+
* [JSB] Supported formatted string in `cc.log`/`cc.warn`/`cc.error`/`cc.assert`.
110+
* [JSB] Added `retain`/`release` function for cc.Touch
111+
112+
* Bugs fix:
113+
1. Fixed an issue of `cc.Menu` that its item's touch priority is different than cc.eventManager.
114+
2. Fixed an issue of `cc.view` that its NO_BORDER mode doesn't work correctly.
115+
3. Fixed an issue of `cc.LabelBMFont` that its content size is different than JSB.
116+
4. Fixed an issue of `cc.LabelBMFont` that its `setColor` is invalid on some mobile devices.
117+
5. Fixed an issue of `cc.PageView` that it can't receive TOUCH_CANCEL event.
118+
6. Fixed an issue of `cc.loader` that it can't load cross origin textures.
119+
7. Fixed an issue that Facebook SDK Web's `appRequest` wraps info parameter incorrectly.
120+
8. Fixed an issue of ccui widgets' `addEventListener` that it doesn't accept function's target as parameter.
121+
9. [JSB] Fixed a crash issue of Facebook SDK when session is closed.
122+
10. [JSB] Fixed constant inconsistence in ccui.TextField.
123+
11. [JSB] Fixed return value inconsistence of `cc.Node#getNodeToWorldTransform` function.
124+
12. [JSB] Fixed an issue that `cc.MenuItemImage`'s `setColor` doesn't work.
125+
13. [JSB] Fixed API inconsistence that `cc.Layer`'s `bake`/`unbake`/`isBaked` functions are absent in JSB.
126+
14. [JSB] Refactored ccui's `addEventListenerXXX` to `addEventListener` to fit Web engine API.
127+
15. [JSB] Fix an issue that delete doesn't work for `ccui.TextField`'s on desktop.
128+
16. [JSB] Fixed stroke color issue of LabelTTF on iOS.
129+
17. [JSB] Fixed an issue of `jsb.fileUtils.renameFile` on windows.
130+
18. [JSB] Fixed an issue of bindings generator script on windows.
131+
19. [JSB] Fixed `cc.REPEAT_FOREVER` value error.
132+
133+
Cocos2d-JS-v3.0 RC3 @ Aug.29, 2014
134+
135+
* Facebook SDK Beta: Unified the callback parameters for different platform.
136+
* Facebook SDK Beta: Added payment API on Web platform.
137+
* Facebook SDK Beta: Added `publishInstall` and `logEvent` APIS on iOS and Android.
138+
* Facebook SDK Beta: Supported app request and share open graph API on Web platform.
139+
* Facebook SDK Beta: Remove plugin configuration for Facebook SDK to simplify the usage.
140+
* Facebook SDK Beta: Added test case for new features and improve all test cases.
141+
* Cocos Console: Improved web compile with `--advanced` tag.
142+
* Improved Cocos2d-JS inline docs to provide a better API reference document.
143+
* Refactored cc.game for maintainability.
144+
* Refactored cc.async to simplify and improve the usage.
145+
* Added `cc.formatStr` for string formatting, for example: `cc.formatStr("a: %d, b: %b", a, b)`.
146+
* Refactored cc.log to support formatted string.
147+
* Refactored cc.pool's `hasObj` to `hasObject` and `removeObj` to `removeObject`.
148+
* Added some state check to cc.audioEngine.
149+
* Refactored sprite's blend function to support more features on Canvas.
150+
* Refactored `cc.textureCache.textureForKey` to `cc.textureCache.getTextureForKey`, `cc.TMXTilemap#propertiesForGID` to `cc.TMXTilemap#getPropertiesForGID` to follow the standard API naming style.
151+
* Detected mouse event on touch screen tablets.
152+
* Support new construction for cc.PhysicsDebugNode and deprecated `cc.PhysicsDebugNode.create`
153+
* Made cc.Texture2D's setTexParameters supports two types of parameters.
154+
* Added test case for remote image loading.
155+
* [JSB] Combine SpiderMonkey's arm64&32 lib to support Xcode 6.0
156+
* [JSB] Added abort function for XMLHttpRequest.
157+
* [JSB] Used clang as the default compiler for Android compilation.
158+
* [JSB] Made cc.place, cc.moveTo, cc.moveBy, cc.jumpTo, cc.jumpBy support x, y seperated position parameters.
159+
* [JSB] Added setSpeed/getSpeed functions for cc.ActionInterval.
160+
* [JSB] Made cc.easeBezierAction accept multiple parameters.
161+
* [JSB] Refactored ccui.TextField's `setText` to `setString`, `getStringValue` to `getString`.
162+
* [JSB] Refactored cc.Node and cc.Texture2D's `getGLProgram` to `getShaderProgram`, `setGLProgram` to `setShaderProgram` for compatibility with web engine.
163+
* [JSB] Added missed shader program constants.
164+
* [JSB] Added missed array util functions.
165+
* [JSB] Bound constructor for cc.EventTouch and cc.Touch.
166+
167+
* Bugs fix:
168+
1. Fixed an issue of tilemap that it can't runAction in canvas render mode.
169+
2. Fixed an issue of cc.eventManager that its removeListeners' codes are unreachable.
170+
3. Fixed an issue of cc.EditBox that its position is incorrect.
171+
4. Fixed an issue of cc.WebAudio that its stopped state is incorrect.
172+
5. Fixed an issue of cc.audioEngine that it doesn't work on firefox after it compiled with advanced mode.
173+
6. Fixed an issue of ccs.Bone that it doesn't update color and opacity correctly.
174+
7. Fixed an issue of ccs.Armature that its setShaderProgram doesn't work.
175+
8. Fixed cc.Sprite and cc.Scale9Sprite's issue so that their texture loads incorrectly.
176+
9. Fixed an issue of ccui.LoadingBar that its setPercent is invalid.
177+
10. Fixed an issue of Armature reader that it can't parse isTween property.
178+
11. Fixed an issue of ccui.PageView that its getTouchBeganPosition returns incorrect value.
179+
12. Fixed an issue of ccui.ImageView that its setColor doesn't work.
180+
13. Fixed an issue of cc.RenderTexture that it doesn't support parameter depthStencilFormat.
181+
14. Fixed an issue of ccs.ArmatureAnimation.setSpeedScale.
182+
15. Fixed an issue of cc.Scale9Sprite that it has a line on iOS device.
183+
16. Fixed CCProgressTimer draw on canvas with colorized sprite
184+
17. Fixed an issue of cc.game that its frameRate setter is invalid.
185+
18. Fixed an issue of cc.loader that its callback state is incorrect.
186+
19. [JSB] Fixed memory leark issue of XMLHttpRequest.
187+
20. [JSB] Fixed bugs of Android Facebook SDK's dialog callback.
188+
21. [JSB] Fixed bugs of android-build.py.
189+
22. [JSB] Fixed bugs of cc.Texture2D's width and height property was not working.
190+
23. [JSB] Fixed a crash issue that `cc.textureCache.addImage` create duplicated jsb proxy for the same url.
191+
24. [JSB] Fixed incompatible issue in cc.async and cc.loader
192+
25. [JSB] Fixed cc.skewBy's inversed behavior.
193+
26. [JSB] Fixed an issue of Javascript to Objective-C reflection.
194+
27. [JSB] Fixed `anchorX` and `anchorY` property setter issue.
195+
28. [JSB] Fixed an issue about cc.BezierBy's construction.
196+
29. [JSB] Fixed an issue that cc.LabelBMFont doesn't initialize when passing empty string as its content.
197+
30. [JSB] Fixed an issue that ccui.Layout doesn't sort children nodes with their local z order.
198+
31. [JSB] Fixed an Android platform crash issue when handleOnPause get invoked before onSurfaceCreated
199+
32. [JSB] Fixed an issue that cc.Menu.create doesn't accept array as parameter.
200+
33. [JSB] Fixed an "Invalid Native Object" issue in RenderTextureTest.
201+
34. [JSB] Fixed an crash issue in assets manager test.
202+
203+
* Known issues:
204+
1. [JSB] jsb.AssetsManager have issues on Windows platform and iOS simulator.
205+
3206
Cocos2d-JS-v3.0 RC2 @ Aug.11, 2014
4207
* Refactored Cocos UI for more stable and friendly user experience.
5208
* Upgraded Cocostudio reader to support version 1.2 - 1.5.x.

0 commit comments

Comments
 (0)