John
|
5870318918
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 18:23:25 -07:00 |
|
John
|
85ff7ae885
|
Make stuff private again
|
2022-06-20 18:23:18 -07:00 |
Chara1236
|
ca00976a96
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 21:22:53 -04:00 |
|
Chara1236
|
19e54be118
|
Your mom
|
2022-06-20 21:22:26 -04:00 |
|
John
|
32a503a59e
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 18:21:53 -07:00 |
|
John
|
e330df0209
|
Add dialogue sound
|
2022-06-20 18:21:47 -07:00 |
|
Chara1236
|
f90660cead
|
Your mom
|
2022-06-20 21:19:01 -04:00 |
|
Chara1236
|
a2aa091af0
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 21:18:38 -04:00 |
|
Chara1236
|
ebae404427
|
Change variables to public
|
2022-06-20 21:18:30 -04:00 |
|
John
|
c29272e758
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 18:03:27 -07:00 |
|
John
|
4fd1e4e934
|
Add dialogue sound, note: still has bug
|
2022-06-20 18:03:19 -07:00 |
|
Chara1236
|
db9ff7c98d
|
Finished Levels
|
2022-06-20 20:57:30 -04:00 |
|
Chara1236
|
ce257dcf3f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# saves/Level1-signs.txt
|
2022-06-20 20:52:48 -04:00 |
|
Chara1236
|
4d56984b3e
|
Commenting
|
2022-06-20 20:52:03 -04:00 |
|
John
|
6624ffb16d
|
Change signs, dialogue
|
2022-06-20 17:47:34 -07:00 |
|
Chara1236
|
c5c472f88d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/SoundWrapper.java
|
2022-06-20 20:33:54 -04:00 |
|
Chara1236
|
55a19bf5f5
|
Commenting player class, fixed steel bug
|
2022-06-20 20:32:40 -04:00 |
|
John
|
f83b5c41c8
|
Add even more documentation, fix keybind bug
|
2022-06-20 17:19:49 -07:00 |
|
Chara1236
|
a94409dd12
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 19:28:21 -04:00 |
|
Chara1236
|
045c1e3afd
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/LevelManager.java
|
2022-06-20 19:28:11 -04:00 |
|
John
|
1cbfda13e0
|
Add more documentation
|
2022-06-20 16:26:54 -07:00 |
|
Chara1236
|
01340ca01c
|
Level 5 finished
|
2022-06-20 19:26:18 -04:00 |
|
John
|
38f6c935fd
|
Add a lot of documentation
|
2022-06-20 16:13:04 -07:00 |
|
John
|
20f5d4b3b5
|
Add more comments
|
2022-06-20 14:45:05 -07:00 |
John
|
1c3cecb6e3
|
Unstatic everything to fix bug
|
2022-06-20 14:53:31 -04:00 |
|
John
|
b8120fa64f
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 14:49:01 -04:00 |
|
John
|
a8b45c35ba
|
Minor changes
|
2022-06-20 14:48:56 -04:00 |
bob
|
a85893fd06
|
Merge just cus
|
2022-06-20 14:48:46 -04:00 |
|
bob
|
bc7dfd982a
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 13:59:53 -04:00 |
|
bob
|
9f71e0d1ba
|
Level 5
|
2022-06-20 13:59:41 -04:00 |
|
John
|
766dabbf4e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/LevelManager.java
|
2022-06-20 13:58:50 -04:00 |
|
John
|
595a70249f
|
Add documentation and fix continue bug
|
2022-06-20 13:57:51 -04:00 |
|
bob
|
6a293bc086
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 13:51:03 -04:00 |
|
bob
|
e7555330a8
|
lEVEL 4
|
2022-06-20 13:50:52 -04:00 |
|
John
|
b82cfd79d5
|
Document FileManager
|
2022-06-20 13:35:37 -04:00 |
|
John
|
e65e0fc385
|
Document GamePanel and remove obsolete documentation
|
2022-06-20 13:25:45 -04:00 |
|
John
|
7595603e54
|
Change ceiling height, default player frame
|
2022-06-20 12:41:58 -04:00 |
|
John
|
46d7fa2dfe
|
Change oof to csgo death sound
|
2022-06-20 12:31:24 -04:00 |
|
John
|
856f3ede07
|
Change default sprite, sprite change behaviour when downkey is pressed
|
2022-06-20 11:42:50 -04:00 |
|
John
|
f91c7416ae
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/GamePanel.java
|
2022-06-20 11:33:34 -04:00 |
|
John
|
0f39c42006
|
Fix p, add loading screen
|
2022-06-20 11:32:02 -04:00 |
|
bob
|
52800c5a9b
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 11:30:06 -04:00 |
|
bob
|
341f26b6bb
|
Fixing bugs
|
2022-06-20 11:29:54 -04:00 |
|
John
|
af47165a4a
|
Allow empty dialogue
|
2022-06-20 11:15:28 -04:00 |
|
John
|
ed37999f02
|
Fix continue bug
|
2022-06-20 11:06:00 -04:00 |
|
bob
|
d6729e3481
|
Level 3
|
2022-06-20 10:11:35 -04:00 |
|
Chara1236
|
3506ed941c
|
Level2
|
2022-06-20 00:05:52 -04:00 |
|
John
|
f86c6260c7
|
Add tip to return from settings
|
2022-06-19 19:01:59 -07:00 |
|
John
|
fcf21cd48d
|
Fix continue bug and remove legacy dialogue
|
2022-06-19 18:53:37 -07:00 |
|
Chara1236
|
a2b8a12550
|
Merge remote-tracking branch 'origin/master'
|
2022-06-19 21:46:07 -04:00 |