Commit Graph

175 Commits

Author SHA1 Message Date
dff851727e
Merge remote-tracking branch 'comp1110/master' 2023-04-21 10:49:24 +10:00
Immanuel Alvaro Bhirawa
53fe954a57 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/comp1110/comp1110-ass2 2023-04-20 12:10:46 +10:00
Paul Scott
defab09245 Added junit xml reporting for CI 2023-04-18 16:26:31 +10:00
Paul Scott
10d2a9b3ac Make CI more flexible, fixed string comparator, javafx doc 2023-04-18 09:37:01 +10:00
Immanuel Alvaro Bhirawa
5ee5901ee6 Fixed#2 Compliance Error
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-17 16:42:22 +10:00
Immanuel Alvaro Bhirawa
249c01d41d Fixed Compliance Error
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-17 16:37:32 +10:00
Immanuel Alvaro Bhirawa
9391827dd1 Changed C-BestCode
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-17 16:28:27 +10:00
Immanuel Alvaro Bhirawa
a9d922c727 admin: contributions signed Alvaro
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 19:53:14 +10:00
Justin Ryu
d8107447b5 admin: contribution and originality files signed Justin 2023-04-14 19:32:23 +10:00
049480ac39
admin: contributions signed Nathan 2023-04-14 18:40:30 +10:00
14544cc990
task8: Cleaned more code and added some comments 2023-04-14 17:43:56 +10:00
056992a269
task8: Cleaned some code and sped up time 2023-04-14 17:37:13 +10:00
be28548cd7
task8: Sped up code some more 2023-04-14 17:19:48 +10:00
a12db3b0bd
task8: Sped up compute time 2023-04-14 16:58:36 +10:00
8802c9545f
task8: Use ismovevalid 2023-04-14 16:08:57 +10:00
Immanuel Alvaro Bhirawa
999177bc67 Sorry for the spam commits but tidied up some stuff again
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 14:07:45 +10:00
Immanuel Alvaro Bhirawa
088a34010e Tidied up some stuff
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 14:06:27 +10:00
Immanuel Alvaro Bhirawa
8ffd63bab3 Task 7 DONE :)
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 13:53:11 +10:00
Immanuel Alvaro Bhirawa
e8485d8e21 Task 7 [Debug-In-Process], made some progress [1] + pulled upstream
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 11:10:08 +10:00
Immanuel Alvaro Bhirawa
e976071639 Task 7 [Debug-In-Process], made some progress [1]
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 10:55:57 +10:00
Immanuel Alvaro Bhirawa
e0bc262c6a Task 7 [Debug-In-Process], made some progress
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 08:16:42 +10:00
Immanuel Alvaro Bhirawa
f1d678660c Task 7 Debug-In-Process, good progress so far ig
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 01:58:32 +10:00
Immanuel Alvaro Bhirawa
ccc6caed17 Task 7 Confused on where I got the logic wrong but sort of done
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-13 21:31:33 +10:00
Immanuel Alvaro Bhirawa
cc951302f6 Task 7 Progress so far
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-12 23:32:30 +10:00
Immanuel Alvaro Bhirawa
0da848fdf2 Task 5 fixed again
Task 7 otw

Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-12 21:32:01 +10:00
Immanuel Alvaro Bhirawa
187e66b5e7 Task 5 fixed with the shapes
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-12 14:40:27 +10:00
Immanuel Alvaro Bhirawa
c633c8188f Task 5 added some comments.
NOTE: Noticed a bug where after launching and inputting the string for the first time, the programme won't refresh if we put in a different string.

Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-11 10:06:30 +10:00
Immanuel Alvaro Bhirawa
37b09c5576 Task 5 done hopefully
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-11 01:10:55 +10:00
Immanuel Alvaro Bhirawa
809701c5f6 Task 5 [Fixed slight string error in player statement] and the bug is fixed (Just need some comments later lol)
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-08 00:25:37 +10:00
Immanuel Alvaro Bhirawa
2e7ae85051 Task 5 [Fixed player statement]
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol

Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-08 00:14:17 +10:00
Immanuel Alvaro Bhirawa
bb364bd4c7 Task 5 should be finished I think
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol

Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-08 00:07:37 +10:00
Immanuel Alvaro Bhirawa
5a2e876a29 Task 5 progress 5/6 just need to finish [player statement]
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol

Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-07 21:15:42 +10:00
Immanuel Alvaro Bhirawa
9f547c5aab Task 5 progress 5/6 just need to finish [player statement]
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol
2023-04-07 21:15:16 +10:00
2747d89712
Merge branch 'task8' 2023-04-03 11:45:00 +10:00
e4d5e40ea9
admin: Added originality 2023-03-27 23:05:06 +11:00
9b17641a62
task8: Added initial code 2023-03-27 22:50:40 +11:00
69adaa296a
Merge branch 'fix-distribute' 2023-03-27 16:22:25 +11:00
47104eb7d0
task 6: Fixed randomness errors 2023-03-27 16:22:03 +11:00
30eb45b775
tests: Removed comment 2023-03-27 16:21:50 +11:00
e2bf5331df
Merge remote-tracking branch 'comp1110/master' 2023-03-27 12:01:28 +11:00
d38fc5925b
task6: Updated random generator and test 2023-03-27 12:01:05 +11:00
Paul Scott
3c824e830c Made some test timeouts more generous 2023-03-27 11:39:51 +11:00
Immanuel Alvaro Bhirawa
8f204e274c Task 5 progress 4/6 just need to finish [unclaimedResourceStatement] and [player statement]
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol
2023-03-27 10:36:53 +11:00
62e7698832
distribute: Changed to not allow multiple resources on one circle 2023-03-25 16:29:42 +11:00
08c2eee299
Merge remote-tracking branch 'origin/master' 2023-03-24 14:56:41 +11:00
ce89e9ca37
Viewer: Added favicon 2023-03-24 14:56:34 +11:00
Immanuel Alvaro Bhirawa
8b03da60c4 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 2023-03-24 14:53:12 +11:00
Immanuel Alvaro Bhirawa
1f0df80121 Fixed Task 5 part 2 (Current Arrangement State) 2023-03-24 14:53:07 +11:00
4ba76d14f8
BlueLagoon: Cleaned up isStateStringWellFormed 2023-03-24 14:42:27 +11:00
9239293a26
BlueLagoon: changed isStateStringWellFormed to just regex match 2023-03-24 12:20:14 +11:00