Commit Graph

Select branches

Hide Pull Requests

generateAll_Fix

master

master-d2c-feedback

v1.0.0

Mono Color

• 0402735e96 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 Immanuel Alvaro Bhirawa 2023-04-22 09:15:10 +1000
• e73524592a
  
  game: Added metadata and build info Nathan Woodburn 2023-04-21 13:56:49 +1000
• c58bddbc29
  
  admin: Signed D-originality-u7156831 Nathan Woodburn 2023-04-21 13:41:25 +1000
• 024f6f63ff
  
  BlueLagoon: Fixed bug found in testIsStateStringWellFormed Nathan Woodburn 2023-04-21 13:29:08 +1000
• 2538dff7f5
  
  tests: Added testIsStateStringWellFormed Nathan Woodburn 2023-04-21 13:28:44 +1000
• cba1604afa
  
  BlueLagoon: Fixed double comment Nathan Woodburn 2023-04-21 11:34:41 +1000
• 8adc551913
  
  BlueLagoon: Cleanup imports and style Nathan Woodburn 2023-04-21 11:08:02 +1000
• dff851727e
  
  Merge remote-tracking branch 'comp1110/master' Nathan Woodburn 2023-04-21 10:49:24 +1000
• 53fe954a57 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/comp1110/comp1110-ass2 Immanuel Alvaro Bhirawa 2023-04-20 12:10:46 +1000
• defab09245 Added junit xml reporting for CI Paul Scott 2023-04-18 16:26:31 +1000
• 10d2a9b3ac Make CI more flexible, fixed string comparator, javafx doc Paul Scott 2023-04-18 09:37:01 +1000
• 5ee5901ee6 Fixed#2 Compliance Error Immanuel Alvaro Bhirawa 2023-04-17 16:42:22 +1000
• 249c01d41d Fixed Compliance Error Immanuel Alvaro Bhirawa 2023-04-17 16:37:32 +1000
• 9391827dd1 Changed C-BestCode Immanuel Alvaro Bhirawa 2023-04-17 16:28:27 +1000
• a9d922c727 admin: contributions signed Alvaro Immanuel Alvaro Bhirawa 2023-04-14 19:53:14 +1000
• d8107447b5 admin: contribution and originality files signed Justin Justin Ryu 2023-04-14 19:32:23 +1000
• 049480ac39
  
  admin: contributions signed Nathan Nathan Woodburn 2023-04-14 18:40:30 +1000
• 14544cc990
  
  task8: Cleaned more code and added some comments Nathan Woodburn 2023-04-14 17:43:56 +1000
• 056992a269
  
  task8: Cleaned some code and sped up time Nathan Woodburn 2023-04-14 17:37:13 +1000
• be28548cd7
  
  task8: Sped up code some more Nathan Woodburn 2023-04-14 17:19:48 +1000
• a12db3b0bd
  
  task8: Sped up compute time Nathan Woodburn 2023-04-14 16:58:36 +1000
• 8802c9545f
  
  task8: Use ismovevalid Nathan Woodburn 2023-04-14 16:08:57 +1000
• 999177bc67 Sorry for the spam commits but tidied up some stuff again Immanuel Alvaro Bhirawa 2023-04-14 14:07:45 +1000
• 088a34010e Tidied up some stuff Immanuel Alvaro Bhirawa 2023-04-14 14:06:27 +1000
• 8ffd63bab3 Task 7 DONE :) Immanuel Alvaro Bhirawa 2023-04-14 13:53:11 +1000
• e8485d8e21 Task 7 [Debug-In-Process], made some progress [1] + pulled upstream Immanuel Alvaro Bhirawa 2023-04-14 11:10:08 +1000
• e976071639 Task 7 [Debug-In-Process], made some progress [1] Immanuel Alvaro Bhirawa 2023-04-14 10:55:57 +1000
• e0bc262c6a Task 7 [Debug-In-Process], made some progress Immanuel Alvaro Bhirawa 2023-04-14 08:16:42 +1000
• f1d678660c Task 7 Debug-In-Process, good progress so far ig Immanuel Alvaro Bhirawa 2023-04-14 01:58:32 +1000
• ccc6caed17 Task 7 Confused on where I got the logic wrong but sort of done Immanuel Alvaro Bhirawa 2023-04-13 21:31:33 +1000
• cc951302f6 Task 7 Progress so far Immanuel Alvaro Bhirawa 2023-04-12 23:32:30 +1000
• 0da848fdf2 Task 5 fixed again Task 7 otw Immanuel Alvaro Bhirawa 2023-04-12 21:32:01 +1000
• 187e66b5e7 Task 5 fixed with the shapes Immanuel Alvaro Bhirawa 2023-04-12 14:40:27 +1000
• 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. Immanuel Alvaro Bhirawa 2023-04-11 10:06:30 +1000
• 37b09c5576 Task 5 done hopefully Immanuel Alvaro Bhirawa 2023-04-11 01:10:55 +1000
• 809701c5f6 Task 5 [Fixed slight string error in player statement] and the bug is fixed (Just need some comments later lol) Immanuel Alvaro Bhirawa 2023-04-08 00:25:37 +1000
• 2e7ae85051 Task 5 [Fixed player statement] NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol Immanuel Alvaro Bhirawa 2023-04-08 00:14:17 +1000
• 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 Immanuel Alvaro Bhirawa 2023-04-08 00:07:37 +1000
• 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 Immanuel Alvaro Bhirawa 2023-04-07 21:15:42 +1000
• 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 Immanuel Alvaro Bhirawa 2023-04-07 21:15:16 +1000
• 2747d89712
  
  Merge branch 'task8' Nathan Woodburn 2023-04-03 11:45:00 +1000
