Commit Graph

229 Commits

Author SHA1 Message Date
Immanuel Alvaro Bhirawa
bad42dd8e8 Fixed some documentation for Score Link
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-10 19:19:40 +10:00
Justin Ryu
7fcf6d3a1b Game.java changed gui colours
admin: signed F-originality
2023-05-09 22:22:29 +10:00
20e6c9e3c1
admin: F Best Nathan 2023-05-09 14:06:24 +10:00
6f727478be
admin: originality signed Nathan 2023-05-09 14:06:13 +10:00
5ba6fc5d76
game: Added darkmode toggle 2023-05-09 14:06:00 +10:00
1f73ffcab9
admin: Features added feature list 2023-05-09 14:05:47 +10:00
6edfd9266a
game: fixed AI can't play and freezes game bug 2023-05-09 13:37:38 +10:00
Immanuel Alvaro Bhirawa
dd4e360d8e Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 2023-05-09 10:53:47 +10:00
Immanuel Alvaro Bhirawa
d99b63c82b added some docs for task 13
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 10:53:28 +10:00
55933ae49e
Merge remote-tracking branch 'origin/master' 2023-05-09 10:46:56 +10:00
519e9e840e
player: Fixed canPlay bug 2023-05-09 10:46:51 +10:00
77aaa07984
state: Remove old comment 2023-05-09 10:46:38 +10:00
Immanuel Alvaro Bhirawa
56b29a3301 task 13 optimized for multiple players
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 10:46:24 +10:00
Immanuel Alvaro Bhirawa
bf38979834 Upstream Pull
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 10:32:45 +10:00
Immanuel Alvaro Bhirawa
6da9b06e9b Merge branch 'master' of https://gitlab.cecs.anu.edu.au/comp1110/comp1110-ass2 2023-05-09 10:32:08 +10:00
Immanuel Alvaro Bhirawa
227f4f8e3a Task 13 done with the help of Nathan
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 10:30:49 +10:00
Paul Scott
ec4d3b938c Improved the error messages for some tests 2023-05-09 10:25:24 +10:00
Immanuel Alvaro Bhirawa
c4db86793c Task 13 done with the help of Nathan
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 10:25:20 +10:00
Immanuel Alvaro Bhirawa
bd2b3477b6 cleaned task 13 but still dont know what caused the testEdgeCaseGames test to fail.
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 02:50:23 +10:00
Immanuel Alvaro Bhirawa
28b0288e8a cleaned task 13 a bit but still dont know what this edge case error is lol
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 01:54:22 +10:00
Immanuel Alvaro Bhirawa
0f203df939 task 13 progress, 3 task passed this point
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-09 01:48:33 +10:00
9381eedf5f
state: isPhaseOver cleaned up code 2023-05-08 13:25:28 +10:00
8a4e83b9a7
player: Fixed isPhaseOver bug 2023-05-08 13:25:08 +10:00
f6f3f4a6a1
state: isPhaseOver sped up code 2023-05-08 13:07:03 +10:00
Immanuel Alvaro Bhirawa
73293edb43 Added more documentation and optimization for scoreLink
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-06 21:10:48 +10:00
Immanuel Alvaro Bhirawa
90674de713 Added documentation and Optimized task 11 scoreLink #2
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-06 20:55:55 +10:00
Immanuel Alvaro Bhirawa
199a50b088 Optimized task 11 scoreLink #1
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-06 20:12:30 +10:00
Immanuel Alvaro Bhirawa
3d84fa1e83 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2
# Conflicts:
#	src/comp1110/ass2/State.java
2023-05-06 20:02:09 +10:00
Immanuel Alvaro Bhirawa
6e6bf69bdf yes
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-06 20:01:25 +10:00
506c2bb395
state: cleaned & optimized linking 2023-05-06 18:53:42 +10:00
bdaaf35a88
coord: Fixed adjacency calculation 2023-05-06 18:35:45 +10:00
d0c3d0faee
admin: Added empty code review to pass compliance 2023-05-06 14:34:46 +10:00
Immanuel Alvaro Bhirawa
ad3a9c4a00 Task 11 Linking progress for now.
NOTE: Yeah idk if this is correct or not, but that's it for now

Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-04 13:05:56 +10:00
cf4bb47c8f
game: Added more intro description 2023-05-02 15:43:40 +10:00
8fdf5a2cdb
state: Fix assertion errors 2023-05-02 15:43:11 +10:00
025d5af907
game: Fixed mouse controls 2023-05-02 14:52:23 +10:00
91d9721855
player: cleaned code for Coord implementation 2023-05-02 14:52:08 +10:00
329a65176b
state: cleaned code 2023-05-02 14:51:26 +10:00
7aa5605ed2
BlueLagoon: cleaned code 2023-05-02 14:49:34 +10:00
b4e3afb867
coord: Changed to record type 2023-05-02 14:45:05 +10:00
3c343d002a
resource: cleaned code 2023-05-02 14:39:08 +10:00
e52d16d01a
player: Cleaned up code 2023-05-02 14:28:03 +10:00
a13e93c339
BlueLagoon: cleaned up code 2023-05-02 14:14:58 +10:00
d436cdb138
game: Cleaned up code 2023-05-02 14:14:28 +10:00
649481583a
Merge remote-tracking branch 'origin/master' 2023-05-02 14:03:20 +10:00
2f0964b26b
game: cleaned up code and use GameData class 2023-05-02 14:03:13 +10:00
dd56bbfdd7
game: Added GameData class to store game stateStrings 2023-05-02 14:02:46 +10:00
Immanuel Alvaro Bhirawa
8f0be1948f E Originality
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-02 12:52:07 +10:00
52630951f0
game: Added support for any number of AI players 2023-05-02 12:43:54 +10:00
035d3bf022
player: Added storing if the player is AI 2023-05-02 12:43:41 +10:00