Merge branch 'master' into maintenance/7.0

Revert "Bump version to 7.1."
This reverts commit baba291609.
2017-10-27 18:09:46 -04:00 · 2017-10-25 22:27:10 -04:00 · 2017-10-25 22:19:12 -04:00 · 2017-10-21 21:01:06 -04:00 · 2017-10-21 21:01:06 -04:00 · 2017-10-21 21:01:06 -04:00
1 changed files with 1 additions and 1 deletions
@@ -41,7 +41,7 @@ except ImportError:
    vc_version = 0

 # The tuple giving the version number.
-version_tuple = (7, 1, 0, vc_version)
+version_tuple = (6, 99, 13, vc_version)

 # The name of this version.
 version_name = "We came in peace."
Author	SHA1	Message	Date
Tom Rothamel	351ab91f80	Merge branch 'master' into maintenance/7.0	2017-10-27 18:09:46 -04:00
Tom Rothamel	09b3e071da	Revert "Bump version to 7.1." This reverts commit `baba291609`.	2017-10-25 22:27:10 -04:00
Tom Rothamel	b7f88bb934	Merge branch 'master' into maint/7.0	2017-10-25 22:19:12 -04:00
Tom Rothamel	cac50d3099	Create music contexts out of the periodic function. This prevents a problem where creating them in the context can interfere with rollback. Fixes #1278.	2017-10-21 21:01:06 -04:00
Tom Rothamel	7c4b859fa2	More locking.	2017-10-21 21:01:06 -04:00
Tom Rothamel	c7aef439b5	Make the audio periodic thread optional.	2017-10-21 21:01:06 -04:00
Tom Rothamel	a24b1eb49c	Move renpy.audio.periodic into its own thread. Per #1174. This is one of the few places where Ren'Py reads from a file, completely unpredictably. Hence, it's one of the few places where disk access outside Ren'Py can block the main thread. Now, audio files are opened in a special thread, leaving the GUI thread to do its thing.	2017-10-21 21:01:06 -04:00