Commit Graph

203 Commits (55a19bf5f5b190b77efaf88407f632f7cf78f706)

Author SHA1 Message Date
Chara1236 55a19bf5f5 Commenting player class, fixed steel bug 2022-06-20 20:32:40 -04: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
Chara1236 ba2c43b7bb First level done for real 2022-06-19 21:46:00 -04:00
John 751126c598 Fix pause menu bug 2022-06-19 18:39:40 -07:00
Chara1236 99439bd4b2 Merge remote-tracking branch 'origin/master' 2022-06-19 21:30:31 -04:00
Chara1236 06849a5078 First level done 2022-06-19 21:30:25 -04:00
John 70746385f8 Ensure unix compliance by ending every text file with a newline 2022-06-19 18:18:08 -07:00
John 06e81d4646 Allow left click to place steel 2022-06-19 18:02:55 -07:00
Chara1236 90589ca7d7 Merge remote-tracking branch 'origin/master' 2022-06-19 20:54:11 -04:00
Chara1236 009a18ad3b working on signs on first level 2022-06-19 20:54:04 -04:00
John bbadd99a6f Merge remote-tracking branch 'origin/master' 2022-06-19 17:53:59 -07:00
John 061ca4ddda Remove extraneous print statement 2022-06-19 17:53:52 -07:00
John a81c4e21c4 Fix sign bug 2022-06-19 17:53:08 -07:00
John 2e3b2eb90b Merge remote-tracking branch 'origin/master' 2022-06-19 17:31:20 -07:00
John edc1376084 Make signs work 2022-06-19 17:31:08 -07:00
Chara1236 ed5f8be65b Merge remote-tracking branch 'origin/master' 2022-06-19 20:19:05 -04:00
Chara1236 a086ac65ae added first level 2022-06-19 20:18:58 -04:00
John 07e56c49cf Move GlobalState randint to UtilityFunction 2022-06-19 16:20:58 -07:00
John 16fd96b3b6 Close scanner after use 2022-06-19 15:52:03 -07:00