Merge branch 'experimental' into controllerfixup

# Conflicts:
#	Aquaria/Avatar.cpp
#	Aquaria/Continuity.cpp
#	Aquaria/DSQ.cpp
#	Aquaria/DSQ.h
#	Aquaria/Game.cpp
#	Aquaria/Game.h
#	Aquaria/Main.cpp
#	Aquaria/UserSettings.cpp
#	BBGE/Base.cpp
#	BBGE/Base.h
#	BBGE/Core.cpp
#	BBGE/Core.h
#	BBGE/DebugFont.cpp
#	BBGE/Shader.cpp
#	BBGE/SoundManager.h

ExternalLibs/ttvfs_cfileapi/ttvfs_stdio.h

@@ -6,13 +6,14 @@
 // * Define VFS_ENABLE_C_API to 1 to use ttvfs overrides.
 
 /*
-    This file is a minimal wrapper to replace the C API and std::ifstream.
-    Note that if you have an advanced needs, this wrapper API is not for you.
+    This file is a poor man's wrapper to replace the C API and std::ifstream.
+    Note that if you have any advanced needs, this wrapper API is not for you.
 
     To use it, go through your code and rename all FILE* to VFILE*,
     and fopen() and related to vfopen() (so just put a 'v' in front).
     Instead of std::ifstream, use InStream. If you use std::fstream for reading ONLY,
     also use InStream.
+    Make sure that a FILE* is not opened twice at any time - this is not supported.
 
     Note that the seek and tell functions do not offer 64 bit offsets in this API.
 */
@@ -35,6 +36,8 @@ typedef ttvfs::File VFILE;
 
 void ttvfs_setroot(ttvfs::Root *root);
 
+// Note that vfopen() returns the same pointer for the same file name,
+// so effectively a file is a singleton object.
 VFILE *vfopen(const char *fn, const char *mode);
 size_t vfread(void *ptr, size_t size, size_t count, VFILE *vf);
 int vfclose(VFILE *vf);