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

144 Commits (9b30877b5aef1218b09ff1a6afb366f019a8e2e6)

Author SHA1 Message Date
hba56 9b30877b5a Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato
8 years ago
hba56 fb8f1640ac Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
hba56 58cde8ce44 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
zwu18 ca5b344181 Visual improvements made to tomato health bar. #story[1301]
8 years ago
hba56 7b5460abc5 info full screen map shows on top of hud
8 years ago
hba56 2ac3bad6e1 info table shows on top of hud
8 years ago
hba56 4e8f1a2b19 Placed the waypoint arrow in the HUD
8 years ago
David Wu 1a672e8ac8 Merge branch 'master' into story1292_hp_punish
8 years ago
hba56 2f6fa73349 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
Joseph Gardner 13f3f595d2 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
Joseph Gardner ea1170a48e Merge remote-tracking branch 'origin/master' into raceLength
8 years ago
hba56 173b4444da Placed the wind arrow in the HUD
8 years ago
hba56 fc267a6a49 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
David Wu 3adc5330b4 Merge branch 'master' into story1292_hp_punish
8 years ago
zwu18 416eb1e6bf On death a menu will pop up telling the user he is dead. #story[1292]
8 years ago
Joseph 569204b771 New skin for 2d next mark arrow. #story[1299]
8 years ago
Joseph affbb69029 Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
8 years ago
Joseph d86d043992 Merge branch 'master' into story1299_next_mark_direction
8 years ago
zwu18 f4001e0ae3 Added visual display when boat dies. Added sound when boat dies. #story[1311]
8 years ago
Fan-Wu Yang d599df3901 Merge branch 'master' into raceLength
8 years ago
zwu18 1d95004811 Merge branch 'master' into story_speedometer
8 years ago
zwu18 e53d7d894b Warning sound added. Sound synced with visual display. #story[1292]
8 years ago
fjc40 76dff8009c Removed countdown timer from lobby screen.
8 years ago
Joseph Gardner f9f5cfef7d Chanegd next mark arrow to fit with new UI. #story[1299]
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
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 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
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
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
Joseph 4cf9b67db8 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
Joseph 91c442e465 Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299]
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
zwu18 051811b97d Merge branch 'master' into story_speedometer
8 years ago
zwu18 be9feff6fd Layout changes to speedometer UI. #story[1311]
8 years ago
zwu18 eea394372f Race is now showing a speedometer in the bottom right corner. Next step is to update with speed of boat and improve appearance. #story[1311]
8 years ago
hba56 731be68831 test for a minimap
8 years ago
fjc40 eb2ed45ed2 Merge branch 'master' into spectate_mode_basic
8 years ago