Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 43a1fbcb64 Spectate mode can be selected by clients when they join a game. #story[1194] fjc40 2017-09-14 14:33:21 +12:00
• 913452de43 Merge branch 'master' into wind_arrow_direction_5 David Wu 2017-09-14 14:30:45 +12:00
• 39cfed961c Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 David Wu 2017-09-14 14:29:01 +12:00
• 550180f286 Removed countdown pane. David Wu 2017-09-14 14:28:42 +12:00
• 7b076f3718 Merge branch 'storyA_sounds' into storyD-3D Joseph Gardner 2017-09-14 14:16:53 +12:00
• c23fcfcaa3 new skybox textures. Still need to fix two planes having a small gap between them. #story[1196] Joseph Gardner 2017-09-14 14:03:36 +12:00
• 083eb5a4bc updated race view that does not use a split pane hba56 2017-09-14 13:45:46 +12:00
• b59d36f4e5 Actually fixed the wind arrow direction. fjc40 2017-09-14 13:32:23 +12:00
• afd923c9fb Revert "Appears to fix wind arrow direction." fjc40 2017-09-14 13:22:35 +12:00
• 87f3265640 pushed branch #story[1195] hba56 2017-09-14 13:06:39 +12:00
• f2370485a0 RaceController can now set up collision listeners on each boat. Connor Taylor-Brown 2017-09-14 12:48:02 +12:00
• e0278fdb85 Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5 fjc40 2017-09-14 12:40:23 +12:00
• 8e6a720558 Appears to fix wind arrow direction. fjc40 2017-09-14 12:39:41 +12:00
• e3266c3b47 Pane removed. David Wu 2017-09-14 12:27:07 +12:00
• e354320d74 Replaced camera tracking listeners with animation timer - Documented animation timers and mark arrow Connor Taylor-Brown 2017-09-14 12:20:55 +12:00
• b8c4582d2a Replaced mark arrow listener with animation timer. Connor Taylor-Brown 2017-09-14 12:06:47 +12:00
• a6eea88524 Fixed collisions #fix #story[1196] Joseph Gardner 2017-09-14 11:58:40 +12:00
• 81a04c987b Changed the ip of the matchbrowser to that of the CI. hba56 2017-09-13 23:50:55 +12:00
• e4a8bd08e7 Merge branch 'story77' into 'master' Fan-Wu Yang 2017-09-13 21:37:57 +12:00
• 92500e13ee Added in windangle for rotated map as it had been lost through merge. #story[1188] Fan-Wu Yang 2017-09-13 21:30:16 +12:00
• 1b946b6807 Removed/commented out unecessary print messages #story[1188] Fan-Wu Yang 2017-09-13 21:21:19 +12:00
• 4c52673fc1 javadoc fixes #story[1188] hba56 2017-09-13 17:12:24 +12:00
• e4dbebfcac Merge remote-tracking branch 'remotes/origin/master' into story77 hba56 2017-09-13 16:14:07 +12:00
• fd120edaf9 Merge remote-tracking branch 'remotes/origin/master' into story77 hba56 2017-09-13 16:13:14 +12:00
• de9f4e22eb Direction to mark arrow is now displayed relative to camera cbt24 2017-09-13 16:10:41 +12:00
• 7b97e93d3a Merge branch 'merge_fix_story51' Fan-Wu Yang 2017-09-13 15:51:59 +12:00
• 54fe37fd3a Merge branch 'story_51_rounding_fix' into 'master' Fan-Wu Yang 2017-09-13 15:40:55 +12:00
• 5f96526fcc Added "arrow" pointing to next mark on third person view Connor Taylor-Brown 2017-09-13 15:34:02 +12:00
• 22b4b66049 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 David Wu 2017-09-13 15:28:13 +12:00
• cccce9002b Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 David Wu 2017-09-13 15:28:01 +12:00
• 0944e5729a Dimmed the ambient light and specular light. #story[1261] Joseph Gardner 2017-09-13 15:18:27 +12:00
• 00780e17e9 Merge remote-tracking branch 'remotes/origin/temp77' into story77 hba56 2017-09-13 15:17:37 +12:00
• 8cc4d7741c Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188] David Wu 2017-09-13 15:17:09 +12:00
• aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77 hba56 2017-09-13 15:16:06 +12:00
• 1cbb24e9fd Merged in master #story[1185] Fan-Wu Yang 2017-09-13 15:05:36 +12:00
• 3760a43cfc Merge branch 'master' into HEAD Fan-Wu Yang 2017-09-13 14:56:52 +12:00
• b655b3e233 Fixed merge bug, and an unrelated null pointer exception. fjc40 2017-09-13 14:52:21 +12:00
• e657a0cc99 Added tracking for angle between third person boat and next mark Connor Taylor-Brown 2017-09-13 14:44:18 +12:00
• 6761778dd4 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix fjc40 2017-09-13 14:43:49 +12:00
• 06bd637460 Added documentation. #story[1188] David Wu 2017-09-13 14:42:54 +12:00
• 490aab3f8d Changes made to pre-race countdown. #story[1188] David Wu 2017-09-13 14:30:55 +12:00
• e87173ee39 Fixed Tutorial not being able to run #story[1185] Fan-Wu Yang 2017-09-13 14:29:48 +12:00
• 079d93fc0f Merge remote-tracking branch 'remotes/origin/master' into story77 hba56 2017-09-13 14:22:46 +12:00
• 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77 hba56 2017-09-13 14:00:40 +12:00
• f926355d1c Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 David Wu 2017-09-13 14:00:36 +12:00
• 89ce8a7cc0 Pre-race countdown implementation. David Wu 2017-09-13 14:00:29 +12:00
• 731c0b0e61 send out to every client fix hba56 2017-09-13 13:34:26 +12:00
• d29a47ec23 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix fjc40 2017-09-13 13:30:51 +12:00
• d1f74dec3a Merge branch 'storyB-)' into 'master' Fraser Cope 2017-09-13 13:25:15 +12:00
• 83e696b79e Committed merge-related bug fixes Connor Taylor-Brown 2017-09-13 13:18:25 +12:00
• 70bbc89239 Fixed merge-related bugs Connor Taylor-Brown 2017-09-13 13:12:26 +12:00
• 070654a95c Javadoc fix. fjc40 2017-09-13 13:07:13 +12:00
• c750b806e0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 David Wu 2017-09-13 13:00:34 +12:00
• 2ad947b57d The start time of the race is no longer scaled by the race speed scalar. Changed the prestart time to 30 seconds (was 3 minutes). Changed the preparatory time to 10 seconds (was 1 minute). Phases: player list +prestart > warning > race view + preparatory + no more joining > started > finished. fjc40 2017-09-13 12:59:51 +12:00
• 2c06a46ad2 send out to every client fix hba56 2017-09-13 12:59:49 +12:00
• 202c8d80c8 Minor fxml adjustments. David Wu 2017-09-13 12:57:35 +12:00
• 42a5d8ddc4 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 David Wu 2017-09-13 12:49:11 +12:00
• 5fb24307ec send out to every client fix hba56 2017-09-13 12:48:47 +12:00
• 0b3ef992bc Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D Joseph 2017-09-13 12:45:02 +12:00
• 253a16a664 Made the sky box use sky box planes they cannot be scaled. #story[1261] Joseph 2017-09-13 12:44:25 +12:00
• 0f846f31c3 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D Connor Taylor-Brown 2017-09-13 12:28:29 +12:00
• 963c8a43ad Boats and marks are sized realistically in 3rd person - Changed SeaSurface to Subject3D to suppress scaling - Cameras can now be selected through View3D interface Connor Taylor-Brown 2017-09-13 12:25:52 +12:00
• bdb68a89c0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 David Wu 2017-09-13 12:21:12 +12:00
• 7cea1fb11c Reworking fxml for lobby. David Wu 2017-09-13 12:20:42 +12:00
• bed9f8b07a send out to every client fix hba56 2017-09-13 12:19:33 +12:00
• ab96884dc6 Javadoc. fjc40 2017-09-13 12:10:36 +12:00
• 4adcd6322c send out to every client hba56 2017-09-13 12:05:09 +12:00
• 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix fjc40 2017-09-13 12:04:32 +12:00
• 771068966e Just rotated the images to make them look like the plane is rotated properly... #story[1261] Joseph 2017-09-13 11:45:49 +12:00
• 2a6085c9e8 Test fix. fjc40 2017-09-13 00:52:35 +12:00
• a1684a410c Javadoc. fjc40 2017-09-13 00:43:38 +12:00
• 9fa1b9ee67 Re-enabled source id allocator check. Re-enabled rotation of map at startup. Changed race.xml schema so that yacht elements aren't required inside the participants element. #story[1185] fjc40 2017-09-13 00:41:23 +12:00
• 3fa6b9200d Finished MarkRoundingSequence class. Added MarkRoundingData class. RaceState has a MarkRoundingSequenceMember. The temporary rounding line drawing in canvas uses MarkRoundingSequence. MockRace now uses MarkRoundingSequence. #story[1185] fjc40 2017-09-13 00:38:58 +12:00
• 3a6070a645 Fixed Merge and added back some merge changes #story[1196] Fan-Wu Yang 2017-09-12 22:08:02 +12:00
• 3d58801760 matchbrowser now updates and flushes in a better time frame. 30s for flush as thats the time for match lobbys and 5s for update hba56 2017-09-12 22:02:51 +12:00
• 4dcff5c009 SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby hba56 2017-09-12 21:55:23 +12:00
• 3301798411 Fixed boats not rotating in lobby #story[1188] Fan-Wu Yang 2017-09-12 21:35:10 +12:00
• bcc827b554 Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261] Joseph Gardner 2017-09-12 18:16:08 +12:00
• bae428fb3f Recovered a private method used in a test Connor Taylor-Brown 2017-09-12 17:44:05 +12:00
• c94e0af69c Removed remaining println statements Connor Taylor-Brown 2017-09-12 17:35:51 +12:00
• 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-) Connor Taylor-Brown 2017-09-12 17:23:47 +12:00
• 83c1aeba50 Merge branch 'controllerSplit' into 'master' David Wu 2017-09-12 17:00:03 +12:00
• b6c340614f Tutorial text disabled on actual races. #story[1261] zwu18 2017-09-12 16:54:36 +12:00
• 625eb62af2 Wrapped the tutorial text on the title fxml. Jessica Syder 2017-09-12 16:41:54 +12:00
• b808056567 Host boat isnt disappearing anymore (I think). Jessica Syder 2017-09-12 16:39:19 +12:00
• e664619a81 Tutorial is played with tutorial map. Jessica Syder 2017-09-12 16:23:11 +12:00
• fbd124e602 Merge branch 'master' into storyB-) Connor Taylor-Brown 2017-09-12 15:40:49 +12:00
• e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77 hba56 2017-09-12 15:13:35 +12:00
• 59bd22c2aa Fixed mark rounding - Returning mark 2 as mark 1 breaks rounding calculations Connor Taylor-Brown 2017-09-12 13:52:29 +12:00
• 0f316afb3c Added colour indication to next mark - Colour is swapped with end mark in leg when mark is passed Connor Taylor-Brown 2017-09-12 13:36:31 +12:00
• 7a8ea7fea7 Made seasurface overlay to enable skybox to be smaller. #story[1261] Joseph 2017-09-12 12:37:25 +12:00
• b902b05e5e Wrote possible fix for issue #50 (Composite command tries to remove non-existent element) Connor Taylor-Brown 2017-09-12 11:46:57 +12:00
• d90b161d01 Merge branch 'master' into storyA_sounds Connor Taylor-Brown 2017-09-12 11:11:39 +12:00
• 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261] Joseph 2017-09-12 01:55:24 +12:00
• 0cb008cef7 Removed a couple of old canvas lines. Jessica Syder 2017-09-11 23:17:36 +12:00
• 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit Jessica Syder 2017-09-11 23:09:48 +12:00
• c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit Jessica Syder 2017-09-11 23:07:53 +12:00
• 0ea647b9fd Merge branch 'story70' into 'master' Connor Taylor Brown 2017-09-11 21:42:06 +12:00
• 1a9f24a3ba Forgot to hide race.fxml :P #story[1189] zwu18 2017-09-11 21:18:09 +12:00
• fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189] zwu18 2017-09-11 21:07:52 +12:00