Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: La-separation/application_old
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: schadocalex/application_v2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 8, 2013

  1. test audio

    N3mesis98 committed Oct 8, 2013
    Copy the full SHA
    487ee8b View commit details
  2. audio tablettes réparé

    N3mesis98 committed Oct 8, 2013
    Copy the full SHA
    fc0da8d View commit details
  3. audio tablette réparé

    N3mesis98 committed Oct 8, 2013
    Copy the full SHA
    ff2532b View commit details
  4. fichiers audio mp3

    N3mesis98 committed Oct 8, 2013
    Copy the full SHA
    0a90589 View commit details
  5. audio format wav

    N3mesis98 committed Oct 8, 2013
    Copy the full SHA
    900709a View commit details
  6. audio stable format .wav

    N3mesis98 committed Oct 8, 2013
    Copy the full SHA
    1a416e5 View commit details
Showing with 13 additions and 13 deletions.
  1. +2 −2 main.html
  2. +5 −5 scripts/libs/separation_toolkit/sound/sound_play.js
  3. +4 −4 scripts/main/init.js
  4. +2 −2 scripts/main/main.js
4 changes: 2 additions & 2 deletions main.html
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@
<link rel="stylesheet" href="style/style.css" />
<title>La Séparation</title>

<!-- <script type="text/javascript" src="phonegap.js"></script> -->
<script type="text/javascript" src="phonegap.js"></script>

<!-- scripts/libs -->
<script type="text/javascript" src="scripts/libs/jquery-2.0.2.min.js"></script>
<script type="text/javascript" src="scripts/libs/kinetic-v4.6.0.min.js"></script>

<!-- scripts/libs/separation_toolkit -->
<script defer type="text/javascript" src="scripts/libs/separation_toolkit/intro.js"></script>

<!-- scripts/libs/separation_toolkit/word -->
<script type="text/javascript" src="scripts/libs/separation_toolkit/word/constantes.js"></script>
<script defer type="text/javascript" src="scripts/libs/separation_toolkit/word/word.js"></script>
10 changes: 5 additions & 5 deletions scripts/libs/separation_toolkit/sound/sound_play.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
function sound_play(name) {
// if (appOnDevice()) {
// sounds[name].play();
// }
// else {
if (appOnDevice()) {
sounds[name].play();
}
else {
document.getElementById(name).play();
// }
}
}
8 changes: 4 additions & 4 deletions scripts/main/init.js
Original file line number Diff line number Diff line change
@@ -42,10 +42,10 @@ function initImages() {

function initSounds() {
if (appOnDevice()) {
sounds["cut"] = new Media("sounds/cut.wav");
sounds["rub"] = new Media("sounds/rub.wav");
sounds["tear"] = new Media("sounds/tear.wav");
sounds["ambiant"] = new Media("sounds/ambiant.wav");
sounds["cut"] = new Media("/android_asset/www/sounds/cut.wav");
sounds["rub"] = new Media("/android_asset/www/sounds/rub.wav");
sounds["tear"] = new Media("/android_asset/www/sounds/tear.wav");
sounds["ambiant"] = new Media("/android_asset/www/sounds/ambiant.wav");
}
}

4 changes: 2 additions & 2 deletions scripts/main/main.js
Original file line number Diff line number Diff line change
@@ -38,9 +38,9 @@ function checkDevice() {
initImages();
initSounds();

//introductionStage();
introductionStage();
//initMainMenu();
Recit.start();
//Recit.start();

stage.add(mainLayer);
stage.add(actionLayer);