From 1389e68bb317e25c2bac85b08802c59ff87a3955 Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Sat, 9 May 2015 08:37:08 -0600 Subject: [PATCH] Changed .travis.yml to use cmake. Updated changelog. Updated version number in CMakeLists.txt. --- .travis.yml | 5 +++-- CMakeLists.txt | 2 +- Docs/Changelog_language.txt | 5 +++++ Docs/Changelog_sm5.txt | 8 ++++++++ Docs/Themerdocs/XmlToLua.txt | 14 +++++++------- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51b3ca0797..bdf47a2ce6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,8 @@ before_script: - sudo apt-get install -y libglu1-mesa-dev - sudo apt-get install -y mesa-common-dev - sudo apt-get install -y libglew-dev + - sudo apt-get install -y cmake script: - - ./autogen.sh - - ./configure && make + - cmake -G 'Unix Makefiles' . && cmake . + - make diff --git a/CMakeLists.txt b/CMakeLists.txt index 2def5a415c..addc4ec910 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ include("CMake/DefineOptions.cmake") # Set up version numbers according to the new scheme. set(SM_VERSION_MAJOR 5) set(SM_VERSION_MINOR 0) -set(SM_VERSION_PATCH 7) +set(SM_VERSION_PATCH 8) set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") execute_process(COMMAND git rev-parse --short HEAD diff --git a/Docs/Changelog_language.txt b/Docs/Changelog_language.txt index c9eba36c29..8c55b3f1cc 100644 --- a/Docs/Changelog_language.txt +++ b/Docs/Changelog_language.txt @@ -16,6 +16,11 @@ Example: This means that three strings were added to the "ScreenDebugOverlay" section, "Mute actions", "Mute actions on", and "Mute actions off". +2015/05/09 +---------- +* [OptionExplanations] AxisFix +* [OptionTitles] AxisFix + 2015/05/05 ---------- * [ScreenGameplay] SkipSongText diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 4c938765d4..c3ec82f8fc 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -4,6 +4,14 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt. ________________________________________________________________________________ +2015/05/09 +---------- +* [general] Workaround for the axis problem added. Set the Axis Fix + preference under Input Options to true if you have the axis problem. + [Fighter19] +* [general] Added XML to Lua converter. See Docs/Themerdocs/XmlToLua.txt for + details. [kyzentun] + 2015/05/05 ---------- * [Gameplay] Holding Select on gameplay now skips the current song in course diff --git a/Docs/Themerdocs/XmlToLua.txt b/Docs/Themerdocs/XmlToLua.txt index 1dae2f1d4f..252ece92c9 100644 --- a/Docs/Themerdocs/XmlToLua.txt +++ b/Docs/Themerdocs/XmlToLua.txt @@ -46,9 +46,9 @@ something that has to be a certain type. * File field conditions: * Images and .sprite files are converted to Sprites. * .txt and .model files are converted to Models. - * Folders are converted to use LoadActor, which has its own rules for - guessing the actor type. - * Sound files are converted to ActorSound. + * Folders are converted to use LoadActor, which has its own rules for + guessing the actor type. + * Sound files are converted to ActorSound. * If there is a Text field, the actor is assumed to be a BitmapText. @@ -118,8 +118,8 @@ So after conversion you might see something like this: ``` xtl_cond_a_result= GAMESTATE:IsPlayerEnabled(PLAYER_1) local function optional_actor(cond, actor) - if cond then return actor end - return Def.Actor{} + if cond then return actor end + return Def.Actor{} end ``` The optional_actor function is a convenient way to insert a blank, unrendered @@ -129,8 +129,8 @@ You'll see it used like this: optional_actor(xtl_cond_a_result, Def.Sprite{ Name= "xtl_actor_g", - InitCommand= cmd(x,0;y,0), - Texture= "foo 3x1.png", + InitCommand= cmd(x,0;y,0), + Texture= "foo 3x1.png", }), ```