49cd19e1a8
Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
0cb008cef7
Removed a couple of old canvas lines.
...
#story[1261]
8 years ago
9bc36ba544
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml
8 years ago
c30391ef23
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml
8 years ago
0ea647b9fd
Merge branch 'story70' into 'master'
...
Story70 Merge Request
Acceptance criteria:
Only the player's boat is present (there are no other boats) and no other course elements are present.
Each key function is introduced, and the player given the opportunity to use that (and only) that key, and observe the result.
The practice ends when the final key has been taught.
At least the up/down, tack/gybe, sails in/out keys must be taught.
[manual tests](https://eng-git.canterbury.ac.nz/seng302-2017/team-7/wikis/manual-test:-tutorial-mode )
See merge request !40
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
2cda5ea70d
Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]
8 years ago
5e35cd4195
Removed empty java files
8 years ago
54a9140f31
lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188]
8 years ago
669a303e9b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml
8 years ago
108643b59d
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml
8 years ago
df04cdf87c
Boats are now visualy removed when they leave the lobby.
8 years ago
0da6931f8f
Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
d92410b9b4
Fixed XML Issue where sometimes the last boat would not display itself #story[1188]
8 years ago
b976186c7d
Merged current master in. Made changes to classes so tutorial again due to merge. #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
a123bfb7e8
Merge branch 'Story_76' into 'master'
...
Story 76
AC:
Note: most sailing races take place on fairly standard courses: windward-leeward, triangular/Olympic, and so on. An (incomplete) list can be found at http://www.rya.org.uk/racing/race-officials/resource-centre/forms-data-diagrams-graphics/Pages/course-diagrams-other-graphics.aspx
This story is related to Story 51 (generating course layouts). While 51 is concerned with orienting a course to the wind, this one relates to a library of common course layouts which could be adjusted before use by the method in 51
DOD:
Adheres to relevant architectural decisions.
Branch has latest version of master merged in.
All acceptance criteria sufficiently met.
mvn clean package with no errors.
All tests pass on CI.
Javadoc compiles without error. 1
Code passes our code review (see code quality standard).
New tests have been sufficiently written for new functions/classes/components.
Existing tests have been modified to correctly use new functions/classes/components.
Manual tests have been written and logged.
Related issues in the issue tracker should be linked to, and closed once merged.
DOD feature check carried out and successfully completed.
New step has been added to DOD feature check, if required.
All System.out.println() removed from program
See merge request !39
8 years ago
346aa148ef
Added some debug statements, and WIP MarkRoundingSequence class.
...
Temporarily disabled source id allocator time checks.
Added mark rounding stuff to race canvas to help debug.
#story[1185]
8 years ago
ae75bb86d3
Resized models to a similar size of the collision detectors. #story[1261]
8 years ago
08ca42f786
Wrote some missing java docs #story[1261]
8 years ago
9ac9c25923
Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]
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
a7eefca13a
Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]
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
e2b868d815
Added boundaries to the map, which are drawn by the race #story[1261]
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
ddc3a6ae47
boxes in lobby are now boats
8 years ago
e5d8a4028d
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/layout/Subject3D.java
# racevisionGame/src/main/java/visualiser/layout/View3D.java
# racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
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
643f145407
Added mark radius 3D annotation to improve bird's eye visibility
...
#story[1261]
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
1ed7ccf146
Minor changes preparing to merge in 3D
...
#story[1261]
8 years ago
93883ee8b7
Added more descriptive documentation to new classes and functionality
...
#story[1190]
8 years ago
6a302841c0
Minor changes preparing to merge in 3D
...
#story[1261]
8 years ago
0dff85006a
Changes to code to use new controller structure.
...
- renamed javadoc referencing old controllers
- keybindings no longer need to be static
- finished lobby and lobbyhost controllers
#story[1261]
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
a5050b8ea8
Adding back lost changes and finishing splitting last controllers.
...
- renamed fxml and their controllers to match
- removed old controllers
- finished lobby and lobbyhost controllers
#story[1261]
8 years ago
4c2ab9cc9a
Merge branch 'master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/model/View3D.java
8 years ago
0c9e55093c
Set lobby anchor pane to invisible to allow races to start
8 years ago
a5d3434a70
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
8 years ago
4780354452
Errors in this commit: mock threads get interrupted
...
#story[#1188 ]
8 years ago
b034a452b6
Fixed problem with race pane registering non-control keys
...
#story[1190]
8 years ago
Joseph
Jessica Syder
Connor Taylor Brown
zwu18
Fan-Wu Yang
fjc40
hba56
Jessica Syder