Commits · master · MG_Projects / jetpackjoyride

30 Apr, 2019 34 commits
- Delete Laser.java · e13ea5fa
  Melissa Tjong authored Apr 30, 2019
  
  e13ea5fa
- Delete megaManSpriteSheet.png · da78b496
  Melissa Tjong authored Apr 30, 2019
  
  da78b496
- Delete xeonsheet.bmp · cca55fe2
  Melissa Tjong authored Apr 30, 2019
  
  cca55fe2
- Upload New File · e341dd6a
  mag051 authored Apr 30, 2019
  
  e341dd6a
- Delete megaManSprite.xcf · 52a472c5
  Melissa Tjong authored Apr 30, 2019
  
  52a472c5
- Delete laser_on.png · 91f22ff8
  Melissa Tjong authored Apr 30, 2019
  
  91f22ff8
- Delete laser_off.png · d19fcf05
  Melissa Tjong authored Apr 30, 2019
  
  d19fcf05
- Delete bison.png · bc9447b3
  Melissa Tjong authored Apr 30, 2019
  
  bc9447b3
- Delete NewZapper.png · fa9374a2
  Melissa Tjong authored Apr 30, 2019
  
  fa9374a2
- Delete Fireball_Vertical.png · e7c97e79
  Melissa Tjong authored Apr 30, 2019
  
  e7c97e79
- Delete Link.png · b401dc63
  Melissa Tjong authored Apr 30, 2019
  
  b401dc63
- Delete Background.gif · e35221b6
  Melissa Tjong authored Apr 30, 2019
  
  e35221b6
- Commiting jar file · 90eff3d4
  Nicholas Bindela authored Apr 30, 2019
  
  90eff3d4
- Done · 1d9d47ee
  Nicholas Bindela authored Apr 30, 2019
  
  1d9d47ee
- Upload New File · d0ba489d
  Aditi Vijayvergia authored Apr 30, 2019
  
  d0ba489d
- Upload New File · 02674ec2
  Aditi Vijayvergia authored Apr 30, 2019
  
  02674ec2
- Upload New File · 61554434
  Aditi Vijayvergia authored Apr 30, 2019
  
  61554434
- Add new directory · 7ca5b36b
  Aditi Vijayvergia authored Apr 30, 2019
  
  7ca5b36b
- Upload New File · 9aaa89e4
  Aditi Vijayvergia authored Apr 30, 2019
  
  9aaa89e4
- Upload New File · 681344c9
  Aditi Vijayvergia authored Apr 30, 2019
  
  681344c9
- Upload New File · 8e105d1d
  Aditi Vijayvergia authored Apr 30, 2019
  
  8e105d1d
- Upload New File · 3fabbd57
  Aditi Vijayvergia authored Apr 30, 2019
  
  3fabbd57
- Upload New File · 28b662e2
  Aditi Vijayvergia authored Apr 30, 2019
  
  28b662e2
- Add new directory · 9742800a
  Aditi Vijayvergia authored Apr 30, 2019
  
  9742800a
- Upload New File · e2145d61
  Aditi Vijayvergia authored Apr 30, 2019
  
  e2145d61
- Upload New File · 4f354959
  Aditi Vijayvergia authored Apr 30, 2019
  
  4f354959
- Upload New File · 0e9f3318
  Aditi Vijayvergia authored Apr 30, 2019
  
  0e9f3318
- Add new directory · abae0e58
  Aditi Vijayvergia authored Apr 30, 2019
  
  abae0e58
- Final · 5dda5e0b
  Melissa Tjong authored Apr 30, 2019
  
  5dda5e0b
- Final · 12617044
  Melissa Tjong authored Apr 30, 2019
  
  12617044
- Merge origin/master into Melissa2 · e3a3ed38
  Melissa Tjong authored Apr 30, 2019
```
Conflicts:
	src/project/GameOver.java
	src/project/Level.java
	src/project/Level1.java
	src/project/Level2.java
	src/project/Level3.java
	src/project/Level4.java
	src/project/Level5.java
	src/project/Level6.java
```
  e3a3ed38
- Final tweaks · 70c89b2e
  Melissa Tjong authored Apr 30, 2019
  
  70c89b2e
- Added comments and JUint tests · 9fbcf3c8
  Nicholas Bindela authored Apr 30, 2019
  
  9fbcf3c8
- Merge origin/master · 94023bb9
  Nicholas Bindela authored Apr 30, 2019
  
  94023bb9
27 Apr, 2019 6 commits
- Choose Character Screen · f78f21fa
  Melissa Tjong authored Apr 27, 2019
  
  f78f21fa
- Choose Character Screen · f3509bb1
  Melissa Tjong authored Apr 27, 2019
  
  f3509bb1
- 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