Merge branch '3.7' into 3.8-beta

This commit is contained in:
badlogic 2019-01-23 14:30:32 +01:00
commit 70e0e8dd79
2 changed files with 3 additions and 69 deletions

View File

@ -1,70 +1,3 @@
# 3.8
## AS3
* **Breaking changes**
* **Additions**
### Starling
## C
* **Breaking changes**
* **Additions**
### Cocos2d-Objc
### SFML
## C++
* ** Additions **
* **Breaking changes**
### Cocos2d-x
### SFML
### UE4
## C# ##
* **Breaking changes**
* **Additions**
### Unity
### XNA/MonoGame
## Java
* **Breaking changes**
* **Additions**
### libGDX
## Lua
* **Breaking changes**
*
* **Additions**
### Love2D
### Corona
## Typescript/Javascript
* **Breaking changes**
* **Additions**
### WebGL backend
### Canvas backend
### Three.js backend
### Player
# 3.7
## AS3
@ -138,6 +71,7 @@
* Added improved tint-black shader.
* Updated to cocos2d-x 3.16
* The skeleton setup pose and world transform are now calculated on initialization to avoid flickering on start-up.
* Updated to cocos2d-x 3.17.1
* **Breaking change**: Switched from [spine-c](spine-c) to [spine-cpp](spine-cpp) as the underlying Spine runtime. See the [spine-cpp Runtime Guide](https://esotericsoftware.com/spine-cpp) for more information on spine-cpp.
* Added `Cocos2dAttachmentLoader` to be used when constructing an `Atlas`. Used by default by `SkeletonAnimation` and `SkeletonRenderer` when creating instances via the `createXXX` methods.
* All C structs and enums `spXXX` have been replaced with their C++ equivalents `spine::XXX` in all public interfaces.

View File

@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 2.8)
set(EXAMPLE_DIR "${CMAKE_CURRENT_LIST_DIR}/example")
if (NOT EXISTS ${EXAMPLE_DIR}/cocos2d)
message("Downloading cocos2dx, this may take some time!")
file(DOWNLOAD "http://cdn.cocos2d-x.org/cocos2d-x-3.16.zip" "${EXAMPLE_DIR}/cocos2dx.zip")
file(DOWNLOAD "https://digitalocean.cocos2d-x.org/Cocos2D-X/cocos2d-x-3.17.1.zip" "${EXAMPLE_DIR}/cocos2dx.zip")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar x ${EXAMPLE_DIR}/cocos2dx.zip
WORKING_DIRECTORY ${EXAMPLE_DIR}
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E rename
"${EXAMPLE_DIR}/cocos2d-x-3.16" "${EXAMPLE_DIR}/cocos2d"
"${EXAMPLE_DIR}/cocos2d-x-3.17.1" "${EXAMPLE_DIR}/cocos2d"
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E remove_directory "${EXAMPLE_DIR}/cocos2d/cocos/editor-support/spine"