• e4d5e40ea9
  
  admin: Added originality Nathan Woodburn 2023-03-27 23:05:06 +1100
• 9b17641a62
  
  task8: Added initial code Nathan Woodburn 2023-03-27 22:50:40 +1100
• 69adaa296a
  
  Merge branch 'fix-distribute' Nathan Woodburn 2023-03-27 16:22:25 +1100
• 47104eb7d0
  
  task 6: Fixed randomness errors Nathan Woodburn 2023-03-27 16:22:03 +1100
• 30eb45b775
  
  tests: Removed comment Nathan Woodburn 2023-03-27 16:21:50 +1100
• e2bf5331df
  
  Merge remote-tracking branch 'comp1110/master' Nathan Woodburn 2023-03-27 12:01:28 +1100
• d38fc5925b
  
  task6: Updated random generator and test Nathan Woodburn 2023-03-27 12:01:05 +1100
• 3c824e830c Made some test timeouts more generous Paul Scott 2023-03-27 11:39:51 +1100
• 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 Immanuel Alvaro Bhirawa 2023-03-27 10:36:53 +1100
• 62e7698832
  
  distribute: Changed to not allow multiple resources on one circle Nathan Woodburn 2023-03-25 16:29:42 +1100
• 08c2eee299
  
  Merge remote-tracking branch 'origin/master' Nathan Woodburn 2023-03-24 14:56:41 +1100
• ce89e9ca37
  
  Viewer: Added favicon Nathan Woodburn 2023-03-24 14:56:34 +1100
• 8b03da60c4 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 Immanuel Alvaro Bhirawa 2023-03-24 14:53:12 +1100
• 1f0df80121 Fixed Task 5 part 2 (Current Arrangement State) Immanuel Alvaro Bhirawa 2023-03-24 14:53:07 +1100
• 4ba76d14f8
  
  BlueLagoon: Cleaned up isStateStringWellFormed Nathan Woodburn 2023-03-24 14:42:27 +1100
• 9239293a26
  
  BlueLagoon: changed isStateStringWellFormed to just regex match Nathan Woodburn 2023-03-24 12:20:14 +1100
• 9e33b57ce7 Task 4 Added comments Immanuel Alvaro Bhirawa 2023-03-24 11:55:16 +1100
• 822f040609 Task 4 made shorter Immanuel Alvaro Bhirawa 2023-03-24 11:46:44 +1100
• b2dc79dec2 Task 5 boardArrangement and CurrentStageArrangement done Immanuel Alvaro Bhirawa 2023-03-24 11:13:46 +1100
• 2073eed687
  
  Merge branch 'Task6' Nathan Woodburn 2023-03-23 17:52:07 +1100
• ff4b5d3e8d
  
  added: Check message Nathan Woodburn 2023-03-23 17:51:30 +1100
• cb1a475bd5
  
  task6: Initial add Nathan Woodburn 2023-03-23 17:41:13 +1100
• 605f94c4c3
  
  Task4: Removed FIXME tag Nathan Woodburn 2023-03-23 17:19:50 +1100
