-
- Downloads
Merge branch 'top-secret' of...
Merge branch 'top-secret' of /Users/ankitatiwari1/AndroidStudioProjects/group7project with conflicts.
Showing
- .gradle/7.5/executionHistory/executionHistory.bin 0 additions, 0 deletions.gradle/7.5/executionHistory/executionHistory.bin
- .gradle/7.5/executionHistory/executionHistory.lock 0 additions, 0 deletions.gradle/7.5/executionHistory/executionHistory.lock
- .gradle/7.5/fileHashes/fileHashes.bin 0 additions, 0 deletions.gradle/7.5/fileHashes/fileHashes.bin
- .gradle/7.5/fileHashes/fileHashes.lock 0 additions, 0 deletions.gradle/7.5/fileHashes/fileHashes.lock
- .gradle/7.5/fileHashes/resourceHashesCache.bin 0 additions, 0 deletions.gradle/7.5/fileHashes/resourceHashesCache.bin
- .gradle/buildOutputCleanup/buildOutputCleanup.lock 0 additions, 0 deletions.gradle/buildOutputCleanup/buildOutputCleanup.lock
- .idea/render.experimental.xml 6 additions, 0 deletions.idea/render.experimental.xml
- app/src/main/AndroidManifest.xml 7 additions, 2 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/game2d/ChalkGameClass.java 1 addition, 1 deletionapp/src/main/java/com/example/game2d/ChalkGameClass.java
- app/src/main/java/com/example/game2d/ChalkToQuizActivity.java 28 additions, 0 deletions...src/main/java/com/example/game2d/ChalkToQuizActivity.java
- app/src/main/java/com/example/game2d/Game.java 1 addition, 0 deletionsapp/src/main/java/com/example/game2d/Game.java
- app/src/main/java/com/example/game2d/NamePause.java 11 additions, 0 deletionsapp/src/main/java/com/example/game2d/NamePause.java
- app/src/main/java/com/example/game2d/PauseWindow.java 11 additions, 0 deletionsapp/src/main/java/com/example/game2d/PauseWindow.java
- app/src/main/java/com/example/game2d/QuizToChalkActivity.java 1 addition, 3 deletions...src/main/java/com/example/game2d/QuizToChalkActivity.java
- app/src/main/res/layout/activity_chalk_to_quiz.xml 65 additions, 0 deletionsapp/src/main/res/layout/activity_chalk_to_quiz.xml
- app/src/main/res/layout/activity_name_pause.xml 9 additions, 10 deletionsapp/src/main/res/layout/activity_name_pause.xml
- app/src/main/res/layout/activity_pause_window.xml 23 additions, 18 deletionsapp/src/main/res/layout/activity_pause_window.xml
- app/src/main/res/layout/activity_quiz_to_chalk.xml 3 additions, 3 deletionsapp/src/main/res/layout/activity_quiz_to_chalk.xml
- local.properties 2 additions, 7 deletionslocal.properties
Loading
Please register or sign in to comment