Merge pull request #47 from schadocalex/master

Version 4.1.1
La-separation · Feb 24, 2015 · 0f7656d · 0f7656d
2 parents b56f61e + 758623a
commit 0f7656d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### 4.1.1 (24/02/2015)
+Fonctionnalités :
+* Ajout du son ambiant à nouveau (+ version mp3)
+
 #### 4.1.0 (24/02/2015)
 Fonctionnalités :
 * Editeur multi-lignes

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Application - La Séparation v4.1.0
+Application - La Séparation v4.1.1
 =======
 
 Application web et tablette sur la poésie à deux mi-mots
diff --git a/build/res/sound/ambiant.mp3 b/build/res/sound/ambiant.mp3
@@ -0,0 +1 @@
+../../../res/sound/ambiant.mp3
diff --git a/build/res/sound/ambiant.ogg b/build/res/sound/ambiant.ogg
@@ -0,0 +1 @@
+../../../res/sound/ambiant.ogg
diff --git a/build/separation.min.js b/build/separation.min.js
diff --git a/src/rooter.js b/src/rooter.js
@@ -48,14 +48,14 @@ Rooter.preloadAll = function(handler) {
 			// {src:"sound/rub2.ogg", id:"audio_rub2"},
 			// {src:"sound/tear1.ogg", id:"audio_tear1"},
 			// {src:"sound/tear2.ogg", id:"audio_tear2"},
-			// {src:"sound/ambiant.ogg", id:"audio_ambiant"}
+			{src:"sound/ambiant.ogg", id:"audio_ambiant"}
     ];
 
 	// createjs.Sound.registerPlugins([createjs.HTMLAudioPlugin, createjs.WebAudioPlugin, createjs.FlashPlugin]);
 
 	preload = new createjs.LoadQueue(false, "res/");
-	// createjs.Sound.alternateExtensions = ["mp3"];
-	// preload.installPlugin(createjs.Sound);
+	createjs.Sound.alternateExtensions = ["mp3"];
+	preload.installPlugin(createjs.Sound);
 	preload.on("complete", function() { initAllSS(); handler(); });
 	preload.loadManifest(manifest);
 };