fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1410 Commits
1 Branch
0 Tags
227 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f4001e0ae3'
${ noResults }
Commit Graph

179 Commits (f4001e0ae3fb94cb042e4d03675b58af16cdd696)

Author SHA1 Message Date
zwu18 f4001e0ae3 Added visual display when boat dies. Added sound when boat dies. #story[1311]
8 years ago
zwu18 e53d7d894b Warning sound added. Sound synced with visual display. #story[1292]
8 years ago
David Wu 3a966fa6b8 Reworked visual displays for low hp boats. There is now a warning indication under boats that drop below 20hp. TODO: Create sfx and different display when boat is in critical hp/dead. #story[1292]
8 years ago
David Wu c527ad0c52 Forgot to add image file. #story[1292]
8 years ago
David Wu 45eb557256 Displaying visual effect with imageview. #story[1292]
8 years ago
zwu18 1946bfd658 Added audio indication when the user boat is low on hp. Audio rate changes when hp is critically low. #story[1292]
8 years ago
Connor Taylor-Brown 16da9e009b Cherry-picked FXML changes from Development
8 years ago
Connor Taylor-Brown 985f784066 Removed broken stuff from FXML after merge
8 years ago
Connor Taylor-Brown dc9445a8a6 Merge branch 'master' into story1291-hp
8 years ago
hba56 4242d05279 fixed issue with being unable to click through minimap
8 years ago
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
hba56 afc42cf2ab lowered opacity
8 years ago
hba56 50125e0151 moved minimap to left so does not overlap with speedo
8 years ago
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato
8 years ago
hba56 f7d866144a Map now only shows annotations when in full screen
8 years ago
hba56 731be68831 test for a minimap
8 years ago
fjc40 eb2ed45ed2 Merge branch 'master' into spectate_mode_basic
8 years ago
hba56 e0d886ffb2 overlay off by default
8 years ago
hba56 88f1a393f2 Made the info tab into an overlay
8 years ago
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
Fan-Wu Yang 2383915c78 Merged #story[1195]
8 years ago
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195]
8 years ago
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D
8 years ago
fjc40 43a1fbcb64 Spectate mode can be selected by clients when they join a game.
8 years ago
Joseph Gardner 7b076f3718 Merge branch 'storyA_sounds' into storyD-3D
8 years ago
Joseph Gardner c23fcfcaa3 new skybox textures. Still need to fix two planes having a small gap between them. #story[1196]
8 years ago
hba56 083eb5a4bc updated race view that does not use a split pane
8 years ago
hba56 87f3265640 pushed branch
8 years ago
hba56 fd120edaf9 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
David Wu 22b4b66049 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu cccce9002b Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu 490aab3f8d Changes made to pre-race countdown. #story[1188]
8 years ago
hba56 079d93fc0f Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
David Wu 89ce8a7cc0 Pre-race countdown implementation.
8 years ago
Connor Taylor-Brown 70bbc89239 Fixed merge-related bugs
8 years ago
David Wu 202c8d80c8 Minor fxml adjustments.
8 years ago
David Wu 7cea1fb11c Reworking fxml for lobby.
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Joseph 771068966e Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
fjc40 9fa1b9ee67 Re-enabled source id allocator check.
8 years ago
Jessica Syder 625eb62af2 Wrapped the tutorial text on the title fxml.
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Jessica Syder 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189]
8 years ago
zwu18 fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
8 years ago
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago