faefcc7938
Fixed bug with initializing race view elements. Made chat box unselectable. Only manually tested.
...
#bugs #test #implement
2017-09-09 13:03:55 +12:00
0c956f93c8
Merge request fixes. minor refactor
...
#story[1246]
2017-09-09 12:37:31 +12:00
0e2946f20b
Added ocean object
2017-09-09 12:34:08 +12:00
f66ef3c208
[WIP]
...
- Horizontal and vertical resizing works fine now.
- Issue: Have to implement maximum horizontal and vertical scaling.
#story[1248]
2017-09-09 03:14:10 +12:00
cf4f8813d2
re-implemented existing functionality in UI
...
- Correct player count is shown in server list
- Servers now advertise their capacity and number of players connected
- Players can click join on the servers in the server list
- Direct connect works
- Can set max players / server name in host dialog
- Server starts correctly when host clicked
- Implemented boat customization
- Implemented 'begin race button', and disabled it for players that aren't hosts
- Added countdown timer in lobby
- Fixed bug where app wouldn't close
Tags: #story[1245]
2017-09-08 18:00:09 +12:00
e2bc613c9d
Merge request fixes
...
#story[1246]
2017-09-08 15:52:01 +12:00
c2c3c9eb53
Experimented with parallel camera in 3d gameview. Works ok for rendering boats in isometric view.
...
#test
2017-09-08 14:05:52 +12:00
cadf995bf7
Added area rounding area to mark assets.
...
#implement
2017-09-08 13:32:17 +12:00
62f139c604
Added 3D window to GameView3D to begin adding assets to. Used it to refine all 3D assets implemented by ModelFactory and manually test that they work.
...
#implement #test
2017-09-08 01:51:31 +12:00
0bf6dd9e6b
Added 3D window to GameView3D to begin adding assets to. Used it to refine all 3D assets implemented by ModelFactory and manually test that they work.
...
#implement #test
2017-09-08 01:50:56 +12:00
eed5f56690
Created factory class for making different views for 3d models of boats.
...
#implement
2017-09-07 19:23:07 +12:00
b35126ff4e
Added server list updates, and added lobby
...
- Server list updates when a server is added/removed
- Player can host a server
- Lobby view shows players connected
Tags: #pair[mra106, hyi25] #story[1245]
2017-09-07 19:20:36 +12:00
c39499cee7
Fixed 3d tests
2017-09-07 18:17:42 +12:00
cff15ba07d
Added missing button click.
...
#story[1249]
2017-09-07 17:54:28 +12:00
6be7c17c40
Fixed manual test bugs in sounds.
...
#story[1249]
2017-09-07 17:39:59 +12:00
64811354e3
added peters boat
2017-09-07 17:09:52 +12:00
3364f8b516
Made chat history transparent.
...
#story[1246]
2017-09-07 17:02:42 +12:00
8cc725616c
Merge remote-tracking branch 'origin/Story1247_AutoDiscovery' into NewUI
...
# Conflicts:
# pom.xml
# src/main/java/seng302/App.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/resources/views/StartScreenView.fxml
2017-09-07 16:36:30 +12:00
0feccdc8b9
Replaced existing views with new views and controllers from the test repository.
...
Tags: #pair[mra106, ajm412] #story[1245]
2017-09-07 16:32:34 +12:00
1a755cec33
Fixed bug that caused mark arrows to be rendered on Marker id not LegNumber
...
#bugs
2017-09-07 16:25:55 +12:00
d565552fcc
Added jar files to repo
2017-09-07 15:34:38 +12:00
26a8d76f8b
Merged with remote changes
2017-09-07 14:56:08 +12:00
d87dcaa4fe
Merged with remote changes
2017-09-07 14:54:23 +12:00
0b61dffe71
Fixed some docstrings to make build work.
...
#story[1246]
2017-09-07 14:50:08 +12:00
4e69157c09
Merge remote-tracking branch 'origin/Story1248_Game_App_Scaling' into Story1248_Game_App_Scaling
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
2017-09-06 01:27:57 +12:00
d67566e217
[WIP]
...
- changed contentAnchorPane to Grid Pane temporarily so added child will be able to resize natively
- implemented zooming when resizing
Bugs:
- horizontal resizing works as intended, but vertical resizing will result in canvas moving far too left
- need to solve the right and bottom empty space when resizing
#story[1248]
2017-09-06 01:26:12 +12:00
56f1dd2efb
Reverted change, didn't work.
...
#story[1246]
2017-09-05 18:20:56 +12:00
302bc91461
Tried to fix build by removing invalid '>' char.
...
#story[1246]
2017-09-05 18:17:20 +12:00
488ab47c8d
Finished off chat cucumber test.
...
#story[1246]
2017-09-05 18:00:43 +12:00
0650ba30e2
Fixed chat tests
...
#story[1246]
2017-09-05 17:27:34 +12:00
04518c35b0
Created new yacht shape and altered the number of lights.
...
#implement
2017-09-05 17:17:42 +12:00
f33e4cc137
Added finish music and merged with text chat.
...
#story[1249]
2017-09-05 15:24:56 +12:00
7a4b3f0ad9
Merge branch 'text_chat' into Story1249_SoundsAndMusic
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
2017-09-05 14:42:20 +12:00
1619c95098
Added mark rounding noise and hover button noise.
...
#story[1249]
2017-09-05 14:33:37 +12:00
396098e009
Added finish noise.
...
#story[1249]
2017-09-05 13:44:14 +12:00
e4dbbd05c7
Merged with remote changes
2017-09-04 23:42:10 +12:00
a1e3ec54c7
Merge remote-tracking branch 'origin/text_chat' into text_chat
2017-09-04 23:11:02 +12:00
47f3f6e27d
Created a new chat history class that allows for rich formatting of individual messages. Current implementation allows for bold and coloured text only. Has been manually tested. Fixed 3/5 chat command tests.
...
#implement #test #story[1246]
2017-09-04 23:10:54 +12:00
fce7aa4f9a
Started making a cucumber test for allchat.
...
Will need to incorporate mockito in order to mock controller input. Have commented out the tests as they are not working correctly yet.
#story[1246]
2017-09-04 19:43:05 +12:00
81afad1bcc
Wrote tests that are currently broken for sending server commands through text chat.
...
#tests
2017-09-04 14:43:13 +12:00
5026c568a7
Wrote tests that are currently broken for sending server commands through text chat.
...
#tests
2017-09-03 20:38:31 +12:00
88d1e91b6f
Added processing of input from host via chat to manually trigger race finishing or to speed up boats.
...
#implement
2017-09-03 19:18:30 +12:00
67f39e9049
Tested several methods of creating 3D assets. Added a 3D file importer to library of project and replaced some assets with temporary 32 ones to test creating 32 objects.
...
#implement
2017-09-03 16:54:53 +12:00
eb1d3f1a60
Fixed bug where discovery wasn't working under windows
...
- getLocalHost() was returning the networks public IP address, changed this to getByName() for the local IP
Tags: #story[1247]
2017-09-02 02:16:40 +12:00
54ca12f3b6
[WIP]
...
- Updated raceview.fxml to scale race view when resize.
- Implemented a listener on game view to know the current window size.
Issues:
- Border updates with resizing until a certain size and it draws out of canvas
- Marks are not drawn within border
- Trails do not scale at all
2017-09-01 17:10:00 +12:00
3f910b8db7
Fixed JavaDoc errors by adding missing parameters
2017-09-01 16:13:18 +12:00
b346d5a706
Implemented server re-registration when a server closes / updates
...
- When a server is closed, it will disappear from the server list
- When a player joins a server, the number of spaces left will decrease
- Servers now disappear instead of duplicating
- Added tests for ServerDescription
- Added documentation for new classes
Tags: #story[1247]
2017-09-01 16:05:47 +12:00
45fa73595f
fixed being able to zoom while chatting by holding shift and then pressing z and x #story[1246]
2017-08-31 17:26:02 +12:00
01ca3f3453
tweaked formatting of chat history #story[1246]
2017-08-31 17:06:13 +12:00
ba8e333d81
fixed issue with the chat history updating weirdly (made sure it run synchronously with platform.runlater) #story[1246]
2017-08-31 16:49:12 +12:00
Calum
William Muir
Zhi You Tan
Michael Rausch
Kusal Ekanayake
Zhi You Tan
Peter Galloway