Chara1236
|
76d914955f
|
Merged
|
2022-06-05 12:05:49 -04:00 |
|
Chara1236
|
4d58cece36
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/GamePanel.java
# src/Player.java
# src/Tile.java
|
2022-06-05 12:01:21 -04:00 |
|
Chara1236
|
e8a1dea2d6
|
Finished Collision Physics
|
2022-06-05 11:53:03 -04:00 |
John
|
f66fcb5ca2
|
Add NPCs
|
2022-06-03 17:33:21 -04:00 |
bob
|
1421495745
|
Merge remote-tracking branch 'origin/master'
|
2022-06-03 13:50:24 -04:00 |
|
bob
|
8a01e8d541
|
Sound Class and some Tile Ids I guess
|
2022-06-03 13:50:13 -04:00 |
|
John
|
09efb37d40
|
Fix minor bug
|
2022-06-03 13:45:04 -04:00 |
|
John
|
ca97774204
|
Added parallax, started documentation
|
2022-06-03 13:44:38 -04:00 |
|
bob
|
bcd896ed45
|
Merge remote-tracking branch 'origin/master'
|
2022-06-03 13:17:27 -04:00 |
|
bob
|
7a211f67a1
|
Added sprites to tilemap
|
2022-06-03 13:17:03 -04:00 |
|
John
|
848d64c11b
|
Merge remote-tracking branch 'origin/master'
|
2022-06-03 13:10:05 -04:00 |
|
John
|
3faddb790a
|
Added favicon, made classes static
|
2022-06-03 13:09:59 -04:00 |
|
bob
|
c4e15de2aa
|
FileManager class created
|
2022-06-03 13:08:59 -04:00 |
|
bob
|
99619a2bc9
|
Tilemap
|
2022-06-03 12:22:05 -04:00 |
|
John
|
a24e07f496
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/GamePanel.java
|
2022-06-02 14:50:07 -04:00 |
|
John
|
d640f5a926
|
Added file handling
|
2022-06-02 14:48:44 -04:00 |
|
bob
|
b9c4ee8120
|
Basically nothing
|
2022-06-02 14:48:16 -04:00 |
|
bob
|
588f7a5263
|
Changed screen size
|
2022-06-02 13:33:04 -04:00 |
|
bob
|
1dbb137d33
|
Fixed Merge Conflicts
|
2022-06-02 13:27:27 -04:00 |
|
John
|
96e1847d41
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/GamePanel.java
|
2022-06-02 13:24:01 -04:00 |
|
John
|
e9f7b37486
|
Added box and background sprites, background image class, tiles with sprites, some error handling
|
2022-06-02 13:22:17 -04:00 |
|
bob
|
c8e72b1b65
|
Swtiched to 2D x-scrolling
|
2022-06-02 13:21:29 -04:00 |
|
John
|
8d7b62c065
|
Undo change
|
2022-06-02 12:22:53 -04:00 |
|
John
|
1a37787012
|
Refactor if statements
|
2022-06-02 12:21:03 -04:00 |
|
John
|
7914a78522
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# out/production/final/GamePanel.class
# out/production/final/GenericSprite.class
|
2022-06-01 14:53:24 -04:00 |
|
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 |