Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter

This commit is contained in:
Dhilan007 2014-07-02 09:47:22 +08:00
parent 6294a3024f aa80776eaa
commit 427e9d2388
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,4 +1,4 @@
cocos2d-x-3.2 ??? cocos2d-x-3.2beta0 Jul.2 2014
[NEW] FastTMXTiledMap: added fast tmx, which is much more faster for static tiled map [NEW] FastTMXTiledMap: added fast tmx, which is much more faster for static tiled map
[NEW] GLProgramState: can use uniform location to get/set uniform values [NEW] GLProgramState: can use uniform location to get/set uniform values
[NEW] HttpClient: added sendImmediate() [NEW] HttpClient: added sendImmediate()

2
cocos/base/CCControllerThumbstick.cpp
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCControllerThumbStick.h" #include "CCControllerThumbstick.h"
#include "CCControllerAxisInput.h" #include "CCControllerAxisInput.h"
#include "CCControllerButtonInput.h" #include "CCControllerButtonInput.h"

4
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
View File

@ -264,7 +264,9 @@ namespace cocostudio
widget->setColor(_color); widget->setColor(_color);
widget->setOpacity(_opacity); widget->setOpacity(_opacity);
//the setSize method will be conflict with scale9Width & scale9Height //the setSize method will be conflict with scale9Width & scale9Height
widget->setSize(Size(_width, _height)); if (!widget->isIgnoreContentAdaptWithSize()) {
widget->setSize(Size(_width, _height));
}
widget->setPosition(_position); widget->setPosition(_position);
widget->setAnchorPoint(_originalAnchorPoint); widget->setAnchorPoint(_originalAnchorPoint);
} }