Commits · abcb07781b6511444098e4df6feb0636db16cbc9 · Jilin Zheng / Group3Project

May 01, 2023
- ready for demo · abcb0778
  Jilin Zheng authored 2 years ago
  
  abcb0778
- ready for demo, added functional radio buttons in the settings page. · b5db6bfe
  Aric Peng authored 2 years ago
  
  b5db6bfe
- Merge remote-tracking branch 'origin/arics_update' into arics_update · 038ec0c8
  Aric Peng authored 2 years ago
  
  # 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
  038ec0c8
- ready for demo, added functional radio buttons in the settings page. · fb25838e
  Aric Peng authored 2 years ago
  
  fb25838e
- Merge remote-tracking branch 'demo/master' into demo · f27aec61
  Jilin Zheng authored 2 years ago
  
  f27aec61
- project demo · b9646a6d
  Jilin Zheng authored 2 years ago
  
  b9646a6d
- video showing current app capabilities · e6e2a198
  Jilin Zheng authored 2 years ago
  
  e6e2a198
- project demo · 45a80ce8
  Jilin Zheng authored 2 years ago
  
  45a80ce8
- project demo · 484d7583
  Jilin Zheng authored 2 years ago
  
  484d7583
- ready for demo · 652ee4fd
  Aric Peng authored 2 years ago
  
  652ee4fd
- Initial commit · aaf9382e
  Jilin Zheng authored 2 years ago
  
  aaf9382e
Apr 30, 2023

arics update pt 2 · c160cfe5
Jilin Zheng authored 2 years ago

c160cfe5

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

Aric Peng authored 2 years ago

 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

a144c2c1

aric's update · 9602e31b
Aric Peng authored 2 years ago

9602e31b
Merge branch 'testing' into 'master' · 381cb11d
Jilin Zheng authored 2 years ago
```
Testing

See merge request ec327_projects/group3project!16
```
381cb11d
aric's update · 93fbc931
Aric Peng authored 2 years ago

93fbc931

Apr 28, 2023
- error with pushNewTetramino method of class GameState · d186ccba
  Jilin Zheng authored 2 years ago
  
  d186ccba
- Merge branch 'testing' of https://agile.bu.edu/gitlab/ec327_projects/group3project · 644c8c7d
  Jilin Zheng authored 2 years ago
  
  644c8c7d
- link MainActivity to EnterNameScreen · a4573ed4
  Jilin Zheng authored 2 years ago
  
  a4573ed4
Apr 27, 2023
- Update README.md · 93d0f052
  Jilin Zheng authored 2 years ago
  
  93d0f052
Apr 26, 2023
- Update .gitignore · c39850d2
  Jilin Zheng authored 2 years ago
  
  c39850d2
- Delete PositiveChecker.java · 60a2d841
  Jilin Zheng authored 2 years ago
  
  60a2d841
- remove local.peroperties · 7f18e98a
  Jilin Zheng authored 2 years ago
  
  7f18e98a
- removed libraries · 199d5d37
  Jilin Zheng authored 2 years ago
  
  199d5d37
- removed extra files · 48f3bd2b
  Jilin Zheng authored 2 years ago
  
  48f3bd2b
- Merge remote-tracking branch 'origin/master' · 8e8cee98
  Jilin Zheng authored 2 years ago
  
  8e8cee98
- Delete .gitkeep · c1d6c857
  Jilin Zheng authored 2 years ago
  
  c1d6c857
- remove extra files added initially · c1f32e18
  Jilin Zheng authored 2 years ago
  
  c1f32e18
Apr 25, 2023
- Merge remote-tracking branch 'origin/master' · 87342fb4
  Jilin Zheng authored 2 years ago
  
  # Conflicts: # .gradle/7.5/executionHistory/executionHistory.lock # .gradle/7.5/fileHashes/fileHashes.bin # .gradle/7.5/fileHashes/fileHashes.lock # .gradle/buildOutputCleanup/buildOutputCleanup.lock
  87342fb4
- Merge branch 'v1.0_initial_setup_all_screens' into 'master' · 50c264da
  Jilin Zheng authored 2 years ago
  
  made game fullscreen, restored local.properties See merge request ec327_projects/group3project!15
  50c264da
- Merge branch 'master' into 'v1.0_initial_setup_all_screens' · c20a2912
  Jilin Zheng authored 2 years ago
  
  # Conflicts: # local.properties
  c20a2912
- Merge branch 'local.properties' into 'v1.0_initial_setup_all_screens' · ce002162
  Jilin Zheng authored 2 years ago
  
  Upload New File See merge request ec327_projects/group3project!14
  ce002162
- Upload New File · 4a00e36b
  Jilin Zheng authored 2 years ago
  
  4a00e36b
- Merge branch 'revert-b7ad4fcd ' into 'v1.0_initial_setup_all_screens' · d8884ca7
  Jilin Zheng authored 2 years ago
  
  Revert "made game fullscreen" See merge request ec327_projects/group3project!13
  d8884ca7
- Revert "made game fullscreen" · 6fa1a8bf
  Jilin Zheng authored 2 years ago
  
  This reverts commit b7ad4fcd
  6fa1a8bf
- made game fullscreen · 616a6e9f
  Jilin Zheng authored 2 years ago
  
  616a6e9f
- Merge branch 'revert-38845620 ' into 'master' · 26f39afd
  Jilin Zheng authored 2 years ago
  
  Revert "Delete local.properties" See merge request ec327_projects/group3project!12
  26f39afd
- Revert "Delete local.properties" · 9cb80c02
  Jilin Zheng authored 2 years ago
  
  This reverts commit 38845620
  9cb80c02
- Merge branch 'v1.0_initial_setup_all_screens' of... · 36a279f7
  Jilin Zheng authored 2 years ago
  
  Merge branch 'v1.0_initial_setup_all_screens' 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
  36a279f7
- Merge remote-tracking branch 'origin/master' · 5e61ee10
  Jilin Zheng authored 2 years ago
  
  5e61ee10