Commits · 30032994ae509afc2741d7c9e3c622eacd265086 · P P / Group7project Demo

Apr 30, 2023
- comments · 30032994
  Ethan Liang authored Apr 29, 2023
  
  30032994
Apr 29, 2023
- characteractivity metal click sound. WITH THIS, ALL MUSIC AND SFX SHOULD BE DONE · bf30ffc9
  Ethan Liang authored Apr 29, 2023
  
  bf30ffc9
- uncommented chalk quiz bgm · a5693035
  Ethan Liang authored Apr 29, 2023
  
  a5693035
- Merge remote-tracking branch 'origin/top-secret' into top-secret · fb78c9ca
  Ethan Liang authored Apr 29, 2023
  
  fb78c9ca
- the sound errors are all fixed, updated sound file · 25435e14
  Ethan Liang authored Apr 29, 2023
  
  25435e14
- get presaved credential · c5d7200c
  P P authored Apr 29, 2023
  
  c5d7200c
- Implemented character selection · 6a195400
  Ankita Tiwari authored Apr 29, 2023
  
  6a195400
- Merge remote-tracking branch 'origin/top-secret' into top-secret · 13f7ae8f
  Ankita Tiwari authored Apr 29, 2023
  
  13f7ae8f
- Merge branch 'top-secret' of... · 96cb049e
  Ankita Tiwari authored Apr 29, 2023
  
  Merge branch 'top-secret' of /Users/ankitatiwari1/AndroidStudioProjects/group7project with conflicts.
  96cb049e
- Merge remote-tracking branch 'origin/top-secret' into top-secret · 3a5aa221
  Ethan Liang authored Apr 29, 2023
  
  3a5aa221
- 2 new sound files · 8f99c00f
  Ethan Liang authored Apr 29, 2023
  
  8f99c00f
- boss music, chalk result music, chalktoquiz win music · 5b7fe4cd
  Ethan Liang authored Apr 29, 2023
  
  5b7fe4cd
- Merge remote-tracking branch 'origin/top-secret' into top-secret · ac44d150
  P P authored Apr 29, 2023
  
  ac44d150
- characterActivity Change · b04fb7b2
  P P authored Apr 29, 2023
  
  b04fb7b2
- Merge remote-tracking branch 'origin/top-secret' into top-secret · 0d11cd04
  Ethan Liang authored Apr 29, 2023
  
  0d11cd04
- error free sfx chalk dodge (for now) · 9106820f
  Ethan Liang authored Apr 29, 2023
  
  9106820f
- Merge remote-tracking branch 'origin/top-secret' into top-secret · 7724bac7
  Ankita Tiwari authored Apr 29, 2023
  
  # Conflicts: # app/src/main/java/com/example/game2d/ChalkGameActivity.java
  7724bac7
- fixed previous timed task bug in ChalkGameActivity · 1f6228c9
  Ankita Tiwari authored Apr 29, 2023
  
  1f6228c9
- update moog city 2 · 5c9c6f54
  Ethan Liang authored Apr 29, 2023
  
  5c9c6f54
- delete timer2 · 2b97e4fc
  Ethan Liang authored Apr 29, 2023
  
  2b97e4fc
- Merge remote-tracking branch 'origin/top-secret' into top-secret · d1667b39
  Ankita Tiwari authored Apr 29, 2023
  
  # Conflicts: # app/src/main/java/com/example/game2d/ChalkGameClass.java
  d1667b39
- Added ChalkRIP page · aa39114f
  Ankita Tiwari authored Apr 29, 2023
  
  aa39114f
- Merge remote-tracking branch 'origin/top-secret' into top-secret · c8db4911
  Ethan Liang authored Apr 29, 2023
  
  c8db4911
- chalk dodge mediaplyer fixes ?? · e38c8f2f
  Ethan Liang authored Apr 29, 2023
  
  e38c8f2f
- Merge remote-tracking branch 'origin/top-secret' into top-secret · becb892e
  Ankita Tiwari authored Apr 29, 2023
  
  becb892e
- character flip image · cfef98f8
  P P authored Apr 29, 2023
  
  cfef98f8
- Merge remote-tracking branch 'origin/top-secret' into top-secret · f61a1782
  Ankita Tiwari authored Apr 29, 2023
  
  # Conflicts: # .gradle/7.5/executionHistory/executionHistory.bin # .gradle/7.5/executionHistory/executionHistory.lock # .gradle/7.5/fileHashes/fileHashes.bin # .gradle/7.5/fileHashes/fileHashes.lock # .gradle/7.5/fileHashes/resourceHashesCache.bin # .gradle/buildOutputCleanup/buildOutputCleanup.lock # .gradle/buildOutputCleanup/outputFiles.bin # .gradle/file-system.probe # local.properties
  f61a1782
- Merge branch 'top-secret' of... · b5132015
  Ankita Tiwari authored Apr 29, 2023
  
  Merge branch 'top-secret' of /Users/ankitatiwari1/AndroidStudioProjects/group7project with conflicts.
  b5132015
- username+id system · 996b5fb9
  P P authored Apr 29, 2023
  
  996b5fb9
Apr 28, 2023
- more leaderboard UI · c90b5426
  P P authored Apr 28, 2023
  
  c90b5426
- leaderboard UI · e90943bf
  P P authored Apr 28, 2023
  
  e90943bf
- name +id system applied not implemented · 3aa05e76
  P P authored Apr 28, 2023
  
  3aa05e76
- Merge remote-tracking branch 'origin/top-secret' into top-secret · 6c63753d
  Ethan Liang authored Apr 27, 2023
  
  # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/game2d/ChalkActivity.java
  6c63753d
- paused chalk music; debug last chalk question begin; randomize orders... · dd799e4d
  Ethan Liang authored Apr 27, 2023
  
  paused chalk music; debug last chalk question begin; randomize orders implemented but commented out;
  dd799e4d
- Merge branch 'top-secret' of... · 39585bef
  Elena Berrios authored Apr 27, 2023
  
  Merge branch 'top-secret' of https://agile.bu.edu/gitlab/ec327_projects/group7project into top-secret
  39585bef
- Firebase functioning · f2039815
  Elena Berrios authored Apr 27, 2023
  
  f2039815
- Added ChalkRIP page · db3cddbd
  Ankita Tiwari authored Apr 27, 2023
  
  db3cddbd
- Firebase in progress 2 · 77560cdd
  Elena Berrios authored Apr 27, 2023
  
  77560cdd
- Flipped Gravity · e0faee4e
  Ankita Tiwari authored Apr 27, 2023
  
  e0faee4e
- Merge remote-tracking branch 'origin/top-secret' into top-secret · 63c9b2bf
  Ankita Tiwari authored Apr 27, 2023
  
  63c9b2bf