John
|
46fc50be93
|
Made camera consistent across panels, add middleware class to enable key changes, add settings panel
|
2022-06-09 14:18:16 -04:00 |
Chara1236
|
b307fe06a2
|
Merge remote-tracking branch 'origin/master'
|
2022-06-09 00:07:54 -04:00 |
|
Chara1236
|
6f12ed702f
|
Bomb arraylist
|
2022-06-09 00:07:44 -04:00 |
John
|
7649f19215
|
Add duck typing equals check to TextBox
|
2022-06-08 19:03:06 -04:00 |
bob
|
0fbe9cf522
|
Made lava particles better
|
2022-06-08 14:50:45 -04:00 |
|
bob
|
ac873cf221
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/GamePanel.java
|
2022-06-08 14:35:13 -04:00 |
|
bob
|
a43a199c15
|
Improving Particles
|
2022-06-08 14:32:31 -04:00 |
|
John
|
69dc890d2d
|
Added pauses, bomb explosion
|
2022-06-08 13:36:47 -04:00 |
|
John
|
bfa449e8a0
|
Merge remote-tracking branch 'origin/master'
|
2022-06-08 12:35:47 -04:00 |
|
John
|
948756a1c4
|
Select TextBox on hover
|
2022-06-08 12:35:37 -04:00 |
|
bob
|
6af212ab1c
|
Added Particles
|
2022-06-08 11:23:57 -04:00 |
|
Chara1236
|
d5bf288c26
|
Added Lava
|
2022-06-07 23:59:19 -04:00 |
|
Chara1236
|
8f3f35a4af
|
Changed collisions to 2d array, fixed collision checking for sprites
|
2022-06-07 22:12:40 -04:00 |
|
John
|
b47b3cec95
|
Fix camera in main screen, and remove unnecessary sleep
|
2022-06-07 16:40:28 -04:00 |
|
John
|
cb6e8fcacf
|
Minor changes
|
2022-06-07 14:55:59 -04:00 |
|
John
|
dcf245390d
|
Merge remote-tracking branch 'origin/master'
|
2022-06-07 14:47:16 -04:00 |
|
John
|
8b8d38ef40
|
Add bomb sprites, text box, main menu
|
2022-06-07 14:47:07 -04:00 |
|
bob
|
2a194e1f8b
|
Bomb Physics
|
2022-06-07 14:46:45 -04:00 |
|
bob
|
0aa3cff3e8
|
Bomb Physics
|
2022-06-07 13:48:31 -04:00 |
|
John
|
c63246cdb9
|
Make stickybomb have sprites
|
2022-06-07 13:19:54 -04:00 |
|
bob
|
5e2edc9e99
|
Merge remote-tracking branch 'origin/master'
|
2022-06-07 13:13:01 -04:00 |
|
bob
|
e856a93fb9
|
Bomb
|
2022-06-07 13:12:48 -04:00 |
|
John
|
ad6ccaa032
|
Redo main menu
|
2022-06-06 13:32:13 -04:00 |
|
John
|
424e71eb74
|
Minor centered text fixes
|
2022-06-06 12:21:12 -04:00 |
|
bob
|
f5e501d8ef
|
Merge remote-tracking branch 'origin/master'
|
2022-06-06 11:24:58 -04:00 |
|
bob
|
544a069f65
|
Added finish block
|
2022-06-06 11:24:46 -04:00 |
|
John
|
a92616ac45
|
Add centered text and minor fixes
|
2022-06-06 11:24:21 -04:00 |
|
Chara1236
|
2f5ded58ab
|
Enemy Causes Death
|
2022-06-05 22:18:10 -04:00 |
|
bob
|
5fec81cf0e
|
Small Change
|
2022-06-05 17:37:09 -04:00 |
|
Chara1236
|
f5b809473a
|
Fixing Collisions, added level manager
|
2022-06-05 17:33:24 -04:00 |
|
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 |