Commit Graph

203 Commits

Author SHA1 Message Date
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
Justin Ryu
98e98e496c admin: signed E-contribution Justin 2023-05-01 20:28:33 +10:00
Justin Ryu
2cb2a46b01 admin: signed E-originality Justin 2023-05-01 20:26:39 +10:00
e6b4f9fd89
Merge branch 'generateAll_Fix' 2023-05-01 19:43:21 +10:00
aa0bbb146d
Fix timeout on generateAllMoves and isPhaseOver
generateMove: Removed unused code and sped up computation


moved generate moves to player to increase speed
2023-05-01 19:42:26 +10:00
355af7e358
Merge branch 'generateAll_Fix' 2023-05-01 19:39:44 +10:00
8b142ad434
admin: Changed links to still work after fixes 2023-05-01 19:39:09 +10:00
7ab8d3227d
moved generate moves to player to increase speed 2023-05-01 19:32:46 +10:00
ec2b0d9d5f
generateMove: Removed unused code and sped up computation 2023-05-01 19:18:50 +10:00
ea1d884ca6
Initial fix 2023-05-01 18:55:23 +10:00
f3b37d395c
player: Moved endregion to cleanup code 2023-05-01 18:54:37 +10:00
f0982d1c72
BlueLagoon: Fixed endPhase 2023-05-01 17:56:30 +10:00
0a69fe6555
admin: Added contribution, originality and code review 2023-05-01 17:50:05 +10:00
b8487c3c08
added comments 2023-05-01 17:00:27 +10:00
a9c0c86868
game: Added comments 2023-05-01 16:54:50 +10:00
7c355c8270
game: Added map selection and better UI 2023-05-01 16:00:53 +10:00
Immanuel Alvaro Bhirawa
192570fb47 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 2023-05-01 15:19:25 +10:00
Immanuel Alvaro Bhirawa
cad296eb0e E-Review Done
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-01 15:19:15 +10:00
da5d6dbdff
game: Added custom message for no villages left 2023-05-01 15:08:42 +10:00
0a4f729108
game: Moved board to have more room for message 2023-05-01 15:08:28 +10:00
d2c8ba86c0
game: Added better AI and UI 2023-05-01 14:51:36 +10:00
c37ee0c5f7
game: Added player actions 2023-05-01 14:32:22 +10:00
Immanuel Alvaro Bhirawa
ccf71b45b4 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 2023-05-01 14:24:43 +10:00
Immanuel Alvaro Bhirawa
938ebe95fc Trying to do Task 11 Link
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-01 14:24:34 +10:00
3307b01bf2
game: Added simple functions 2023-05-01 13:25:45 +10:00
1ad2f6d3f3
state: Cleaned up isPhaseOver 2023-04-26 18:06:37 +10:00
Immanuel Alvaro Bhirawa
8db5652ec6 New Upstream pulled
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-26 17:55:23 +10:00