John
|
9d344909c1
|
Clean up repo
|
2022-06-01 14:53:10 -04:00 |
bob
|
5de61a7ba7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# out/production/final/GamePanel.class
# out/production/final/GenericSprite.class
|
2022-06-01 14:49:50 -04:00 |
|
bob
|
77e85f72f4
|
Changed map
|
2022-06-01 14:49:35 -04:00 |
|
John
|
21edb5f4f4
|
Minor adjustments
|
2022-06-01 14:48:46 -04:00 |
|
John
|
f6fe5def83
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# out/production/final/GamePanel.class
# out/production/final/GenericSprite.class
|
2022-06-01 14:40:33 -04:00 |
|
John
|
fe43eb9c3b
|
Add sprite spinning, persistent sprite positions, menu
|
2022-06-01 14:39:57 -04:00 |
|
bob
|
2c5cbf5c72
|
Merge time
|
2022-06-01 14:39:10 -04:00 |
|
bob
|
8a3abaf889
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# out/production/final/GamePanel.class
# out/production/final/GenericSprite.class
# out/production/final/Player.class
|
2022-06-01 13:52:32 -04:00 |
|
bob
|
bf7d6e4b19
|
Fixing Jump Bug
|
2022-06-01 13:52:13 -04:00 |
|
John
|
f211a1bf72
|
Clean up git repo
|
2022-06-01 13:51:35 -04:00 |
|
bob
|
2d24fe98fa
|
Fixing merge conflicts
|
2022-05-31 13:31:58 -04:00 |
|
bob
|
dee2e612d3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# out/production/final/GamePanel.class
# src/GamePanel.java
|
2022-05-31 13:27:15 -04:00 |
|
bob
|
ef61ea475b
|
Basic physics
|
2022-05-31 13:19:41 -04:00 |
|
John
|
ded45824eb
|
Add sprites
|
2022-05-31 13:19:23 -04:00 |
|
John
|
e0352d0456
|
Revert changes
|
2022-05-30 14:46:53 -04:00 |
universe
|
772ac20d15
|
delete paddle
|
2022-05-30 14:43:18 -04:00 |
|
John
|
a8edbfbdf6
|
Add Paddle
|
2022-05-30 14:42:42 -04:00 |
|
universe
|
9f30f43361
|
delete paddle
|
2022-05-30 14:40:46 -04:00 |
dogé
|
9d154bbbe6
|
First commit
|
2022-05-30 14:36:18 -04:00 |