Skip to content

Commit

Permalink
Update changelog and versions for v3.8 rc0
Browse files Browse the repository at this point in the history
  • Loading branch information
pandamicro committed Aug 22, 2015
1 parent 486af79 commit 6ee3349
Show file tree
Hide file tree
Showing 8 changed files with 239 additions and 14 deletions.
30 changes: 27 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ Developers:
stari4ek
Fix VideoPlayer on Android ignore search paths
Label: Improve rendering of letter's inner shapes when outline is used
platform: Fixed issue that depth/stencil buffers attributes are ignored on iOS

FlagellumDei
Center the window correctly on windows
Expand Down Expand Up @@ -407,6 +408,10 @@ Developers:
Add scroll bar feature into ui::ScrollView.
Add RadioButton and RaidoButtonGroup widgets.
Add a setter for line width in DrawNode.
UI: Added a setter for line width in DrawNode
UI: Added ScrollViewBar for displaying a scroll bar at the side of ScrollView
UI: Added RadioButton widget
UI: Refined scroll event dispatching for ScrollView

Sam Clegg (sbc100)
Author of Native Client port.
Expand Down Expand Up @@ -700,6 +705,7 @@ Developers:
Added operator == != for Value
Replace dynamic_cast to std::is_base_of in object_to_luaval
Added support normalize path on android
FileUtils: Remove old path while adding existing search path

superrad
Clear NoSuchMethodError Exception when JniHelper fails to find methodID
Expand Down Expand Up @@ -977,6 +983,7 @@ Developers:

billtt
Fixed a bug that Node::setScale(float) may not work properly
network: Fixed a problem where WebSocket messages may pile up

Teivaz
Custom uniform search optimization
Expand Down Expand Up @@ -1019,6 +1026,7 @@ Developers:

takaken1994
Added function for setting min/max scale for ScrollView
studio: Removed "using namespace cocos2d" from CCFrame.h

maltium
Added 3D rotation support to RotateTo action
Expand Down Expand Up @@ -1115,6 +1123,7 @@ Developers:

kompjoefriek
Fix compiling warnings
Device: Added vibrate support to enable vibration for a duration.

tmr111116
fix random int overflow
Expand Down Expand Up @@ -1148,6 +1157,7 @@ Developers:
perminovVS
Optimize Vec3 and Vec2
Added `UserDefault::setDelegate()`
platform: Correct all usage of unicode version winapi in FileUtils for win32

qiutaoleo
Added a feature to check case characters for filename on windows
Expand All @@ -1159,12 +1169,14 @@ Developers:
Fixed crash on AssetsManager
Fixed memory leak of WebView on iOS
Fixed crahed that if url contains illegal characters on Android
log: Fixed crash on Windows if passing string more than 16kb to cocos2d::log

tankorsmash
Fixed the bug that ProgressTimer::setSprite() doesn't take effect

namezero111111
ui: TextField add `getTextColor`, `getTextHorizontalAlignment` and `getTextVerticalAlignment` API
Physics: Fixed circle shape debug draw incorrect issue

shinhirota
JS: Fixed issue of iOS/JS reflection `callStaticMethod` with bool arg
Expand All @@ -1177,15 +1189,27 @@ Developers:
iris-wy
platform: Fixed warning "Service Intent must be explicit" on Android

alexpeak
Label: Fixed rendering LabelTTF characters as black boxes on Android by ensuring atlases are purged before resetting

ywxzm
Lua: Fixed onTouch begin don't return value

xpol
Sprite: Fixed some warnings and a related bug in CCSprite

marzapower
UI: Fixed inertial scrolling for CCScrollView

MAUSMAUSgames
Action: Permitted setting bitwise flags to action

Retired Core Developers:
WenSheng Yang
Author of windows port, CCTextField,
Designer of CCApplication/CCEGLView/platform structure.
He's working together with 2dx core team but leading FishingJoy game

Bin Zhang
core-team member but put himself in FishingJoy game since 2012.

RongHong Huang (flyingpaper)
Author of cocos2d-xna and spent all his time on wp7.

Expand Down
211 changes: 206 additions & 5 deletions CHANGELOG

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ endif()
project (Cocos2d-X)

# The version number
set(COCOS2D_X_VERSION 3.7.1)
set(COCOS2D_X_VERSION 3.8)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
include(CocosBuildHelpers)
Expand Down
2 changes: 1 addition & 1 deletion cocos/scripting/js-bindings/manual/ScriptingCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <assert.h>
#include <memory>

#define ENGINE_VERSION "Cocos2d-JS v3.7.1"
#define ENGINE_VERSION "Cocos2d-JS v3.8 RC0"

void js_log(const char *format, ...);

Expand Down
2 changes: 1 addition & 1 deletion cocos/scripting/js-bindings/script/jsb_cocos2d.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

// CCConfig.js
//
cc.ENGINE_VERSION = "Cocos2d-JS v3.7.1";
cc.ENGINE_VERSION = "Cocos2d-JS v3.8 RC0";

cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen.config
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = Cocos2d-x
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = v3.7.1
PROJECT_NUMBER = v3.8

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.7.1</string>
<string>3.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion web

0 comments on commit 6ee3349

Please sign in to comment.