Commit bb58ad90 authored by P P's avatar P P
Browse files

Merge remote-tracking branch 'origin/top-secret' into top-secret

parents 7a356723 bd95b636

app/src/main/java/com/example/game2d/ChalkActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class ChalkActivity extends AppCompatActivity implements View.OnClickList 
        // BGM

        backgroundMusic = MediaPlayer.create(this,R.raw.tanpopo);

        backgroundMusic.setLooping(true);

        //backgroundMusic.start();

        backgroundMusic.start();



        //for pop up intro

        layout = findViewById(R.id.chalkActivity); // relative is the id of the layout of the page
@@ -140,7 +140,9 @@ public class ChalkActivity extends AppCompatActivity implements View.OnClickList 
            } else if(selectedAnswer.equals(ChalkQuestionAnswer.correctAnswers[currentQuestionIndex])){

                //SFX

                MediaPlayer correctSound = MediaPlayer.create(this, R.raw.correct);

                if (currentQuestionIndex != 3) {

                    correctSound.start();

                }

                selectedAnswer = "";

                chalkscore++;

                currentQuestionIndex++;

app/src/main/java/com/example/game2d/ChalkGameRIPActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -11,11 +11,12 @@ import android.widget.Button; 
public class ChalkGameRIPActivity extends AppCompatActivity {

    private Button resButton;



    MediaPlayer ripSound = MediaPlayer.create(getApplicationContext(), R.raw.gta_wasted);

    MediaPlayer ripSound;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        ripSound = MediaPlayer.create(getApplicationContext(), R.raw.gta_wasted);

        ripSound.start();

        setContentView(R.layout.activity_chalk_game_ripactivity);

        resButton = findViewById(R.id.ChalkRIPResume);

app/src/main/java/com/example/game2d/ChalkResultActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ public class ChalkResultActivity extends AppCompatActivity { // 
    int lastChalkScore;

    int bestChalk;



MediaPlayer winSound = MediaPlayer.create(getApplicationContext(), R.raw.eerie_win);

    MediaPlayer winSound;



    Button submitBtn;
@@ -34,6 +34,7 @@ MediaPlayer winSound = MediaPlayer.create(getApplicationContext(), R.raw.eerie_w 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_name_result);

        winSound = MediaPlayer.create(this, R.raw.eerie_win);

        winSound.start();

        Log.d("CHALKRESULT", "onCreate after sound start");

        Window window = getWindow();

app/src/main/java/com/example/game2d/ChalkToQuizActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ import android.widget.Button; 
public class ChalkToQuizActivity extends AppCompatActivity {

    private Button resButton;



    MediaPlayer victorySound = MediaPlayer.create(getApplicationContext(), R.raw.valorant_ace);



    MediaPlayer victorySound;

    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        victorySound = MediaPlayer.create(getApplicationContext(), R.raw.valorant_ace);

        victorySound.start();

        setContentView(R.layout.activity_chalk_to_quiz);

        resButton = findViewById(R.id.ChalktoQuizResume);

app/src/main/java/com/example/game2d/CharacterActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.media.MediaPlayer;

import android.os.Bundle;

import android.util.Log;

import android.view.View;
@@ -24,6 +25,8 @@ public class CharacterActivity extends AppCompatActivity { 


    public boolean selectedShortHair;



    MediaPlayer openSound;



    String username ; // <--- store the username in this variable



    String ID;
@@ -33,6 +36,9 @@ public class CharacterActivity extends AppCompatActivity { 
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_character_selection);



        openSound = MediaPlayer.create(this, R.raw.metal_click);

        openSound.start();



        Window window = getWindow();

        window.setFlags(

                WindowManager.LayoutParams.FLAG_FULLSCREEN,