Skip to content

Merge develop to master #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 254 commits into from
Sep 17, 2013
Merged

Merge develop to master #1145

Changes from 1 commit
Commits
Show all changes
254 commits
Select commit Hold shift + click to select a range
cf94dd4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
ShengxiangChen Jul 25, 2013
3f01591
Merge remote-tracking branch 'origin/master' into optimizeForMobileBr…
ShengxiangChen Jul 29, 2013
6844635
Merge remote-tracking branch 'origin/develop' into optimizeForMobileB…
ShengxiangChen Jul 30, 2013
7e30cfc
fixed #2452:optimize javascript code
ShengxiangChen Jul 30, 2013
d885745
fixed #2452:optimize javascript code
ShengxiangChen Jul 30, 2013
4b2c707
Fixed #2441 avoid using temp cc.p for cc.Follow
xingsenma Jul 31, 2013
b6c8996
Fixed #2441 avoid using temp cc.p for cc.CardinalSplineTo/cc.Cardinal…
xingsenma Jul 31, 2013
1a17361
Fixed #2441 avoid using temp cc.p for cc.Grid3DAction
xingsenma Jul 31, 2013
53a086d
Fixed #2441 avoid using temp cc.p for cc.ActionInterval
xingsenma Jul 31, 2013
85151f9
Fixed #2441 avoid using temp cc.p for cc.PageTurn3D
xingsenma Jul 31, 2013
e8c71d0
Fixed #2441 avoid using temp cc.p for cc.TiledGrid3DAction
xingsenma Jul 31, 2013
cfbbdd7
Issue #2445 refactor code for rendering classes
dingpinglv Jul 31, 2013
ccd4949
Issue #2441 reduce read accumulatedDiff times in cc.CardinalSplineTo …
xingsenma Jul 31, 2013
1baaf96
fixed #2454 Fix a bug of EditBox that position is wrong when _resolut…
dingpinglv Jul 31, 2013
21d05ff
Merge pull request #1041 from ShengxiangChen/optimizeForMobileBrowser
Jul 31, 2013
a0db1a9
Merge pull request #1045 from dingpinglv/Iss2454_FixEditBoxBug
Jul 31, 2013
007f1d1
Issue #2441 add local pointer to reduce read times
xingsenma Jul 31, 2013
5984f44
fixed #2445 refactor code for Performance
dingpinglv Aug 1, 2013
15cc204
Merge branch 'develop' of Cocos2d-html5 into Iss2445_RewriteCtor
dingpinglv Aug 1, 2013
744e514
fixed #2459: fix Accelerometer bug on UCWeb version 9.0 and below.
ShengxiangChen Aug 1, 2013
24d41a4
fixed #2445 refactor code for rendering classes to optimize performance
dingpinglv Aug 1, 2013
e16afc6
Fixed #2445 correct a mistake in CCScheduler.js when refactoring code…
dingpinglv Aug 1, 2013
218b3b8
Merge pull request #1044 from xingsenma/cc.p,cc.size
dingpinglv Aug 2, 2013
f2d16df
Merge pull request #1047 from dingpinglv/Iss2445_RewriteCtor
dingpinglv Aug 2, 2013
f96d4bb
Merge pull request #1048 from ShengxiangChen/issue2459_accelerometerBug
dingpinglv Aug 2, 2013
22244e3
fixed #2468 Fixed a bug of CCBReader that ControlButton doesn't work …
dingpinglv Aug 2, 2013
80f564b
Merge pull request #1054 from dingpinglv/Iss_FixBuildxmlBug
Aug 3, 2013
f59d9f0
fixed #2468 CCBReader has supported loading ControlEvents of ControlB…
dingpinglv Aug 5, 2013
10c6ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Aug 5, 2013
8727c49
Fixed #2445 Fixed bug for sortAllChildren ,that tempChild is a chang…
xingsenma Aug 5, 2013
448af35
Merge pull request #1057 from xingsenma/sortAllChildren
dingpinglv Aug 5, 2013
9669d08
Fixed #2445 Fixed bug for sortAllChildren ,that tempChild is a chang…
xingsenma Aug 5, 2013
11101e9
Merge pull request #1058 from xingsenma/sortAllChildren
dingpinglv Aug 5, 2013
c27186e
fixed #1056 The bug of cc.ProgressTimer has fixed that Midpoint is wr…
dingpinglv Aug 5, 2013
3be055e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Aug 5, 2013
8fc7bd4
Merge pull request #1059 from dingpinglv/Iss1056_FixProgressAnchorPoi…
dingpinglv Aug 5, 2013
367d7c7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Aug 5, 2013
fd27bb7
fixed #2468 Corrected a mistake of cc.NodeLoader
dingpinglv Aug 5, 2013
c2395f7
Merge pull request #1053 from dingpinglv/Iss2468_FixCCBReaderBug
dingpinglv Aug 5, 2013
eb7f801
fixed #2497 : setSearchPaths Bug
ShengxiangChen Aug 7, 2013
64740a0
Fixed #2481 Re-write Canvas Mode of RenderTexture to adapt WebGL inte…
dingpinglv Aug 7, 2013
265505a
Merge pull request #1063 from dingpinglv/Iss2481_RewriteRenderTexture
dingpinglv Aug 7, 2013
e75b0fd
Merge pull request #1062 from ShengxiangChen/issue2497_setSearchPathsBug
dingpinglv Aug 7, 2013
eeaef02
fixed #2497 : setSearchPaths Bug
ShengxiangChen Aug 7, 2013
285555b
Fixed #2444 Re-write cc.Texture for Canvas Mode. Texture2D was used I…
xingsenma Aug 2, 2013
90649ba
Fixed #2444 Split cc.Texture2D as cc.Texture2DWebGL and cc.Texture…
xingsenma Aug 7, 2013
e0a6d44
Fixed #2444 Fixed bug that cc.PointZero use as a value ,but it is a …
xingsenma Aug 7, 2013
e81726b
Fixed #2444 Fixed some bug about merged the code
xingsenma Aug 8, 2013
6c7f77f
Merge pull request #1064 from ShengxiangChen/issue2497_setSearchPathsBug
dingpinglv Aug 8, 2013
23f5cd1
Merge pull request #1067 from xingsenma/develop_texture2D
dingpinglv Aug 8, 2013
34743c1
Fixed #2496 Fixed a bug of cc.TextureCache that the status of textur…
xingsenma Aug 8, 2013
046dbac
Merge pull request #1068 from xingsenma/develop_textureCache
dingpinglv Aug 8, 2013
3ee3082
Fixed #2482 Add the deprecated information to function of cc.UserDefault
xingsenma Aug 8, 2013
41a6c52
Fixed #2482 Add the deprecated information to function of cc.UserDefault
xingsenma Aug 8, 2013
da3f383
Merge pull request #1069 from xingsenma/develop_ccUserDefault
dingpinglv Aug 8, 2013
bc1bcba
fixed the bug of ScrollView while change the position of it`s parent …
SmallAiTT Aug 8, 2013
c8afdac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
SmallAiTT Aug 8, 2013
a26af55
Merge pull request #1070 from SmallAiTT/forScrollView
dingpinglv Aug 8, 2013
0cd3a0b
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
dingpinglv Aug 9, 2013
2302dc1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5
dingpinglv Aug 9, 2013
e71329e
Fixed #2511 fixed a bug of cc.EditBox and a bug of cc.Scale9Sprite
dingpinglv Aug 9, 2013
a8c879f
Merge pull request #1071 from dingpinglv/Iss2511_FixScale9SpriteBug
dingpinglv Aug 9, 2013
05b55f0
Fixed #2454: Fixed a bug of EditBox that position is wrong when EGLVi…
xingsenma Aug 14, 2013
0e6f846
Fixed #2454 Fixed a bug that preloadTextFileData have a wrong cache
xingsenma Aug 14, 2013
be04f75
Merge pull request #1076 from xingsenma/EditBox
dingpinglv Aug 15, 2013
71e82f5
update cc.RectApplyAffineTransform
06wj Aug 15, 2013
46f3a13
use native sort function when sort children
06wj Aug 15, 2013
4065f89
fixed #2530 LabelTTF's Stroke style has been modified to outer stroke
dingpinglv Aug 16, 2013
0c29b2c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Aug 16, 2013
ba6307e
Merge pull request #1077 from dingpinglv/Iss2530_ModifyLabelTTFStroke…
dingpinglv Aug 16, 2013
a148f37
fixed #2481 add a clearRect function to cc.RenderTexture
dingpinglv Aug 16, 2013
dee706d
Merge pull request #1078 from dingpinglv/Iss2481_RewriteRenderTexture
dingpinglv Aug 16, 2013
76b3398
fixed #2481 add a clearRect function to cc.RenderTexture
dingpinglv Aug 16, 2013
1ef99e6
Merge pull request #1079 from dingpinglv/Iss2481_RewriteRenderTexture
dingpinglv Aug 16, 2013
9b29125
Revert "use native sort function when sort children"
06wj Aug 16, 2013
0af10f2
Merge branch 'develop' of github.com:cocos2d/cocos2d-html5 into develop
06wj Aug 16, 2013
51093cd
fix setScale bug
06wj Aug 16, 2013
9e672fb
Merge pull request #1080 from 06wj/develop
dingpinglv Aug 18, 2013
a347ebe
Fixed #2550 Fixed TableView's bug that contentSize is wrong when chan…
xingsenma Aug 19, 2013
a6b1801
Merge pull request #1081 from xingsenma/develop_tableview
dingpinglv Aug 19, 2013
5b278dc
Improve performance cost when creating lots of CCLabelTTF
Aug 19, 2013
54f3309
Merge pull request #1082 from WanderWang/develop
dingpinglv Aug 19, 2013
ee4c9b7
fixed SpriteFrame.initWithTextureFilename converted (pixel-based) rec…
cschwartz Aug 19, 2013
1061b35
fixed UnitTest.SpriteFrame.initWithTexture
cschwartz Aug 20, 2013
17d9457
Update CCScheduler.scheduleCallbackForTarget 's comment
Aug 20, 2013
381a77d
Fixed #2467 Fixed a bug of cc.LabelBMFont that it's very slow when c…
xingsenma Aug 20, 2013
5417ae8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
xingsenma Aug 20, 2013
7b1ff85
Update CCSAXParser.js
xbruce Aug 20, 2013
e962d71
Merge pull request #1084 from cschwartz/initWithTextureFilename
dingpinglv Aug 21, 2013
1ad5c5c
Merge pull request #1085 from WanderWang/develop
dingpinglv Aug 21, 2013
6ead5e3
Merge pull request #1087 from xbruce/develop
dingpinglv Aug 21, 2013
ffbc81d
Merge pull request #1086 from xingsenma/develop_BMFont
dingpinglv Aug 21, 2013
24091bd
fixed #2531 Asynchronous loading resources for rendering classes has …
dingpinglv Aug 21, 2013
e191392
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Aug 21, 2013
6449f2a
fixed #2531 Asynchronous loading texture for LabelBMFont on Canvas Mo…
dingpinglv Aug 21, 2013
4ca2a4b
fixed #2531 use direct calling function of parent class instead this.…
dingpinglv Aug 21, 2013
64a9d32
fixed #2531 Async loading textures for cc.LabelBMFont has been implem…
dingpinglv Aug 22, 2013
9f6793e
Merge pull request #1090 from dingpinglv/Iss2531_AsyncLoadingTextures
dingpinglv Aug 22, 2013
aa8a5fa
fixed #1089 fixed a bug of cc.LayerColorCanvas that respecting incorr…
dingpinglv Aug 22, 2013
6ed5739
Merge pull request #1091 from dingpinglv/Iss1089_LayerColorCanvasResp…
dingpinglv Aug 22, 2013
25efe68
issue #2506: use direct call parent's function instead this._super fo…
dingpinglv Aug 23, 2013
a861869
added js loading image
06wj Aug 26, 2013
76cd18e
give loading image a id
06wj Aug 26, 2013
1e01580
修复BrowserTypes正则表达式匹配失败时的报错
Aug 26, 2013
d0b808b
Merge pull request #1097 from WanderWang/develop
dingpinglv Aug 27, 2013
c385902
Merge branch 'develop' of github.com:cocos2d/cocos2d-html5 into develop
06wj Aug 27, 2013
d86d249
fixed #2506: Optimize performance for ContolButton, ScrollView and Ta…
dingpinglv Aug 27, 2013
4bdb27c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Aug 27, 2013
92de186
Merge pull request #1096 from 06wj/develop
dingpinglv Aug 27, 2013
9e01fb3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Aug 27, 2013
a1f75f0
fixed #2723: Function prototype have not method of bind in iphone saf…
xingsenma Aug 27, 2013
27f140a
fixed #2723: Append a div child to body bottom,and tag to it.
xingsenma Aug 27, 2013
2bf91e5
fixed #2723: Hide url address bar for mobile browser,it can work in i…
xingsenma Aug 27, 2013
f40ce7b
Merge pull request #1099 from xingsenma/Branch_develop_AddressBar
dingpinglv Aug 27, 2013
ed7dc52
fixed #2725: Implement unloadPlist function of cc.SAXParser
xingsenma Aug 27, 2013
b6370eb
issue #1088: add onResLoadingErr for preload file
xingsenma Aug 27, 2013
f8f67bf
Merge pull request #1100 from xingsenma/develop_unloadPlist
dingpinglv Aug 27, 2013
7b3f221
Merge pull request #1098 from dingpinglv/Iss2506_OptimizePerformanceF…
Aug 28, 2013
4c072a9
Merge pull request #1101 from xingsenma/develop_onResLoadingErr
Aug 28, 2013
f4de13c
closed #2741: Modify LabelTTF's rendering from direct draw to pre-render
dingpinglv Aug 29, 2013
ec76afe
Closed 2741: Solved the problem that LabelTTF didn't work on mobile b…
dingpinglv Aug 29, 2013
f518e85
Closed #2741: remove the debug codes.
dingpinglv Aug 29, 2013
e45d057
Closed #2741: fixed a bug of SpriteCanvas that loading texture doesn'…
dingpinglv Aug 29, 2013
3ac66f3
Merge pull request #1102 from dingpinglv/Iss2741_RefactorLabelTTFDraw
dingpinglv Aug 30, 2013
1372e0d
fixed #2754: Fixed the bug that _getResType error when the url of res…
SmallAiTT Aug 30, 2013
78f0891
fixed #2760 : removeEventListener bug
ShengxiangChen Sep 1, 2013
ac56f5d
Merge remote-tracking branch 'upstream/master' into develop
Sep 1, 2013
a7b47c9
Merge remote-tracking branch 'upstream1/develop' into develop
Sep 1, 2013
56d73e9
Merge pull request #1103 from SmallAiTT/develop
dingpinglv Sep 2, 2013
e6d5886
Merge pull request #1104 from ShengxiangChen/addEventListenerBug
dingpinglv Sep 2, 2013
70590f9
fix for simple audio enginee loading and playing error on browser tha…
Sep 2, 2013
dd8e32b
Update CCLabelTTF.js
Sep 2, 2013
f7fad0e
Merge pull request #1106 from WanderWang/develop
dingpinglv Sep 3, 2013
d4302ce
Merge pull request #1105 from oupengsoftware/taskbranch/SPX-935
dingpinglv Sep 3, 2013
27cfe60
Closed #2514: Migrate CCBReader to Cocos2d-x v2.1.4
dingpinglv Sep 3, 2013
f157343
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 3, 2013
2bf826f
Closed #2762: Refactor CCSimpleAudioEngine.js for code maintainability
dingpinglv Sep 3, 2013
aec4364
Merge pull request #1107 from dingpinglv/Iss2514_MigrateCCBReaderTo2.1.4
dingpinglv Sep 3, 2013
52c1c7e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 3, 2013
b739531
fixed #880 add msPointerEnabled support
dingpinglv Sep 3, 2013
63f17f3
Merge pull request #1110 from dingpinglv/Iss880_MsPointerEnabled
dingpinglv Sep 3, 2013
832f5f1
Closed #2748: Fix a bug of cc.Sprite that its children also follow fl…
xingsenma Sep 3, 2013
a1c8d29
Closed #2748: Fixed a bug of LabelAtlasCanvas, that _opacity is wro…
xingsenma Sep 3, 2013
3d5bbe6
fixed #2763:fixed ccb parser bug
ShengxiangChen Sep 3, 2013
64637fb
Closed #2748: Fixed a bug of cc.ProgressTimerCanvas that it is error …
xingsenma Sep 3, 2013
b038820
fixed #2763:fixed ccb parser bug
ShengxiangChen Sep 3, 2013
56b9b7e
closed #2748: clipping region also must use save and restore
xingsenma Sep 3, 2013
b2f6d4c
Merge pull request #1112 from xingsenma/Flip
dingpinglv Sep 3, 2013
84841cc
Merge pull request #1109 from dingpinglv/Iss2762_RefactorSimpleAudioE…
dingpinglv Sep 3, 2013
2b371d0
fixed #2763:fixed ccb parser bug
ShengxiangChen Sep 4, 2013
ab9e45d
Merge pull request #1111 from ShengxiangChen/CCBPaserBug
dingpinglv Sep 4, 2013
97508b0
Issue #2226: Improve Sprite, Node, LabelTTF class define for maintain…
dingpinglv Sep 5, 2013
c7a3c08
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 5, 2013
0a5966f
issue #2772: Optimize Armature logic , add blend Type supported
xingsenma Sep 5, 2013
2ce0795
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
xingsenma Sep 6, 2013
9a76e94
Closed #2226: Improve Sprite, Node, LabelTTF class define for maintai…
dingpinglv Sep 6, 2013
074963d
Closed #2226: remove an unused variable "_opacity" from cc.LayerColor
dingpinglv Sep 9, 2013
dd5a746
Closed #2226: modify some comments
dingpinglv Sep 9, 2013
6081632
Merge pull request #1113 from dingpinglv/Iss2226_RefactorRenderingCla…
dingpinglv Sep 9, 2013
10fe6a3
issue #2772 add getPositionX and getPositionY for PhysicsSprite
xingsenma Sep 9, 2013
b732d7a
issue #2772 remove CCPhysicsWorld.js
xingsenma Sep 9, 2013
d857146
issue #2772 add collide for Armature
xingsenma Sep 9, 2013
baf30ef
issue #2772 add async load for Armature
xingsenma Sep 9, 2013
795746d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
xingsenma Sep 9, 2013
cc52f9d
issue #2772 move directory CCArmature to CocoStudio
xingsenma Sep 9, 2013
345f3f6
Closed #2786: Refactor cc.PhysicsSprite for Performance
dingpinglv Sep 10, 2013
58638ca
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 10, 2013
94983e4
Merge pull request #1117 from dingpinglv/Iss2786_RefactorPhysicsSprite
dingpinglv Sep 10, 2013
2de4be8
closed #2772: fixed some bug for Armature
xingsenma Sep 10, 2013
e36f95d
issue #2772 merge develop
xingsenma Sep 10, 2013
11cb48e
issue #2772: delete CCShaderNode.js
xingsenma Sep 11, 2013
b335c26
issue #2772 Optimize javascript code for Armature
xingsenma Sep 11, 2013
ede76c5
fixed #2798 : disable webgl on mobile browser
ShengxiangChen Sep 11, 2013
e3d4640
Closed #2795: Fix a bug of cc.Node that nodeToWorldTransform returns …
dingpinglv Sep 11, 2013
ef99bf8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 11, 2013
455a93e
Merge pull request #1120 from dingpinglv/Iss2795_FixNodeToWorldTransform
dingpinglv Sep 11, 2013
004067e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
xingsenma Sep 11, 2013
2a2fb3a
fixed #2772 fixed transform bug for Armature in canvas model
xingsenma Sep 11, 2013
d42ee49
fixed #2748: Fixed some bugs about progress
xingsenma Sep 11, 2013
b8d7567
Merge pull request #1121 from xingsenma/progress
dingpinglv Sep 11, 2013
df0340a
issue #2772 optimize updateOffsetPoint
xingsenma Sep 11, 2013
70815ea
fixed #2741 add setPositionX /setPositionY for LabelTTF
xingsenma Sep 11, 2013
7b1a705
Merge pull request #1122 from xingsenma/develop
dingpinglv Sep 11, 2013
6cef2e9
issue #2772 update samples commit
xingsenma Sep 11, 2013
2ac6a3b
Merge pull request #1118 from xingsenma/Armature
dingpinglv Sep 11, 2013
273c33b
Merge pull request #1119 from ShengxiangChen/issue_fullscreen
dingpinglv Sep 11, 2013
baceeb6
fixed #2801: Remove cc.RectMake . Use cc.rect instead.
xingsenma Sep 12, 2013
c2c9355
fixed #2801: Remove cc.SizeMake . Use cc.size instead.
xingsenma Sep 12, 2013
4ad32c8
fixed #2801: Remove cc.PointMake . Use cc.p instead.
xingsenma Sep 12, 2013
99eb548
fixed #2801: Change local variable from _actionManager to _animationM…
xingsenma Sep 12, 2013
56f96e2
fixed #2801: Rename tileAt to getTileAt.
xingsenma Sep 12, 2013
6a670c1
fixed #2801: Rename Sequence.initOneTwo to Sequence.initWithTwoActions
xingsenma Sep 12, 2013
26b7e98
fixed #2801: add setFontName/setFontSize/setPlaceholderFontName/setPl…
xingsenma Sep 12, 2013
5d34367
closed #2801: add preloadMusic/preloadEffect for SimpleAudioEngine.
xingsenma Sep 12, 2013
5ead84d
fixed #2798 : disable webgl on mobile browser
ShengxiangChen Sep 12, 2013
e8e5020
fixed #2795: Fix a bug of cc.Node that nodeToWorldTransform returns w…
xingsenma Sep 12, 2013
084b719
fixed #2795 fixed bug for _calculateLayerOffset.
xingsenma Sep 12, 2013
fa350f5
Merge pull request #1124 from xingsenma/develop
dingpinglv Sep 13, 2013
2512c9e
fixed #2795: Fix a bug of cc.PhysicsSprite that nodeToWorldTransform …
xingsenma Sep 13, 2013
12f3ae7
Merge pull request #1125 from ShengxiangChen/issue_fullscreen
dingpinglv Sep 13, 2013
15b4b89
Merge pull request #1126 from xingsenma/develop
dingpinglv Sep 13, 2013
46084f9
Merge pull request #1123 from xingsenma/sync_jsb
dingpinglv Sep 13, 2013
a8f0d69
Closed #2802: Sync the APIs of HTML5 to the JSB
dingpinglv Sep 13, 2013
6e0eef3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 13, 2013
58a3045
Merge pull request #1127 from dingpinglv/Iss2802_SyncAPIsToJSB
dingpinglv Sep 13, 2013
cb64446
closed #2805: Fixed a bug of cc.Sprite that displayFrame return wrong…
xingsenma Sep 13, 2013
cd85aa5
fixed #208: fixed a TMXLayer's bug
dingpinglv Sep 13, 2013
2ed1504
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 13, 2013
702b639
Merge pull request #1128 from xingsenma/develop
dingpinglv Sep 13, 2013
af9b1ec
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 13, 2013
545a592
Merge pull request #1129 from dingpinglv/Iss208_FixATileMapBug
dingpinglv Sep 13, 2013
7c62f5f
Closed #2806: Correct a mistake of cc.clone
dingpinglv Sep 13, 2013
bc99e70
Merge pull request #1132 from dingpinglv/Iss2806_CorrectTestsErrors
dingpinglv Sep 14, 2013
83bed39
Issue #2803: updated CHANGELOG.txt and AUTHORS.txt, updated version n…
dingpinglv Sep 16, 2013
5b40cc9
Issue #2803: correct a mistake in AUTHORS.txt
dingpinglv Sep 16, 2013
0361117
Issue #2803: update a wiki link
dingpinglv Sep 16, 2013
0d6b0b3
Merge pull request #1133 from dingpinglv/Iss2803_V2.1.6Release
Sep 16, 2013
8b00e74
Issue #2803: update submodule reference
dingpinglv Sep 16, 2013
7fb2938
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 16, 2013
d00dbaa
Merge pull request #1134 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 16, 2013
ef6f9a4
fixed #2806: Correct the errors of CCLabelTTF that labelHeightDiv sho…
xingsenma Sep 16, 2013
a03dbe4
Bug #2806: Correct the errors of CCArmatureDefine for Cocos2d-Html5 r…
xingsenma Sep 16, 2013
4c3ee19
Merge pull request #1135 from xingsenma/develop
dingpinglv Sep 16, 2013
1bd376a
Issue #2803: correct some mistakes in AUTHORS.txt
dingpinglv Sep 16, 2013
2b28db7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 16, 2013
18e1dde
Merge pull request #1136 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 16, 2013
3f1a1e1
Issue #2803: Update authors of Cocos2d-html5
dingpinglv Sep 16, 2013
dd17073
Merge pull request #1137 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 16, 2013
9b34fe4
Issue #2803: update submodule reference
dingpinglv Sep 16, 2013
19b986b
Merge pull request #1138 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 16, 2013
b6a35b9
Merge pull request #1 from cocos2d/develop
Sep 16, 2013
243666f
Update CCTextureCache.js
Sep 16, 2013
6f2b4e7
Update CCTextureCache.js
Sep 17, 2013
dd577af
Merge pull request #1140 from WanderWang/develop
dingpinglv Sep 17, 2013
81a0819
Issue #2803: fixed some bugs for actions that set their object proper…
dingpinglv Sep 17, 2013
bfa3ff1
Issue #2803: updates AUTHORS.txt
dingpinglv Sep 17, 2013
5a25ead
Issue #2803: updates build.xml of Jsdoc
dingpinglv Sep 17, 2013
1e3b427
Merge pull request #1141 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 17, 2013
ce1195d
Issue #2803: fixed a bug for cc.Sprite that its drawing doesn't work …
dingpinglv Sep 17, 2013
6c5b882
Issue #2802: update some information in CHANGELOG.txt
dingpinglv Sep 17, 2013
d8f0fbd
Merge pull request #1142 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 17, 2013
7a67b88
Issue #2803: cc.Sprite's setFlipX, setFlipY have renamed to setFlippe…
dingpinglv Sep 17, 2013
bfa9994
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 17, 2013
e5114d9
Issue #2803: fixed a bug for cc.FlipY and fixed a bug for Transition
dingpinglv Sep 17, 2013
b7d8abd
Merge pull request #1143 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 17, 2013
e459396
Issue #2803: add a sample game link to index.html
dingpinglv Sep 17, 2013
c240ba4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Sep 17, 2013
3b9bed2
Merge pull request #1144 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 17, 2013
140df57
Closed #2803: update DragonBones' link in CHANGELOG.txt
dingpinglv Sep 17, 2013
4d4b7fc
Merge pull request #1146 from dingpinglv/Iss2803_V2.1.6Release
dingpinglv Sep 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in… 
…to optimizeForMobileBrowser
  • Loading branch information
@ShengxiangChen
ShengxiangChen committed Jul 25, 2013
commit cf94dd41880d958149cd25dce05aedf981c190d4

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.