• f2747a9582 Task 4 updated Immanuel Alvaro Bhirawa 2023-03-23 14:06:49 +1100
• c12d3c2efe Task 4 Done and updated with task 3 Immanuel Alvaro Bhirawa 2023-03-23 13:54:54 +1100
• f93ee3df76 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 Immanuel Alvaro Bhirawa 2023-03-23 13:53:49 +1100
• 3c96737854 Task 4 Done Immanuel Alvaro Bhirawa 2023-03-23 13:53:42 +1100
• dc45c15788
  
  BlueLagoon: Added isStateStringWellFormed Nathan Woodburn 2023-03-23 12:22:32 +1100
• 6173eb83c5 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2 Immanuel Alvaro Bhirawa 2023-03-23 11:08:52 +1100
• 8333b9fc02 Merge branch 'master' of https://gitlab.cecs.anu.edu.au/comp1110/comp1110-ass2 Immanuel Alvaro Bhirawa 2023-03-23 10:47:46 +1100
• 1984883997
  
  Merge remote-tracking branch 'comp1110/master' Nathan Woodburn 2023-03-23 10:41:12 +1100
• b631dc0ceb Added details of string encoding to README Paul Scott 2023-03-22 14:28:20 +1100
• 5ea35de501 Added tests and populated BlueLagoon Paul Scott 2023-03-22 14:26:58 +1100
• 46690b5f2c
  
  Merge branch 'nathan_stage_test' Nathan Woodburn 2023-03-21 13:52:31 +1100
• 5845c41582 Merge remote-tracking branch 'origin/master' Immanuel Alvaro Bhirawa 2023-03-21 13:46:34 +1100
• 116067f42e
  
  removed second A Nathan Woodburn 2023-03-21 13:45:39 +1100
• be847584cd
  
  Merge remote-tracking branch 'origin/master' Nathan Woodburn 2023-03-21 13:45:14 +1100
• 9bf0c3ade5
  
  Merge with both A and B Nathan Woodburn 2023-03-21 13:44:58 +1100
• 425fc01a2e Cindy added new C object again Immanuel Alvaro Bhirawa 2023-03-21 13:44:30 +1100
• 8b7b6cb880 added a (again Alice 2023-03-21 13:44:18 +1100
• ab30ed4552
  
  gittest: Added B Nathan Woodburn 2023-03-21 13:44:10 +1100
• 96f420bef5 Merge remote-tracking branch 'origin/master' Immanuel Alvaro Bhirawa 2023-03-21 13:41:31 +1100
• 12d20193e0
  
  Merge branch 'bobsexperiment' Nathan Woodburn 2023-03-21 13:40:26 +1100
• 888173de94 added a Alice 2023-03-21 13:39:19 +1100
• b7706e4fce Cindy added new C object Cindy 2023-03-21 13:39:08 +1100
• bd34221877 Cindy added new C object Cindy 2023-03-21 13:38:19 +1100
• 352e14d421
  
  gittest: Main Nathan Woodburn 2023-03-21 13:36:19 +1100
• c9d78fc3a0
  
  gittest: Added comment Nathan Woodburn 2023-03-21 13:22:23 +1100
• 626dc8ff41
  
  gittest: Added main Nathan Woodburn 2023-03-21 13:21:46 +1100
• d63adea7dc
  
  Merge remote-tracking branch 'origin/master' Nathan Woodburn 2023-03-21 13:19:58 +1100
• 92641d81e1 Cindy added C and toString Cindy 2023-03-21 13:18:32 +1100
• 5b63dc75d8
  
  gittest: Added B Nathan Woodburn 2023-03-21 13:17:32 +1100
• eaf5b694dd signed Alice Alice 2023-03-21 13:15:53 +1100
• 699bde3960 gittest: added A.java and Main.java Justin Ryu 2023-03-21 13:14:20 +1100
• 7be83535c5
  
  gui: Added favicon Nathan Woodburn 2023-03-19 21:47:08 +1100
• 7e60847379
  
  gui: Added title and set not resizable Nathan Woodburn 2023-03-19 21:46:36 +1100
• fb204b42be B-contribution signed Immanuel Alvaro Bhirawa 2023-03-19 21:07:31 +1100
• 19050ca7dd
  
  misc: Added file to gitignore Nathan Woodburn 2023-03-19 21:04:31 +1100
• 59be74ba19
  
  misc: Reverted version change Nathan Woodburn 2023-03-19 21:01:09 +1100