324 Commits (4780354452039465dd9114e005ac1c247f88158b)

Author SHA1 Message Date
hba56 4780354452 Errors in this commit: mock threads get interrupted
8 years ago
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
8 years ago
hba56 a494eb4a6d games are now added on the correct port
8 years ago
Joseph f1c07bca46 Linked table to show games from received packets. #story[1188]
8 years ago
Joseph f8e1a539c2 Linked table to show games from received packets. #story[1188]
8 years ago
hba56 5676d435b0 hosts now send info then wait rather than wait then send
8 years ago
hba56 d1c0797db7 hosting a game now continues to send out the info of the race
8 years ago
hba56 9161f69547 updating match table to store ip and port of clients and hosts
8 years ago
hba56 960b1213fb fix so that test pass
8 years ago
hba56 83f756d7d8 packets can now be sent from client to match server
8 years ago
hba56 b2bd4fdc1c network interface
8 years ago
David Wu 028428da2c Fixed fxml issues due to merge. Added pane centering for panes. #story[1188]
8 years ago
David Wu d2f0c1105a Merged 3d branch. Added 3d item to one of the player pane. #story[1188]
8 years ago
David Wu b724a814b1 Merge branch 'story86-3D' into story77_lobby
8 years ago
David Wu d65ce1a897 Merge branch 'story77' into story77_lobby
8 years ago
David Wu 88782182d7 Player panes and spectator list now call method on click. Will later be used for players to choose whether they want to play or spectate. #story[1188]
8 years ago
Connor Taylor-Brown cf838f2072 Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working.
8 years ago
Connor Taylor-Brown d630788a14 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D
8 years ago
Fan-Wu Yang 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
Fan-Wu Yang ea41c64c34 Added dependency for stl converter #story[1191]
8 years ago
David Wu 7df181c759 Minor changes to new lobby fxml. #story[1188]
8 years ago
David Wu 892320db5f Added javadoc and extra files to push
8 years ago
David Wu 0621e1bdb1 Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation.
8 years ago
hba56 ca0a3f2a8b encoders and decoders for the hosted games request message with datatype and test
8 years ago
David Wu c63403d1de Created new lobby menu. Working on animated background for menu.
8 years ago
hba56 cb8e81a7b2 encoders and decoders for the host game message with datatype and test
8 years ago
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser
8 years ago
fjc40 eb980c436e Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
8 years ago
fjc40 a9fde95b39 Updated maven version to 2.0.
8 years ago
fjc40 0d2be85d17 Brought over long/latitude fix from "rounding_line_visible_hack" branch.
8 years ago
hba56 b886cb426f guide line last leg fix
8 years ago
fjc40 666c7b029f Disabled map rotation - temp fix for the demo.
8 years ago
David Wu 37095bfc6c Merged master into branch.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu 598275591f Updated javadoc.
8 years ago
Joseph Gardner 5ba6f52669 fixed autovmg.
8 years ago
David Wu 79add59375 Unresizable control screen.
8 years ago
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19
8 years ago
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons.
8 years ago
Joseph Gardner dcd1df2999 Merged master.
8 years ago
Joseph Gardner 014b78f166 Merge branch 'master' into story_64_sails
8 years ago
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven
8 years ago
David Wu 9f813ab7aa Merged in development.
8 years ago
Joseph Gardner e26fb73627 Merged master.
8 years ago
David Wu 288979be3b Merge branch 'Development' into new_issue#19
8 years ago
Joseph Gardner d41e52766b Merge branch 'master' into story_64_sails
8 years ago
David Wu 09eaf6d968 Merged master.
8 years ago
Joseph Gardner 37fe7389ff Rounding marks works.
8 years ago
David Wu 5a188f0582 Merge branch 'master' into new_issue#19
8 years ago
Hamish Ball d2f9bfedcb Merge branch 'issue_18_track_alpha' into 'master'
8 years ago