47798b19fe
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:22:05 +12:00
d9247eb031
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:21:33 +12:00
7b0d31438e
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan
2017-09-13 09:44:17 +12:00
1e74321aab
- Lobby Disconnection works.
...
tags : #story[1245]
2017-09-12 18:26:25 +12:00
f0fc75feec
[WIP] Adding player position, boat speed, boat heading
...
#story[1245]
2017-09-12 18:25:46 +12:00
c8dc448a52
Added tests for sounds and modified the transparency for the chat history window.
...
#story[1245]
2017-09-12 18:11:32 +12:00
e518d13fd5
Fixed bug where number of players was off by 1
...
#story[1247]
2017-09-12 17:47:02 +12:00
167545cbef
- Deleted old controllers that didn't do anything anymore.
...
tags : #story[1245]
2017-09-12 17:45:39 +12:00
20b656b16d
- Fixed a bug in new customize dialog.
...
- Chat should work correctly when pressing enter now.
tags : #story[1245]
2017-09-12 17:26:52 +12:00
e375efb8e9
- Added documentation to controllers
...
- Moved Customization Dialog logic into LobbyController
tags : #story[1245]
2017-09-12 17:19:18 +12:00
d5ce61a0ff
Merge branch 'NewUI_merge' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-09-12 17:09:47 +12:00
634322de3f
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 17:08:22 +12:00
6f534a430d
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
2017-09-12 17:04:37 +12:00
17b0864815
Moved transformation of boat icon view from controller class to model factory class.
...
#implement #story[1266] #refactor
2017-09-12 17:03:50 +12:00
3455321f01
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 16:54:55 +12:00
7e9e96c091
- Added documentation to controllers
...
tags : #story[1245]
2017-09-12 16:54:40 +12:00
b25c3367a9
Reimplemented wind. Wind arrow will rotate based on wind direction. Added labels for wind direction and wind speed.
...
#story[1245]
2017-09-12 16:52:44 +12:00
ec7ee34305
Fixed tests.
2017-09-12 16:52:26 +12:00
9dad88e56a
Fixed bug where server creation dialog validation was not working
...
#story[1245]
2017-09-12 16:45:52 +12:00
6a4547f3f9
Minor fix so no lag when token is picked up
...
upon receiving a new RaceXML when one has been recieved we no longer update the course. Just update tokens
#story[1245]
2017-09-12 16:37:29 +12:00
71f626f57e
fixed sail rotation broken from port to 3d #story[1266]
2017-09-12 16:30:20 +12:00
1c343ec02d
Changed the lobby map view to the 2D race rather than the 3D one.
...
Stripped back game view class appropriately.
#story[1245]
2017-09-12 16:13:14 +12:00
5046ca6ffa
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 16:08:39 +12:00
bd31bae586
Changed the lobby map view to the 2D race rather than the 3D one.
...
Stripped back game view class appropriately.
#story[1245]
2017-09-12 16:08:29 +12:00
bb3ee424cc
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 15:52:34 +12:00
99f38fa05f
[WIP] Added wind image to the bottom left of the race view.
...
tags: #story[1245]
2017-09-12 15:52:22 +12:00
da3613fe36
Split off marker classes.
2017-09-12 14:48:30 +12:00
8dc3e54186
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory
2017-09-12 14:11:11 +12:00
8fd35392b0
Added experimental assets for water.
...
#story[1266] #implement
2017-09-12 14:11:00 +12:00
bc9f0ea924
Injected a simple toggle into the decorator for the window for the sound.
...
Unsure if this is the best way to do it but not a bad thing to try for now.
tags : #story[1245] #story[1249]
2017-09-12 13:53:24 +12:00
6d9864e677
Fixed chat history text line spacing to a smaller amount.
...
tags: #story[1245]
2017-09-12 11:12:35 +12:00
8c2125276e
Polished race view text area and send button UI style to make them pretty
...
tags: #story[1245]
2017-09-12 10:59:08 +12:00
235d6c9cef
Added 3D element to lobby screen to show the player their boat before the race.
...
tags: #story[1245]
2017-09-12 03:57:29 +12:00
5dd936f8f1
Added chat functionality & timer back into the game + bug fixes
...
- Added chat back into the game
- Fixed a bug where the timer would show "race finished" when the race hadn't started
- Fixed a bug where resources weren't being deallocated when the game was closed
Tags: #story[1246]
2017-09-12 01:31:38 +12:00
d223d393fa
Merge branch 'story1266_3d_model_factory' into NewUI_merge
2017-09-11 23:45:31 +12:00
aa098569f3
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-11 23:43:46 +12:00
d49e84e6d2
Fixed a bug that race view doesn't fit in decorator.
...
- recreated a new stage and decorator to fix the bug as decorator might
not be able to be reused.
#story[1245]
2017-09-11 23:42:08 +12:00
75bf92a67f
Added map image to lobby screen
...
- Lobby screen has map of the course
- Map resizes with window
Tags: #story[1245]
2017-09-11 23:24:21 +12:00
0d7201e235
Race view is default to be full screen now and minor bug fixes.
...
- race view is force to be full screen and run in a new stage
- fixed button animations in lobby view
- polished UI element is boat customization dialog
#story[1245]
2017-09-11 23:04:41 +12:00
0197de6fe3
Drawing player icon assets but line segment was not added to repo some app crashes.
...
#implement #story[1266]
2017-09-11 22:19:08 +12:00
d79ff0f1cf
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
2017-09-11 22:03:52 +12:00
18f36d7ea4
Added assets to identify the player. Needs to merge with 3d player specification for code side to be implemented.
...
#story[1266] #implement
2017-09-11 22:02:21 +12:00
131cd80e02
Added button sounds on hover, click and in the lobby
...
- Started playing start & lobby sounds
- Started playing button hover & click sounds
Tags: #story[1249]
2017-09-11 19:50:17 +12:00
3d0209300e
- Validation completely done
...
- Some documentation added.
tags : #story[1245]
2017-09-11 19:36:16 +12:00
6b4f7eb42b
Merge develop into NewUI, and 3D
...
tags: #story[1245]
2017-09-11 18:56:26 +12:00
0bf83aa858
Merge remote-tracking branch 'origin/develop' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
2017-09-11 18:15:08 +12:00
dff261cf41
Added 3D assets for a trail and generated them at regular intervals.
...
#story[1266] #implement
2017-09-11 17:16:13 +12:00
d4826739e3
Merge branch 'develop' into Story1248_Game_App_Scaling
2017-09-11 16:56:49 +12:00
fdfb5959fa
Minor change so that boats still are checked for collision after passing the finish line
...
#story[1250]
2017-09-11 16:53:12 +12:00
878c0e0f43
Added ocean asset. Moved camera to center of race.
...
#story[1266]
2017-09-11 16:24:21 +12:00
Zhi You Tan
Alistair McIntyre
Zhi You Tan
Kusal Ekanayake
Michael Rausch
Calum
William Muir
Peter Galloway
Haoming Yin
alistairjmcintyre
hyi25
Haoming Yin