diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index a4bf860f71..5ac67a06f5 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -4,6 +4,26 @@ 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/03/24
+----------
+* [Sprite/RageTexture] GetTexturePath moved to RageTexture and renamed to
+ GetPath. [kyzentun]
+
+2015/03/22
+----------
+* [Dev] Primary build method of all platforms changed to CMake. People
+ building from source must install CMake (min 2.8.12) and read
+ Build/README.md for building instructions. [wolfman2000]
+
+2015/03/18
+----------
+* [OSX] Empty Stepmania directory created on desktop removed. [dguzek]
+
+2015/03/17
+----------
+* [ActorFrameTexture] Example added to Themerdocs/Examples/Example_Actors/.
+ Crash fixes for AFTs. [sigatrev]
+
2015/03/15
----------
* [Sprite] GetTexturePath added. [kyzentun]
diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index ccc75165ee..7cc8733d3f 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -1399,6 +1399,7 @@
+
@@ -1654,7 +1655,6 @@
-
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index 95f98a163a..30255d2bce 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -4097,6 +4097,9 @@ save yourself some time, copy this for undocumented things:
Returns the number of frames in this texture.
+
+ Returns the path to the texture's file.
+
Return the texture coordinate rectangle as {left, top, right, bottom}.
@@ -4780,9 +4783,6 @@ save yourself some time, copy this for undocumented things:
Returns the Sprite's texture.
-
- Returns the path to the Sprite's texture.
-
[02 Sprite.lua] Returns a Frames table consisting of iNumFrames frames lasting for a total of fSeconds seconds. This function is not a member function and should be used as Frames = Sprite.LinearFrames( 5, 2.6 ).
diff --git a/src/RageTexture.cpp b/src/RageTexture.cpp
index bdd02897e2..be8bfb3718 100644
--- a/src/RageTexture.cpp
+++ b/src/RageTexture.cpp
@@ -114,6 +114,7 @@ public:
DEFINE_METHOD(GetTextureHeight, GetTextureHeight());
DEFINE_METHOD(GetImageWidth, GetImageWidth());
DEFINE_METHOD(GetImageHeight, GetImageHeight());
+ DEFINE_METHOD(GetPath, GetID().filename);
LunaRageTexture()
{
@@ -129,6 +130,7 @@ public:
ADD_METHOD(GetTextureHeight);
ADD_METHOD(GetImageWidth);
ADD_METHOD(GetImageHeight);
+ ADD_METHOD(GetPath);
}
};
diff --git a/src/Sprite.cpp b/src/Sprite.cpp
index 8b3858c2e4..da98194523 100644
--- a/src/Sprite.cpp
+++ b/src/Sprite.cpp
@@ -1078,7 +1078,6 @@ public:
TEXTUREMAN->EnableOddDimensionWarning();
return 1;
}
- DEFINE_METHOD(GetTexturePath, GetTexturePath());
/* Commands that go in the tweening queue:
* Commands that take effect immediately (ignoring the tweening queue): */
@@ -1225,7 +1224,6 @@ public:
ADD_METHOD( Load );
ADD_METHOD( LoadBanner );
ADD_METHOD( LoadBackground );
- ADD_METHOD(GetTexturePath);
ADD_METHOD( customtexturerect );
ADD_METHOD( SetCustomImageRect );
ADD_METHOD( SetCustomPosCoords );