 Haoming Yin
|
cc124b2d19
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
|
2017-09-14 14:50:49 +12:00 |
|
|
Haoming Yin
|
b3320ad805
|
Fixed server message sender
tags: #story[1246]
|
2017-09-14 14:49:25 +12:00 |
|
 Alistair McIntyre
|
33779ad5c1
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
# Conflicts:
# src/main/resources/views/RaceView.fxml
|
2017-09-14 14:42:57 +12:00 |
|
|
Alistair McIntyre
|
3a41c27d8d
|
- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.
tags : #story[1245]
|
2017-09-14 14:42:25 +12:00 |
|
 Calum
|
e24203904b
|
Removed print statements.
#chore
|
2017-09-14 14:37:22 +12:00 |
|
|
Calum
|
eb188495ce
|
Fixed position issues on exit arrows.
#implement #story[1266] #fix
|
2017-09-14 14:32:45 +12:00 |
|
|
Calum
|
62a7e2b8fa
|
Fixed position issues on entry arrows.
#implement #story[1266] #fix
|
2017-09-14 14:21:04 +12:00 |
|
 Michael Rausch
|
acd0e790fe
|
Added method to send server debug messages to players
Tags: #story[1246]
|
2017-09-14 14:14:21 +12:00 |
|
 Zhi You Tan
|
46013474c0
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-14 13:37:01 +12:00 |
|
|
Alistair McIntyre
|
bf427f24d3
|
- Created a Race Finish Dialog.
tags : #story[1245]
|
2017-09-14 13:34:48 +12:00 |
|
|
Alistair McIntyre
|
7d0a47446d
|
- Fixed bug in customize dialog.
tags : #story[1245]
|
2017-09-14 13:02:31 +12:00 |
|
|
Alistair McIntyre
|
889098bb50
|
- Commented out broken test (non-deterministic thing)
- Merged 3d factory branch in
tags : #story[1245]
|
2017-09-14 12:46:17 +12:00 |
|
|
Alistair McIntyre
|
6223a8fc0b
|
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
|
2017-09-14 12:40:20 +12:00 |
|
|
Calum
|
391bd33548
|
Fixed position issues on first 2 mark arrows.
#implement #story[1266]
|
2017-09-14 12:38:36 +12:00 |
|
|
Alistair McIntyre
|
7e0c2abbfd
|
- Fixed a shutdown bug that left the game process running long after the window shut
- Changed SVG Icon for volume toggle to something a bit nicer
tags : #story[1245]
|
2017-09-14 12:31:49 +12:00 |
|
|
Calum
|
42a5e86bf8
|
Merge remote-tracking branch 'origin/NewUI_merge' into story1266_3d_model_factory
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
|
2017-09-14 12:06:19 +12:00 |
|
|
Calum
|
20d73d8f2f
|
Removed dead code from fxObjects and GameView 3D
#chore
|
2017-09-14 12:05:20 +12:00 |
|
|
Calum
|
0a62c538ca
|
Added 3D mark arrows and cleaned up other classes.
|
2017-09-14 11:28:50 +12:00 |
|
|
Zhi You Tan
|
24a04aa530
|
Fix the wind direction arrow rotation.
#story[1245]
|
2017-09-14 01:05:52 +12:00 |
|
|
Haoming Yin
|
7ee6a09626
|
Fixed that wind speed did not updated frequently and UI polishing.
- added shadow for raceview boxes
- split up message history and input text block
- changed timer font
#story[1245]
|
2017-09-13 21:11:40 +12:00 |
|
 Zhi You Tan
|
47798b19fe
|
Added player position, boat speed, boat heading to race view.
#story[1245]
|
2017-09-13 11:22:05 +12:00 |
|
|
Zhi You Tan
|
d9247eb031
|
Added player position, boat speed, boat heading to race view.
#story[1245]
|
2017-09-13 11:21:33 +12:00 |
|
|
Zhi You Tan
|
7b0d31438e
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan
|
2017-09-13 09:44:17 +12:00 |
|
|
Alistair McIntyre
|
1e74321aab
|
- Lobby Disconnection works.
tags : #story[1245]
|
2017-09-12 18:26:25 +12:00 |
|
|
Zhi You Tan
|
f0fc75feec
|
[WIP] Adding player position, boat speed, boat heading
#story[1245]
|
2017-09-12 18:25:46 +12:00 |
|
 Kusal Ekanayake
|
c8dc448a52
|
Added tests for sounds and modified the transparency for the chat history window.
#story[1245]
|
2017-09-12 18:11:32 +12:00 |
|
|
Michael Rausch
|
e518d13fd5
|
Fixed bug where number of players was off by 1
#story[1247]
|
2017-09-12 17:47:02 +12:00 |
|
|
Alistair McIntyre
|
167545cbef
|
- Deleted old controllers that didn't do anything anymore.
tags : #story[1245]
|
2017-09-12 17:45:39 +12:00 |
|
|
Alistair McIntyre
|
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 |
|
|
Alistair McIntyre
|
90a54beb8d
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 17:19:29 +12:00 |
|
|
Alistair McIntyre
|
e375efb8e9
|
- Added documentation to controllers
- Moved Customization Dialog logic into LobbyController
tags : #story[1245]
|
2017-09-12 17:19:18 +12:00 |
|
|
Michael Rausch
|
06e9c55d2c
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 17:17:46 +12:00 |
|
|
Michael Rausch
|
9cba76f979
|
Fixed maven source encoding
|
2017-09-12 17:17:16 +12:00 |
|
|
Calum
|
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 |
|
|
Alistair McIntyre
|
634322de3f
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 17:08:22 +12:00 |
|
|
Calum
|
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 |
|
|
Calum
|
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 |
|
|
Alistair McIntyre
|
3455321f01
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 16:54:55 +12:00 |
|
|
Alistair McIntyre
|
7e9e96c091
|
- Added documentation to controllers
tags : #story[1245]
|
2017-09-12 16:54:40 +12:00 |
|
|
Zhi You Tan
|
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 |
|
|
Kusal Ekanayake
|
ec7ee34305
|
Fixed tests.
|
2017-09-12 16:52:26 +12:00 |
|
 William Muir
|
9dad88e56a
|
Fixed bug where server creation dialog validation was not working
#story[1245]
|
2017-09-12 16:45:52 +12:00 |
|
|
William Muir
|
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 |
|
 Peter Galloway
|
71f626f57e
|
fixed sail rotation broken from port to 3d #story[1266]
|
2017-09-12 16:30:20 +12:00 |
|
|
William Muir
|
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 |
|
|
William Muir
|
5046ca6ffa
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 16:08:39 +12:00 |
|
|
William Muir
|
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 |
|
|
Michael Rausch
|
2f973deacc
|
Merge branch 'NewUI_merge' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into NewUI_merge
|
2017-09-12 15:56:31 +12:00 |
|
|
Michael Rausch
|
f4c5e483ce
|
Merge remote-tracking branch 'origin/3D_view_working_with_maven' into NewUI_merge
|
2017-09-12 15:56:17 +12:00 |
|
|
Haoming Yin
|
bb3ee424cc
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 15:52:34 +12:00 |
|