Commit Graph

50 Commits

Author SHA1 Message Date
9bf0c3ade5
Merge with both A and B 2023-03-21 13:44:58 +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
Immanuel Alvaro Bhirawa
fb204b42be B-contribution signed 2023-03-19 21:07:31 +11:00
19050ca7dd
misc: Added file to gitignore 2023-03-19 21:04:31 +11:00
59be74ba19
misc: Reverted version change 2023-03-19 21:01:09 +11:00
Immanuel Alvaro Bhirawa
34781b79cf B-contribution signed 2023-03-19 20:51:14 +11:00
7f915f3594
admin: Signed B-contribution.yml 2023-03-19 20:31:56 +11:00
Justin Ryu
e481c3f319 admin: Signed B-contribution.yml 2023-03-19 19:47:16 +11:00
Justin Ryu
2a2b980770 admin: Added B-design.pdf 2023-03-19 19:44:52 +11:00
Justin Ryu
acbc636265 admin: Signed B-originality.yml 2023-03-19 19:23:25 +11:00
Justin Ryu
2dfda1a7a4 Changed enum pieceType "Villages" to "Village" 2023-03-17 12:02:13 +11:00
Immanuel Alvaro Bhirawa
6d4c2d69ed B-originality signed 2023-03-17 10:33:23 +11:00
Immanuel Alvaro Bhirawa
21cdb915ce Added comments for Skeleton files 2023-03-17 10:31:12 +11:00
579d3b92d3
admin: Signed B-originality 2023-03-15 18:18:24 +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
0363e54ddf
assn-files: skeleton.md added settlement phase 2023-03-15 13:48:06 +11:00
2e32c07d95
skeleton: Added scoring class 2023-03-15 13:43:31 +11:00
aaa6dabe94
assn-files: skeleton.md added scoring text skeleton 2023-03-15 13:38:49 +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
b6dccbd506
assn-files: Updated skeleton 2023-03-15 11:37:29 +11:00
eb52216090
skeleton: Added some classes and functions 2023-03-14 15:09:33 +11:00
47ff74a6f4
admin: Added due date to task 2023-03-14 14:56:37 +11:00
0d9b378f0c
admin: Added meeting time to tasks.md 2023-03-14 14:47:43 +11:00
f0d868b992
assn-files: Created skeleton.md 2023-03-14 14:39:08 +11:00
61d0a608ef Merge branch 'nathan' into 'master'
Fixed tasks spacing

See merge request u7156831/comp1110-ass2!2
2023-03-14 14:09:53 +11:00
d0c7a77107
admin: Fixed spacing on tasks 2023-03-14 14:08:25 +11:00
4ba4d131ea Merge branch 'nathan' into 'master'
Change tasks.md

See merge request u7156831/comp1110-ass2!1
2023-03-14 14:05:53 +11:00
fdff465a6f
Merge remote-tracking branch 'origin/nathan' into nathan 2023-03-14 14:04:42 +11:00
71d3f8f6df
admin: Added week 4 tasks 2023-03-14 14:04:34 +11:00
Immanuel Alvaro Bhirawa
dad35ed4c2 tasks Md finished 2023-03-14 13:59:56 +11:00
c8a1da6ec5
admin: Added week 4 tasks 2023-03-14 13:59:53 +11:00
f499e0c85e
admin: Added goup members to members.yml 2023-03-14 09:42:42 +11:00
Paul Scott
b1a8ce7352 Initial add 2023-03-13 20:34:59 +11:00