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

35 Commits (d4c355fcb55dc5b1a0365e7c7c1467ba5b57b7c4)

Author SHA1 Message Date
Joseph Gardner 851b8aa7a8 Merge branch 'master' into nightmode
8 years ago
Joseph Gardner 685b508f1e Merge branch 'tom' into nightmode
8 years ago
Jessica Syder 35b5228cc6 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
8 years ago
Joseph Gardner 4f681ced4e Sailer tom 8)
8 years ago
hba56 817b71339d updated images to show the arrows better aganst the wood
8 years ago
Jessica Syder 7230cdf2a3 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
8 years ago
Jessica Syder edb0e1db2f Transparent maps.
8 years ago
Joseph Gardner fa4a2b28d2 Merge remote-tracking branch 'origin/raceView_UI' into nightmode
8 years ago
Joseph Gardner a2d605fd5b Added nightmode skybox. Changed how next mark arrow works.
8 years ago
hba56 58cde8ce44 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
Jessica Syder 9bb0fa6833 Arrows, Buttons and Title styling added to map selection.
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 569204b771 New skin for 2d next mark arrow. #story[1299]
8 years ago
zwu18 f4001e0ae3 Added visual display when boat dies. Added sound when boat dies. #story[1311]
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
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 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
Connor Taylor-Brown 70bbc89239 Fixed merge-related bugs
8 years ago
Joseph 771068966e Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193]
8 years ago
zwu18 64ed1f9aa6 Improved map layout image. #story[1193]
8 years ago
David Wu 002cccd5a0 Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
hba56 cbfcd3aa0d Images
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
Jessica Syder 0558629dc6 Added luffing sails image.
8 years ago
zwu18 a31eb078a6 Created a splash screen for application.
8 years ago
Jessica Syder 7c5670f8c2 Sails are displayed on first boat in a race. Optimised imports.
8 years ago
hba56 684611a52c added a background to the water so it is not just white
9 years ago
hba56 956ad1f59b merged in the changes from the sprint5_refactor branch
9 years ago