Commit a144c2c1 authored Apr 30, 2023 by Aric Peng

Merge branch 'arics_update' of https://agile.bu.edu/gitlab/ec327_projects/group3project

 Conflicts:
	.gradle/7.5/executionHistory/executionHistory.lock
	.gradle/7.5/fileHashes/fileHashes.bin
	.gradle/7.5/fileHashes/fileHashes.lock
	.gradle/buildOutputCleanup/buildOutputCleanup.lock
	.idea/workspace.xml
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/aritetrisburg/DrawView.java
	app/src/main/java/com/example/aritetrisburg/GameState.java
	app/src/main/java/com/example/aritetrisburg/MainActivity.java
	app/src/main/java/com/example/aritetrisburg/Tetramino.java
	app/src/main/res/values/ids.xml

parents 9602e31b 381cb11d

.gitignore

+34 −0

Original line number	Diff line number	Diff line
		@@ -13,3 +13,37 @@
		.externalNativeBuild
		.cxx
		local.properties

		# Gradle files
		.gradle/
		build/

		# Local configuration file (sdk path, etc)
		local.properties

		# Log/OS Files
		*.log

		# Android Studio generated files and folders
		captures/
		.externalNativeBuild/
		.cxx/
		*.apk
		output.json

		# IntelliJ
		*.iml
		.idea/
		misc.xml
		deploymentTargetDropDown.xml
		render.experimental.xml

		# Keystore files
		*.jks
		*.keystore

		# Google Services (e.g. APIs or Firebase)
		google-services.json

		# Android Profiling
		*.hprof

.gradle/7.5/checksums/checksums.lock

deleted100644 → 0

−17 B

File deleted.

.gradle/7.5/checksums/md5-checksums.bin

deleted100644 → 0

−18.2 KiB

File deleted.

.gradle/7.5/checksums/sha1-checksums.bin

deleted100644 → 0

−18.8 KiB

File deleted.

.gradle/7.5/dependencies-accessors/dependencies-accessors.lock

deleted100644 → 0

−17 B

File deleted.