Commits · 7f120c3765d9fc0487bca2a79c26cc85ec8c6f9a · MG_Projects / jetpackjoyride

27 Apr, 2019 4 commits
- Merge origin/master into Melissa2 · 7f120c37
  Melissa Tjong authored Apr 27, 2019
  
  7f120c37
- . · 9d51334e
  Melissa Tjong authored Apr 27, 2019
  
  9d51334e
- . · c6896043
  Melissa Tjong authored Apr 27, 2019
  
  c6896043
- . · 22c7f99b
  Melissa Tjong authored Apr 27, 2019
  
  22c7f99b
26 Apr, 2019 3 commits
- . · aa615bfa
  Melissa Tjong authored Apr 26, 2019
  
  aa615bfa
- image · 5bce46c7
  Melissa Tjong authored Apr 26, 2019
  
  5bce46c7
- End of day Thursday · e1d9b0db
  Nicholas Bindela authored Apr 26, 2019
  
  e1d9b0db
25 Apr, 2019 6 commits
- End of day Thursday · a3cb0bf3
  Nicholas Bindela authored Apr 25, 2019
  
  a3cb0bf3
- Main Menu · 9e38a113
  Melissa Tjong authored Apr 25, 2019
  
  9e38a113
- Added Levels · 7dfbad64
  Nicholas Bindela authored Apr 25, 2019
  
  7dfbad64
- Merge origin/master into Melissa2 · 434941b7
  Melissa Tjong authored Apr 25, 2019
  
  434941b7
- Added Levels · eaec7ca0
  Nicholas Bindela authored Apr 25, 2019
  
  eaec7ca0
- Added Levels · 6ee05db4
  Nicholas Bindela authored Apr 25, 2019
  
  6ee05db4
24 Apr, 2019 6 commits
- Merge origin/master into Melissa2 · cbf43429
  Melissa Tjong authored Apr 24, 2019
  
  cbf43429
- help · b7880eef
  Melissa Tjong authored Apr 24, 2019
  
  b7880eef
- Merge Nick1 · e96c13d6
  Nicholas Bindela authored Apr 24, 2019
  
  e96c13d6
- End of Day Tuesday, Nicks changes · af0db162
  Nicholas Bindela authored Apr 24, 2019
  
  af0db162
- Merge origin/master · 51148c4a
  Nicholas Bindela authored Apr 24, 2019
  
  51148c4a
- End of Day Tuesday, Nicks changes · 6992da5e
  Nicholas Bindela authored Apr 24, 2019
  
  6992da5e
23 Apr, 2019 3 commits
- End of Day Tuesday, Nicks changes · b8d28022
  Nicholas Bindela authored Apr 23, 2019
  
  b8d28022
- Upload New File · c503cdf3
  Aditi Vijayvergia authored Apr 23, 2019
  
  c503cdf3
- Merge Nick1 · 3a3bf6f0
  Nicholas Bindela authored Apr 23, 2019
```
Conflicts:
	src/project/Main.java
	src/project/Obstacle.java
```
  3a3bf6f0
22 Apr, 2019 8 commits
- Merge Nick1 · 976bcab4
  Nicholas Bindela authored Apr 22, 2019
```
Conflicts:
	src/project/Main.java
	src/project/Obstacle.java
```
  976bcab4
- HHHHHHHHH · 01465038
  Nicholas Bindela authored Apr 22, 2019
  
  01465038
- hdf · 2f57e129
  Nicholas Bindela authored Apr 22, 2019
  
  2f57e129
- please work · d6b6d1a3
  Nicholas Bindela authored Apr 22, 2019
  
  d6b6d1a3
- git stuff · 841ed540
  Nicholas Bindela authored Apr 22, 2019
  
  841ed540
- changed gitignore · 1e8f4ac1
  Nicholas Bindela authored Apr 22, 2019
  
  1e8f4ac1
- gitignore · af9b03c5
  Nicholas Bindela authored Apr 22, 2019
  
  af9b03c5
- Refactored changes · d2beb5d0
  Nicholas Bindela authored Apr 22, 2019
  
  d2beb5d0
21 Apr, 2019 1 commit
- Changed to statebased game · 0f1af33f
  Nicholas Bindela authored Apr 21, 2019
  
  0f1af33f
20 Apr, 2019 1 commit
- Main Menu · b06fa6eb
  Melissa Tjong authored Apr 20, 2019
  
  b06fa6eb
19 Apr, 2019 5 commits
- Changed to statebased game · 1e383f32
  Nicholas Bindela authored Apr 19, 2019
  
  1e383f32
- Changed to statebased game · e505e771
  Nicholas Bindela authored Apr 19, 2019
  
  e505e771
- Committing FireballVertical · 91aaecb0
  Nicholas Bindela authored Apr 19, 2019
  
  91aaecb0
- Committing FireballVertical · bbd2b536
  Nicholas Bindela authored Apr 19, 2019
  
  bbd2b536
- Merge Nick1 · 3e2647e0
  Nicholas Bindela authored Apr 19, 2019
```
Conflicts:
	src/project/SetUpClass.java
```
  3e2647e0
18 Apr, 2019 3 commits
- Upload New File · 47c9258e
  mag051 authored Apr 18, 2019
  
  47c9258e
- Background · fea5d2a4
  mag051 authored Apr 18, 2019
  
  fea5d2a4
- Jetpack working · 3db85d7e
  Nicholas Bindela authored Apr 18, 2019
  
  3db85d7e