7b076f3718
Merge branch 'storyA_sounds' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
# racevisionGame/src/main/java/visualiser/layout/SkyBox.java
8 years ago
c23fcfcaa3
new skybox textures. Still need to fix two planes having a small gap between them. #story[1196]
8 years ago
70bbc89239
Fixed merge-related bugs
8 years ago
771068966e
Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
d90b161d01
Merge branch 'master' into storyA_sounds
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/RaceServer.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
8 years ago
49cd19e1a8
Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
1a9f24a3ba
Forgot to hide race.fxml :P #story[1189]
8 years ago
fc9a4898d6
Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
8 years ago
c97706d86e
Merge branch 'master' into story70
...
# Conflicts:
# dedicatedServer/src/main/java/app/App.java
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml
8 years ago
c6594a0e20
Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
9a96131a33
Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]
8 years ago
bad6422ca9
Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
8 years ago
d2d5ae62eb
Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
28ec4b9246
Merge branch 'master' into story70
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/app/App.java
8 years ago
70f4a00d12
Scaled down marks and boats to make 3rd person view more realistic
...
- Added boat and mark annotations to support selection at large camera distance
- Reduced collision radius to 15 m
- Fixed event startup and XML files as race was crashing on start
#story[1296]
8 years ago
ae8fa312a3
removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
ea1594a839
Merge remote-tracking branch 'remotes/origin/master' into Story_76
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
8 years ago
2508b847b8
Merge branch 'master' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
# racevisionGame/src/main/java/visualiser/layout/Subject3D.java
8 years ago
14aaf26b73
Merge branch 'story40-zoom' into 'master'
...
40. [V] As Caleb or Gemma I'd like to zoom the view to follow a boat (my boat) around the course (revised).
Note: in this story we will select a boat and zoom the view to place the boat at the center of a display that shows only the boat's immediate surrounds. The default option will be to zoom on the player's boat.
Acceptance criteria:
- Any particular boat can be chosen (at any time during the race.)
- When a boat is selected for zooming, the view should change to show the boat at the center, with the scale of the view increased.
- The view should remain this way until the boat is unselected, at which point it should revert to the usual display.
- Other information (e.g., the position list) may be removed from the zoomed view.
- Zoomed view follows selected boat as a third person mode
- There must be a keyboard option to zoom in on the player's boat_
- The zoom amount can be fixed (jump between zoom in and zoom out) or scrollable (like control-mousewheel scrolling.)
See merge request !38
8 years ago
e149255240
Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
5bc382304b
Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
5e516b0508
re added the standard race
...
#story[1193]
8 years ago
0c9e55093c
Set lobby anchor pane to invisible to allow races to start
8 years ago
d2c8ccd98e
Course image for a type M2 course has been made. #story[1193]
8 years ago
3157ac88b5
Course layout for a type M2 course has been made. #story[1193]
8 years ago
d3ddff8bf1
host game start button added margins
...
#story[1193]
8 years ago
64ed1f9aa6
Improved map layout image. #story[1193]
8 years ago
54baf4f884
Added scroll-wheel zooming
...
- Race pane listens to scroll delta and sets View3D distance accordingly
- GPSConverter has more applicable property names for infinite 3D
#story[1190]
8 years ago
55cfda33d0
Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
002cccd5a0
Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
e82c59a8a4
New css for the host game window
...
#story[1193]
8 years ago
cbfcd3aa0d
Images
...
#story[1193]
8 years ago
7024cac426
Rotated image of arrow direction #story[1187]
8 years ago
0886a60911
arrow Flip
8 years ago
4ec2a50d20
Image Scales
...
#story[1193]
8 years ago
4eac3ea8b5
Updated the HostGame now has images for the maps and the map can be picked
...
#story[1193]
8 years ago
9560486248
Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
b22c5c5cd6
Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
8 years ago
8b5a5506e7
Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]
8 years ago
8287fbf6ba
Updated the HostGame window to support maps
...
#story[1193]
8 years ago
addaaf0de3
Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
8 years ago
85eb66d508
Keybindings can be saved and loaded, and work when Jar'd!
...
- trying to solve jar file reading issue
- learnt a lot about jars including their lack of file structure
- changed location of keybindings settings to outside of jar
- added new folder/file that is generated on first run
#story[1197]
8 years ago
dd1cb89b66
Merge remote-tracking branch 'origin/master' into 77_racexml_updates
8 years ago
cd685ae467
Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195]
8 years ago
cfa6fc37e0
User modified keybindings are persistently saved
...
- Works on windows computers
- KeyFactory processes its own XML saving/loading
- Does not work with Jar yet
- Changed keyFactory to static temporarily to work with existing FXML loading architecture
#story[1197]
8 years ago
8c76d6c26e
Added boats.xml schema.
...
RaceServer now creates an XMLMessage when the race's BoatDataSource changes.
#story[1188]
8 years ago
298fcd03dc
Added regatta schema.
...
RaceServer now creates an XMLMessage when the race's RegattaDataSource changes.
#story[1188]
8 years ago
ec58f0c847
Participants can now join during the warning period as well.
...
Added RaceDataSourceToXML.
RaceServer now create an XMLMessage when the race's RaceDataSource changes.
#story[1188]
8 years ago
66699a4660
Added a draft for a new Course layout
...
#story[1193]
8 years ago
3fdfbd83e0
User can save, reset or cancel.
...
- Created a notification popups for errors
- Added functionality to save, cancel and reset buttons
- Key bindings are only saved if they're valid
- Added window close event
- Can not exit without saving correctly
- CSS to cancel, save and reset buttons to differentiate between key buttons
- Javadocd
#story[1197]
8 years ago
Joseph Gardner
Connor Taylor-Brown
zwu18
hba56
Jessica Syder
Fan-Wu Yang
fjc40