Skip to content

Commit 3fc50c6

Browse files
dingpinglvdingpinglv
committed
Closed #4856: fixed a bug of cc.TMXXMLParser and cc.TMXLayer getTileAt etc functions support a point or x,y as their parameters.
1 parent 8fe1c99 commit 3fc50c6

File tree

223 files changed

+695
-448
lines changed

Some content is hidden

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

223 files changed

+695
-448
lines changed

‎Base64Images.js

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CCBoot.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
3-
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
2+
Copyright (c) 2011-2012 cocos2d-x.org
3+
Copyright (c) 2013-2014 Chukong Technologies Inc.
54
65
http://www.cocos2d-x.org
76

‎CCDebugger.js

+24-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
1-
/**
2-
* Created by small on 14-4-3.
3-
*/
4-
1+
/****************************************************************************
2+
Copyright (c) 2011-2012 cocos2d-x.org
3+
Copyright (c) 2013-2014 Chukong Technologies Inc.
4+
5+
http://www.cocos2d-x.org
6+
7+
Permission is hereby granted, free of charge, to any person obtaining a copy
8+
of this software and associated documentation files (the "Software"), to deal
9+
in the Software without restriction, including without limitation the rights
10+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the Software is
12+
furnished to do so, subject to the following conditions:
13+
14+
The above copyright notice and this permission notice shall be included in
15+
all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
THE SOFTWARE.
24+
****************************************************************************/
525

626
cc._LogInfos = {
727
ActionManager_addAction: "cc.ActionManager.addAction(): action must be non-null",

‎cocos2d/actions/CCAction.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions/CCActionCamera.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions/CCActionCatmullRom.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
Copyright (c) 2008 Radu Gruian
66
Copyright (c) 2011 Vit Valentin
77

‎cocos2d/actions/CCActionEase.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions/CCActionInstant.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions/CCActionInterval.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions/CCActionTween.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions3d/CCActionGrid.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2013 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions3d/CCActionGrid3D.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions3d/CCActionPageTurn3D.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/actions3d/CCActionTiledGrid.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/audio/CCAudio.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/clipping-nodes/CCClippingNode.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2013 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
Copyright (c) 2012 Pierre-David Bélanger
66
77
http://www.cocos2d-x.org

‎cocos2d/core/CCActionManager.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/CCCamera.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/CCConfiguration.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/CCDirector.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/CCDirectorWebGL.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/CCDrawingPrimitivesCanvas.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2014 cocos2d-x.org
2+
Copyright (c) 2008-2010 Ricardo Quesada
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
35
46
http://www.cocos2d-x.org
57

‎cocos2d/core/CCDrawingPrimitivesWebGL.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2014 cocos2d-x.org
2+
Copyright (c) 2008-2010 Ricardo Quesada
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
35
46
http://www.cocos2d-x.org
57

‎cocos2d/core/CCScheduler.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/base-nodes/BaseNodesPropertyDefine.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/base-nodes/BaseNodesWebGL.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/base-nodes/CCAtlasNode.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/base-nodes/CCNode.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/cocoa/CCAffineTransform.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/cocoa/CCGeometry.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/event-manager/CCEvent.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2014 cocos2d-x.org
2+
Copyright (c) 2011-2012 cocos2d-x.org
3+
Copyright (c) 2013-2014 Chukong Technologies Inc.
34
45
http://www.cocos2d-x.org
56

‎cocos2d/core/event-manager/CCEventExtension.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2014 cocos2d-x.org
2+
Copyright (c) 2011-2012 cocos2d-x.org
3+
Copyright (c) 2013-2014 Chukong Technologies Inc.
34
45
http://www.cocos2d-x.org
56

‎cocos2d/core/event-manager/CCEventListener.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2014 Chukong Technologies Inc.
2+
Copyright (c) 2011-2012 cocos2d-x.org
3+
Copyright (c) 2013-2014 Chukong Technologies Inc.
34
45
http://www.cocos2d-x.org
56

‎cocos2d/core/event-manager/CCEventManager.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2014 cocos2d-x.org
2+
Copyright (c) 2011-2012 cocos2d-x.org
3+
Copyright (c) 2013-2014 Chukong Technologies Inc.
34
45
http://www.cocos2d-x.org
56

‎cocos2d/core/event-manager/CCTouch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
2+
Copyright (c) 2011-2012 cocos2d-x.org
33
Copyright (c) 2013-2014 Chukong Technologies Inc.
44
55
http://www.cocos2d-x.org

‎cocos2d/core/labelttf/CCLabelTTF.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/labelttf/LabelTTFPropertyDefine.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/labelttf/LabelTTFWebGL.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

‎cocos2d/core/layers/CCLayer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
2-
Copyright (c) 2010-2012 cocos2d-x.org
32
Copyright (c) 2008-2010 Ricardo Quesada
4-
Copyright (c) 2011 Zynga Inc.
3+
Copyright (c) 2011-2012 cocos2d-x.org
4+
Copyright (c) 2013-2014 Chukong Technologies Inc.
55
66
http://www.cocos2d-x.org
77

0 commit comments

Comments
 (0)