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

Merge pull request #13892 from pandamicro/v3.8 

Fix _hittedByCamera may be null in Widget::isClippingParentContainsPoint
This commit is contained in:
pandamicro 2015-09-17 17:40:11 +08:00
parent aaa149729c e74ac2377a
commit 7a4cfec80b
9 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,3 +1,7 @@
cocos2d-x-3.8.1 September.17 2015
[HIGHLIGHT] platform: Supported Xcode 7 for iOS 9 deployment
cocos2d-x-3.8 final September.6 2015
cocos2d-x-3.8 rc0 August.26 2015
cocos2d-x-3.8 beta0 August.14 2015

2
CMakeLists.txt
View File

@ -38,7 +38,7 @@ endif()
project (Cocos2d-X)
# The version number
set(COCOS2D_X_VERSION 3.8)
set(COCOS2D_X_VERSION 3.8.1)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
include(CocosBuildHelpers)

2
cocos/cocos2d.cpp
View File

@ -31,7 +31,7 @@ NS_CC_BEGIN
CC_DLL const char* cocos2dVersion()
{
return "cocos2d-x-3.8";
return "cocos2d-x-3.8.1";
}
NS_CC_END

2
cocos/scripting/js-bindings/manual/ScriptingCore.h
View File

@ -39,7 +39,7 @@
#include <assert.h>
#include <memory>
#define ENGINE_VERSION "Cocos2d-JS v3.8"
#define ENGINE_VERSION "Cocos2d-JS v3.8.1"
void js_log(const char *format, ...);

2
cocos/scripting/js-bindings/script/jsb_cocos2d.js
View File

@ -26,7 +26,7 @@
// CCConfig.js
//
cc.ENGINE_VERSION = "Cocos2d-JS v3.8";
cc.ENGINE_VERSION = "Cocos2d-JS v3.8.1";
cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};

6
cocos/ui/UIWidget.cpp
View File

@ -767,8 +767,8 @@ bool Widget::onTouchBegan(Touch *touch, Event *unusedEvent)
auto camera = Camera::getVisitingCamera();
if(hitTest(_touchBeganPosition, camera, nullptr))
{
_hittedByCamera = camera;
if (isClippingParentContainsPoint(_touchBeganPosition)) {
_hittedByCamera = camera;
_hitted = true;
}
}
@ -971,7 +971,9 @@ bool Widget::isClippingParentContainsPoint(const Vec2 &pt)
if (clippingParent)
{
bool bRet = false;
if (clippingParent->hitTest(pt, _hittedByCamera, nullptr))
auto camera = Camera::getVisitingCamera();
// Camera isn't null means in touch begin process, otherwise use _hittedByCamera instead.
if (clippingParent->hitTest(pt, (camera ? camera : _hittedByCamera), nullptr))
{
bRet = true;
}

25
docs/RELEASE_NOTES.md
View File

@ -2,7 +2,7 @@
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*
- [Cocos2d-x v3.8 Release Notes](#cocos2d-x-v38-release-notes)
- [Cocos2d-x v3.8.1 Release Notes](#cocos2d-x-v381-release-notes)
- [Misc Information](#misc-information)
- [Requirements](#requirements)
- [Runtime Requirements](#runtime-requirements)
@ -14,8 +14,8 @@
- [Windows](#windows)
- [Linux](#linux)
- [How to start a new game](#how-to-start-a-new-game)
- [v3.8](#v38)
- [Highlights and API changes of v3.8](#highlights-and-api-changes-of-v38)
- [v3.8.1](#v38)
- [Highlights and API changes of v3.8.1](#highlights-and-api-changes-of-v381)
- [Download](#download)
- [The main features in detail:](#the-main-features-in-detail)
- [3D Module](#3d-module)
@ -29,7 +29,7 @@
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
# Cocos2d-x v3.8 Release Notes #
# Cocos2d-x v3.8.1 Release Notes #
# Misc Information
@ -150,30 +150,31 @@ Use Cocos Console to create a new game:
cocos new -l cpp|js|lua MyNewGame
```
# v3.8
# v3.8.1
## Highlights and API changes of v3.8
## Highlights and API changes of v3.8.1
As promised, Cocos2d-x v3.8 have greatly improved the stability and API friendliness. On one side, we continue to improve 3D capacity by providing 3D physics collider, skybox background brush and key frame event callback in Animate3D. On another side, we have refined several core modules, including UI system, AudioEngine, FileUtils, Bindings Generator, etc.
Here is some highlighted improvments and API changes:
1. 3D Module
1. Xcode 7 support
2. 3D Module
- Added 3D physics collider
- Supported setting camera background brushes with color/depth/skybox
- Added key frame event Callback in Animate3D
- Added light map support in Terrain
2. UI System
3. UI System
- Reimplemented and enhanced EditBox on Android
- Added ScrollViewBar for displaying a scroll bar at the side of ScrollView (JSB/Lua ready)
- Added RadioButton widget (JSB/Lua ready)
- Added HANYI FullType font support
3. AudioEngine
4. AudioEngine
- AudioEngine supported audio preloading
- Bound new AudioEngine in JSB
4. FileUtils
5. FileUtils
- Added a set of file writing APIs: writeStringToFile, writeDataToFile, writeValueMapToFile, writeValueVectorToFile
5. Others
6. Others
- Improved Bindings Generator tool
- Merged JSB test project into cocos2d test project
- framework: Support generate prebuilt libs of engine with debug mode
@ -181,7 +182,7 @@ Here is some highlighted improvments and API changes:
## Download
[Cocos2d-x v3.8](http://www.cocos2d-x.org/filedown/cocos2d-x-3.8.zip) including : C++, Lua & JS
[Cocos2d-x v3.8.1](http://www.cocos2d-x.org/filedown/cocos2d-x-3.8.1.zip) including : C++, Lua & JS
## The main features in detail:

2
tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
View File

@ -41,7 +41,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.8</string>
<string>3.8.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>

2
tools/simulator/frameworks/runtime-src/proj.win32/game.rc
View File

@ -64,7 +64,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "About Simulator"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CTEXT "Version 3.8 (20150227)",IDC_ABOUT_VERSION,35,70,173,17
CTEXT "Version 3.8.1 (20150917)",IDC_ABOUT_VERSION,35,70,173,17
CTEXT "Cocos Simulator",IDC_ABOUT_TITLE,35,49,173,17
CTEXT "Copyright (C) 2015. All rights reserved.",IDC_STATIC,35,94,173,17
ICON "GLFW_ICON",IDC_STATIC,111,15,20,20