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

1611 Commits (main)
 

Author SHA1 Message Date
Jessica Syder 915d61b9f3 Map can be zoomed out in birds eye view only to a specified distance.
8 years ago
Jessica Syder ab49d62c0d Map can be zoomed in / out at all times.
8 years ago
hba56 34789ce3b5 mailmap
8 years ago
Joseph Gardner 327c052b1d Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
Joseph Gardner 9212ec91f0 mailmap
8 years ago
fjc40 20702f352b Lobby start button is hidden/disabled by default, to avoid it being visible to non-host clients for a split seconds while loading screen.
8 years ago
Jessica Syder e64e6ddbdb Boat scaling is correct.
8 years ago
Fan-Wu Yang 6d55168c61 Added Textures to boats as well as added texture to arrow #story[1306]
8 years ago
Fan-Wu Yang 45ba3ae6ac Added 3D wind arrow and it also rotates #story[1306]
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
Fan-Wu Yang d280c0bdae Merged master and added a few comments
8 years ago
Fan-Wu Yang 12b7d10f24 Merge branch 'master' into story1297_sails
8 years ago
Connor Taylor-Brown 4f229ad01c Implemented basic 3D start screen with no background race
8 years ago
Connor Taylor-Brown 51413257b2 Modified title screen to use View3D with skybox and ambient lighting
8 years ago
Jessica Syder f1c1fc7063 Race length is affected by slider value.
8 years ago
David Wu 45b2f0b6db Created more fire instances. #story[1292]
8 years ago
fjc40 46192af628 Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
8 years ago
David Wu 1070842ada Fire is now rotated and standing up-write. Found problem with fire not being directly on the boat. #story[1292]
8 years ago
David Wu 4f838a3598 Fire follows boat. TODO: rotate fire. #story[1292]
8 years ago
fjc40 da901d6e0c Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
fjc40 612b4b455e Added start button for host on the ingameLobby screen.
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
Jessica Syder 819cdc49ab Created a slider on the Host Game screen.
8 years ago
Joseph bf6282c697 3D arrow added for zoomed view. Shows relative direction to mark. #story[1299]
8 years ago
Fan-Wu Yang 088e73414b Fixed small bug where the sail never stopps jittering after moving #story[1297]
8 years ago
Fan-Wu Yang 2b8ca9265f Sails now slowly spin to the correct position #story[1297]
8 years ago
hba56 ff59f7ff9c Added a new hud for the race view
8 years ago
hba56 bb24e13387 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
hba56 7418f7b4e6 adding new assets for race view hud
8 years ago
hba56 c43633f197 Merge branch 'master' into raceView_UI
8 years ago
zwu18 67779eb9ad Same changes to dev. #story[1311]
8 years ago
zwu18 64ae01113a Added delay for position update. This fixes fps issue. #story[1311]
8 years ago
Fan-Wu Yang d3a6b82031 Commit before checking out developement
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
Jessica Syder 908f31bcde Merge branches 'master' and 'zoomzoom' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
zwu18 0b02727bf1 Set limits and more appearance changes for speedometer. #story[1311]
8 years ago
Connor Taylor Brown 49c08f5687 Merge branch 'story1298_boat_highlight' into 'master'
8 years ago
Jessica Syder 86fc911f98 Minor changes to improve look of third person view.
8 years ago
Jessica Syder 62535720d4 Removed commented out code.
8 years ago
Jessica Syder fa6543a713 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
Jessica Syder 1ecd2dd7b6 Zooming motion is more natural.
8 years ago
zwu18 e2ea6a5f03 Fixed issue with speedometer and sails interaction. #story[1311]
8 years ago
Connor Taylor-Brown 1b4b980081 Exponentially decrease speed as boat loses health
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
Joseph 4cf9b67db8 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
Joseph 322d7b38b6 Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
8 years ago
Joseph Gardner b1657e8bfc Merge branch 'minimap_test' into 'master'
8 years ago