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 'a0e851832a'
${ noResults }
Commit Graph

118 Commits (a0e851832a0f82dee4c015295281f98dbf963161)

Author SHA1 Message Date
Fan-Wu Yang a1b6de5638 Merge branch 'master' into story1306_wind_arrow
8 years ago
Fan-Wu Yang eca921cb11 Removed println's ready for DoD
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
David Wu 45b2f0b6db Created more fire instances. #story[1292]
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
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
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 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 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 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 91c442e465 Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299]
8 years ago
Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp
8 years ago
Fan-Wu Yang cf9acabd97 Boat sails now luff and stay when in the direction of the wind #story[1297]
8 years ago
Connor Taylor-Brown 10008f5452 Depleting tomato now watches player health
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
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato
8 years ago
Connor Taylor-Brown 23040ecff4 Created separate listeners for all boats' and player boat health
8 years ago
Connor Taylor-Brown 0d89574c1f RaceViewController listens to health changes on the local player's boat
8 years ago
hba56 f7d866144a Map now only shows annotations when in full screen
8 years ago
zwu18 4132b6733b Fixed small display error with current position. #story[1311]
8 years ago
zwu18 be9feff6fd Layout changes to speedometer UI. #story[1311]
8 years ago
zwu18 201b9f0051 Linked users boat speed up with 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
Joseph Gardner a82d3081fc Replace the class use of highlight with shockwave. #story[1298]
8 years ago
Joseph Gardner 9fbd5df626 Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]
8 years ago
Joseph Gardner 3ca62e6c2b Added basic highlighting to player boat. #story[1298]
8 years ago
hba56 f3f60acac6 resize map
8 years ago
hba56 731be68831 test for a minimap
8 years ago
fjc40 75c15d492e There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
8 years ago
fjc40 5c58ca11ff Boats use their assigned color.
8 years ago
hba56 3131d67cf2 Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
fjc40 ae9594f8c3 Removed a println and fixed some javadoc warnings.
8 years ago
fjc40 47d013612a Fix for null pointer exception when finishing race.
8 years ago
hba56 88f1a393f2 Made the info tab into an overlay
8 years ago
fjc40 24b068f249 Collision effect uses color.transparent instead of a custom transparent color.
8 years ago
fjc40 536428ce16 There was a null pointer exception related to going into/leaving third person camera and the arrow annotation.
8 years ago
fjc40 f308f5b8f3 Visualiser model thread was updating GUI instead of fx thread.
8 years ago
Connor Taylor-Brown 90c258e9e9 Reset collision tag on visualiser boat after displaying collision
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
Joseph Gardner 7bea2fee73 Merge branch 'storyA_sounds' into storyD-3D
8 years ago
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D
8 years ago
hba56 083eb5a4bc updated race view that does not use a split pane
8 years ago
hba56 aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77
8 years ago
hba56 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago