fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,048 Commits 1 Branch 0 Tags
4780354452039465dd9114e005ac1c247f88158b
Commit Graph
1048 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hba56 4780354452 Errors in this commit: mock threads get interrupted 
#story[#1188]
 2017-09-08 16:35:36 +12:00
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
 2017-09-08 13:34:48 +12:00
hba56 a494eb4a6d games are now added on the correct port 
#story[1188]
 2017-09-08 12:04:54 +12:00
Joseph f1c07bca46 Linked table to show games from received packets. #story[1188] 2017-09-04 09:53:26 +12:00
Joseph f8e1a539c2 Linked table to show games from received packets. #story[1188] 2017-09-04 09:46:13 +12:00
hba56 5676d435b0 hosts now send info then wait rather than wait then send 
#story[1188]
 2017-09-01 12:20:48 +12:00
Connor Taylor-Brown 42ac733d72 Flush match table on a scheduled rate. 
#story[1196]
 2017-09-01 11:57:24 +12:00
cbt24 2f8daf757a Added scheduled match list broadcast to MatchBrowser 
- Changed MatchTable to map ClientAddress to HostGame
- Send match list as HostedGamesRequest to multicast address (239.0.0.1:4941)

#story[1188]
 2017-08-31 17:34:02 +12:00
hba56 d1c0797db7 hosting a game now continues to send out the info of the race 
#story[1188]
 2017-08-31 15:06:43 +12:00
hba56 a1fa09962a matching table now stores the correct ip of the hosts 
#story[1188]
 2017-08-31 13:55:16 +12:00
hba56 9161f69547 updating match table to store ip and port of clients and hosts 
#story[1188]
 2017-08-31 13:45:04 +12:00
hba56 960b1213fb fix so that test pass 
#story[1188]
 2017-08-30 15:31:28 +12:00
hba56 83f756d7d8 packets can now be sent from client to match server 
#story[1188]
 2017-08-30 15:26:54 +12:00
hba56 b2bd4fdc1c network interface 2017-08-30 12:13:17 +12:00
David Wu 028428da2c Fixed fxml issues due to merge. Added pane centering for panes. #story[1188] 2017-08-30 12:04:17 +12:00
David Wu d2f0c1105a Merged 3d branch. Added 3d item to one of the player pane. #story[1188] 2017-08-30 11:52:45 +12:00
David Wu b724a814b1 Merge branch 'story86-3D' into story77_lobby 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
 2017-08-30 11:46:00 +12:00
David Wu d65ce1a897 Merge branch 'story77' into story77_lobby 2017-08-30 11:40:19 +12:00
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] 2017-08-30 11:39:41 +12:00
Connor Taylor-Brown cf838f2072 Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working. 
#story[1196]
 2017-08-30 01:30:05 +12:00
Connor Taylor-Brown d630788a14 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D 2017-08-29 22:55:07 +12:00
Fan-Wu Yang 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D 2017-08-29 20:36:15 +12:00
Fan-Wu Yang ea41c64c34 Added dependency for stl converter #story[1191] 2017-08-29 20:36:08 +12:00
David Wu 7df181c759 Minor changes to new lobby fxml. #story[1188] 2017-08-29 19:08:22 +12:00
David Wu 892320db5f Added javadoc and extra files to push 2017-08-29 19:03:34 +12:00
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. 2017-08-29 19:02:02 +12:00
hba56 ca0a3f2a8b encoders and decoders for the hosted games request message with datatype and test 
#story[1188]
 2017-08-29 15:28:03 +12:00
David Wu c63403d1de Created new lobby menu. Working on animated background for menu. 2017-08-29 15:11:09 +12:00
hba56 cb8e81a7b2 encoders and decoders for the host game message with datatype and test 
#story[1188]
 2017-08-29 14:38:42 +12:00
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser 
#story[1191]
 2017-08-29 14:38:27 +12:00
hba56 5b6b0a9978 added the new program for holding known games 
#stroy[1188]
 2017-08-29 12:57:19 +12:00
Hamish Ball 7086af6057 Merge branch 'demo_6_no_rotation' into 'master' 
Removed old modules & fixed wind arrow direction

This branch removes the old modules (visualiser, network, mock), and adds a new one - dedicatedServer.

It also fixes the wind arrow direction as pointed out by P.O during the demo.

Changed the maven version number to 2.0.

This branch also has the map rotation disabled until we get rotation+rounding working together.

See merge request !32
 2017-08-29 11:16:47 +12:00
fjc40 eb980c436e Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....). 2017-08-18 22:58:47 +12:00
fjc40 a9fde95b39 Updated maven version to 2.0. 
Added a dedicatedServer module.
Removed Visualiser module.
Removed mock module.
Removed network module.
Fixed weird exception non-handling that appeared for some reason.
 2017-08-18 22:55:50 +12:00
fjc40 0d2be85d17 Brought over long/latitude fix from "rounding_line_visible_hack" branch. 2017-08-18 21:58:31 +12:00
hba56 b886cb426f guide line last leg fix 2017-08-17 22:38:31 +12:00
fjc40 666c7b029f Disabled map rotation - temp fix for the demo. 
Set race to use 3 boat race.xml file.
 2017-08-17 22:26:56 +12:00
Hamish Ball 27e8cddd94 Merge branch 'new_issue#19' into 'master' 
New issue#19



See merge request !31
 2017-08-17 17:08:55 +12:00
David Wu 37095bfc6c Merged master into branch. 2017-08-17 17:02:24 +12:00
David Wu 5234cdea66 Merge branch 'master' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
 2017-08-17 17:00:39 +12:00
Joseph Gardner 0490237c0c Merge branch 'story_64_sails' into 'master' 
Story 64 sails



See merge request !29
 2017-08-17 16:59:50 +12:00
David Wu 598275591f Updated javadoc. 2017-08-17 16:50:51 +12:00
Joseph Gardner 5ba6f52669 fixed autovmg. 2017-08-17 16:50:13 +12:00
David Wu 79add59375 Unresizable control screen. 2017-08-17 16:37:31 +12:00
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19 2017-08-17 16:34:19 +12:00
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons. 2017-08-17 16:33:52 +12:00
Joseph Gardner dcd1df2999 Merged master. 2017-08-17 16:26:00 +12:00
Joseph Gardner 014b78f166 Merge branch 'master' into story_64_sails 2017-08-17 16:25:40 +12:00
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven 2017-08-17 16:24:54 +12:00
David Wu 9f813ab7aa Merged in development. 2017-08-17 16:14:09 +12:00