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

126 Commits (2f6fa733492bfef67a84983555de4f0310c68b8b)

Author SHA1 Message Date
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
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
Fan-Wu Yang d599df3901 Merge branch 'master' into raceLength
8 years ago
zwu18 1d95004811 Merge branch 'master' into story_speedometer
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
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
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
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
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
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
hba56 083eb5a4bc updated race view that does not use a split pane
8 years ago
hba56 87f3265640 pushed branch
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
David Wu 202c8d80c8 Minor fxml adjustments.
8 years ago
David Wu 7cea1fb11c Reworking fxml for lobby.
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
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189]
8 years ago