Commit Graph

164 Commits

Author SHA1 Message Date
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
d38fc5925b
task6: Updated random generator and test 2023-03-27 12:01:05 +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
Immanuel Alvaro Bhirawa
9e33b57ce7 Task 4 Added comments 2023-03-24 11:55:16 +11:00
Immanuel Alvaro Bhirawa
822f040609 Task 4 made shorter 2023-03-24 11:46:44 +11:00
Immanuel Alvaro Bhirawa
b2dc79dec2 Task 5 boardArrangement and CurrentStageArrangement done 2023-03-24 11:13:46 +11:00
ff4b5d3e8d
added: Check message 2023-03-23 17:51:30 +11:00
cb1a475bd5
task6: Initial add 2023-03-23 17:41:13 +11:00
605f94c4c3
Task4: Removed FIXME tag 2023-03-23 17:19:50 +11:00
Immanuel Alvaro Bhirawa
f2747a9582 Task 4 updated 2023-03-23 14:06:49 +11:00
Immanuel Alvaro Bhirawa
c12d3c2efe Task 4 Done and updated with task 3 2023-03-23 13:54:54 +11:00
Immanuel Alvaro Bhirawa
f93ee3df76 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 2023-03-23 13:53:49 +11:00
Immanuel Alvaro Bhirawa
3c96737854 Task 4 Done 2023-03-23 13:53:42 +11:00
dc45c15788
BlueLagoon: Added isStateStringWellFormed 2023-03-23 12:22:32 +11:00
1984883997
Merge remote-tracking branch 'comp1110/master' 2023-03-23 10:41:12 +11:00
Paul Scott
5ea35de501 Added tests and populated BlueLagoon 2023-03-22 14:26:58 +11:00
46690b5f2c
Merge branch 'nathan_stage_test' 2023-03-21 13:52:31 +11:00
Immanuel Alvaro Bhirawa
5845c41582 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/gittest/Main.java
2023-03-21 13:46:34 +11:00
116067f42e
removed second A 2023-03-21 13:45:39 +11:00
be847584cd
Merge remote-tracking branch 'origin/master' 2023-03-21 13:45:14 +11:00
9bf0c3ade5
Merge with both A and B 2023-03-21 13:44:58 +11:00
Immanuel Alvaro Bhirawa
425fc01a2e Cindy added new C object again 2023-03-21 13:44:30 +11:00
Alice
8b7b6cb880 added a (again 2023-03-21 13:44:18 +11:00
ab30ed4552
gittest: Added B 2023-03-21 13:44:10 +11:00
Immanuel Alvaro Bhirawa
96f420bef5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/gittest/Main.java
2023-03-21 13:41:31 +11:00
12d20193e0
Merge branch 'bobsexperiment' 2023-03-21 13:40:26 +11:00
Alice
888173de94 added a 2023-03-21 13:39:19 +11:00
Cindy
b7706e4fce Cindy added new C object 2023-03-21 13:39:08 +11:00
Cindy
bd34221877 Cindy added new C object 2023-03-21 13:38:19 +11:00
352e14d421
gittest: Main 2023-03-21 13:36:19 +11:00
c9d78fc3a0
gittest: Added comment 2023-03-21 13:22:26 +11:00
626dc8ff41
gittest: Added main 2023-03-21 13:21:46 +11:00
d63adea7dc
Merge remote-tracking branch 'origin/master' 2023-03-21 13:19:58 +11:00
Cindy
92641d81e1 Cindy added C and toString 2023-03-21 13:18:32 +11:00
5b63dc75d8
gittest: Added B 2023-03-21 13:17:32 +11:00
Alice
eaf5b694dd signed Alice 2023-03-21 13:15:53 +11:00
Justin Ryu
699bde3960 gittest: added A.java and Main.java 2023-03-21 13:14:20 +11:00
7be83535c5
gui: Added favicon 2023-03-19 21:47:08 +11:00
7e60847379
gui: Added title and set not resizable 2023-03-19 21:46:55 +11:00
Immanuel Alvaro Bhirawa
34781b79cf B-contribution signed 2023-03-19 20:51:14 +11:00
Justin Ryu
2dfda1a7a4 Changed enum pieceType "Villages" to "Village" 2023-03-17 12:02:13 +11:00
Immanuel Alvaro Bhirawa
21cdb915ce Added comments for Skeleton files 2023-03-17 10:31:12 +11:00
5463debddf
skeleton: Cleaned up code and md 2023-03-15 17:28:02 +11:00
dc6e1258b2
skeleton: Removed class statuettes 2023-03-15 17:27:05 +11:00
f274129495
skeleton: Added play classes 2023-03-15 13:51:30 +11:00
2e32c07d95
skeleton: Added scoring class 2023-03-15 13:43:31 +11:00
ff93f69b59
skeleton: Added exploration phase 2023-03-15 13:22:30 +11:00
5f287b43f3
skeleton: Added setup code 2023-03-15 13:10:35 +11:00
d2fc9cc781
skeleton: Added initial skeleton files 2023-03-15 11:38:13 +11:00
Paul Scott
b1a8ce7352 Initial add 2023-03-13 20:34:59 +11:00