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

815 Commits (35b5228cc6ad64f448fca241b95d4a0c9f9e460c)

Author SHA1 Message Date
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
hba56 4242d05279 fixed issue with being unable to click through minimap
8 years ago
Joseph 2cf0cca157 Can no longer click around the boat highlighting. #fix #story[1298]
8 years ago
Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp
8 years ago
David Wu eee0b414f8 made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
8 years ago
Connor Taylor-Brown 6c78e5d0b5 Tomato now depletes as expected
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
Fan-Wu Yang c9177da85c Deleted another dead line #story[1297]
8 years ago
Fan-Wu Yang ed11f7d56c forgot to removed a dead line #story[1297]
8 years ago
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297]
8 years ago
Connor Taylor-Brown 10008f5452 Depleting tomato now watches player health
8 years ago
hba56 add1d3996d Set map colour back to a lighter colour as it didnt work as well on lower grade monitors
8 years ago
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
hba56 b787b5a71b changed map to dodgerblue
8 years ago
hba56 afc42cf2ab lowered opacity
8 years ago
Fan-Wu Yang 1ffef51d7c Changed local ip detection to use regex
8 years ago
hba56 50125e0151 moved minimap to left so does not overlap with speedo
8 years ago
Fan-Wu Yang ffa1d8b0c4 Deleted Print Statement
8 years ago
Fan-Wu Yang 52271d580f CHanged ip to local ip because port forwarding may be subjective to change.
8 years ago
Fan-Wu Yang 3d292f784b Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby.
8 years ago
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato
8 years ago
Fan-Wu Yang fec421da00 Removed println messages
8 years ago
Fan-Wu Yang 30087ed9bd Merge branch 'master' into newHostServer
8 years ago
Fan-Wu Yang 3c9e520d9f Merged in null pointer issue.
8 years ago
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery.
8 years ago
Connor Taylor-Brown 23040ecff4 Created separate listeners for all boats' and player boat health
8 years ago
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
Connor Taylor-Brown 0d89574c1f RaceViewController listens to health changes on the local player's boat
8 years ago
Connor Taylor-Brown 7eb59cdcfc Allowed fractional health deductions per frame
8 years ago
Connor Taylor-Brown 50d5dd02a2 BoatState message can be received from mock by visualiser
8 years ago
Connor Taylor-Brown a295728e89 Created encoder and decoder for BoatState messages (HP packets)
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 051811b97d Merge branch 'master' into story_speedometer
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 cfdbf5896f Added basic highlighting to player boat. #story[1298]
8 years ago
Joseph Gardner 3ca62e6c2b Added basic highlighting to player boat. #story[1298]
8 years ago
fjc40 db27d673de Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.
8 years ago
hba56 d3f1e3baa4 Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
Fan-Wu Yang 928f5e31f0 Hopefully final version of Hosting #story[1188]
8 years ago
Fan-Wu Yang f7da497743 Resizing maps to time taking now works #story[1323]
8 years ago
fjc40 424cd63c59 Should fix the race xml issues where boats get unassigned sometimes.
8 years ago
fjc40 acd99f58cd Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
hba56 f3f60acac6 resize map
8 years ago
hba56 731be68831 test for a minimap
8 years ago
Fan-Wu Yang 9d1145b298 Changed back to CI IP to test on CI
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 eacbe8d8ea Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
Fan-Wu Yang 0348b0c642 Merged in master
8 years ago
Fan-Wu Yang c91c4e5d7c Merge branch 'master' into network_on_VPS
8 years ago
Fan-Wu Yang 4970f52c3a Merge remote-tracking branch 'origin/master' into network_on_VPS
8 years ago
Fan-Wu Yang 34a803f92e More changes
8 years ago
Fan-Wu Yang 22e9db473e Removed test that took a manditory socket
8 years ago
fjc40 2c92102b2a Changed GraphCoordinate to use double instead of int.
8 years ago
fjc40 191f249bfb Speed scale is 2, rather than 10.
8 years ago
fjc40 5c58ca11ff Boats use their assigned color.
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 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 8d9624db96 Recovered sails smoothing
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
David Wu e345ecdec1 Removed sout statements.
8 years ago
Joseph Gardner f794aec4c8 boundaries are annotations.
8 years ago
Joseph Gardner 7fa2037753 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Fan-Wu Yang 2383915c78 Merged #story[1195]
8 years ago
Joseph Gardner c42e25df86 Merge branch 'master' into storyD-3D
8 years ago
Joseph Gardner 55713f14a1 Merge branch 'master' into storyD-3D
8 years ago
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #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 86de4e7c0c Merge remote-tracking branch 'origin/master'
8 years ago
hba56 004aebceb5 fix null pointer when playing tutorial
8 years ago
cbt24 02b4146fa3 Amended collision effect radius
8 years ago
David Wu 43ee92fb95 Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197]
8 years ago
cbt24 7d58b05e38 Fixed collision not fading to zero
8 years ago
cbt24 cdc7b642db Boat now shows a fading collision effect
8 years ago
Fan-Wu Yang f541a13235 Tried to get lobby working #story[1188]
8 years ago
Joseph Gardner 1166c0a4fb Merged sounds. #story[1196]
8 years ago
fjc40 43a1fbcb64 Spectate mode can be selected by clients when they join a game.
8 years ago
David Wu 550180f286 Removed countdown pane.
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
hba56 083eb5a4bc updated race view that does not use a split pane
8 years ago
fjc40 b59d36f4e5 Actually fixed the wind arrow direction.
8 years ago
fjc40 afd923c9fb Revert "Appears to fix wind arrow direction."
8 years ago
hba56 87f3265640 pushed branch
8 years ago
Connor Taylor-Brown f2370485a0 RaceController can now set up collision listeners on each boat.
8 years ago
fjc40 e0278fdb85 Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5
8 years ago
fjc40 8e6a720558 Appears to fix wind arrow direction.
8 years ago
Connor Taylor-Brown e354320d74 Replaced camera tracking listeners with animation timer
8 years ago
Connor Taylor-Brown b8c4582d2a Replaced mark arrow listener with animation timer.
8 years ago
Joseph Gardner a6eea88524 Fixed collisions #fix #story[1196]
8 years ago
hba56 81a04c987b Changed the ip of the matchbrowser to that of the CI.
8 years ago
Fan-Wu Yang 92500e13ee Added in windangle for rotated map as it had been lost through merge. #story[1188]
8 years ago
Fan-Wu Yang 1b946b6807 Removed/commented out unecessary print messages #story[1188]
8 years ago
hba56 4c52673fc1 javadoc fixes
8 years ago
hba56 e4dbebfcac Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 fd120edaf9 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
cbt24 de9f4e22eb Direction to mark arrow is now displayed relative to camera
8 years ago
Fan-Wu Yang 7b97e93d3a Merge branch 'merge_fix_story51'
8 years ago
Connor Taylor-Brown 5f96526fcc Added "arrow" pointing to next mark on third person view
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
Joseph Gardner 0944e5729a Dimmed the ambient light and specular light. #story[1261]
8 years ago
hba56 00780e17e9 Merge remote-tracking branch 'remotes/origin/temp77' into story77
8 years ago
David Wu 8cc4d7741c Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188]
8 years ago
hba56 aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77
8 years ago
Fan-Wu Yang 1cbb24e9fd Merged in master #story[1185]
8 years ago
Fan-Wu Yang 3760a43cfc Merge branch 'master' into HEAD
8 years ago
fjc40 b655b3e233 Fixed merge bug, and an unrelated null pointer exception.
8 years ago
Connor Taylor-Brown e657a0cc99 Added tracking for angle between third person boat and next mark
8 years ago
fjc40 6761778dd4 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
David Wu 06bd637460 Added documentation. #story[1188]
8 years ago
David Wu 490aab3f8d Changes made to pre-race countdown. #story[1188]
8 years ago
Fan-Wu Yang e87173ee39 Fixed Tutorial not being able to run #story[1185]
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 f926355d1c Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu 89ce8a7cc0 Pre-race countdown implementation.
8 years ago
hba56 731c0b0e61 send out to every client fix
8 years ago
fjc40 d29a47ec23 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Connor Taylor-Brown 83e696b79e Committed merge-related bug fixes
8 years ago
Connor Taylor-Brown 70bbc89239 Fixed merge-related bugs
8 years ago
fjc40 070654a95c Javadoc fix.
8 years ago
David Wu c750b806e0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
fjc40 2ad947b57d The start time of the race is no longer scaled by the race speed scalar.
8 years ago
hba56 2c06a46ad2 send out to every client fix
8 years ago
David Wu 202c8d80c8 Minor fxml adjustments.
8 years ago
David Wu 42a5d8ddc4 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
hba56 5fb24307ec send out to every client fix
8 years ago
Joseph 0b3ef992bc Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Joseph 253a16a664 Made the sky box use sky box planes they cannot be scaled. #story[1261]
8 years ago
Connor Taylor-Brown 0f846f31c3 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Connor Taylor-Brown 963c8a43ad Boats and marks are sized realistically in 3rd person
8 years ago
David Wu 7cea1fb11c Reworking fxml for lobby.
8 years ago
fjc40 ab96884dc6 Javadoc.
8 years ago
hba56 4adcd6322c send out to every client
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Joseph 771068966e Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
fjc40 2a6085c9e8 Test fix.
8 years ago
fjc40 a1684a410c Javadoc.
8 years ago
fjc40 9fa1b9ee67 Re-enabled source id allocator check.
8 years ago
fjc40 3fa6b9200d Finished MarkRoundingSequence class. Added MarkRoundingData class.
8 years ago
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196]
8 years ago
hba56 4dcff5c009 SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby
8 years ago
Fan-Wu Yang 3301798411 Fixed boats not rotating in lobby #story[1188]
8 years ago
Joseph Gardner bcc827b554 Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
8 years ago
Connor Taylor-Brown bae428fb3f Recovered a private method used in a test
8 years ago
Connor Taylor-Brown c94e0af69c Removed remaining println statements
8 years ago
Connor Taylor-Brown 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
zwu18 b6c340614f Tutorial text disabled on actual races. #story[1261]
8 years ago
Jessica Syder 625eb62af2 Wrapped the tutorial text on the title fxml.
8 years ago
Jessica Syder b808056567 Host boat isnt disappearing anymore (I think).
8 years ago
Jessica Syder e664619a81 Tutorial is played with tutorial map.
8 years ago
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-)
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Connor Taylor-Brown 59bd22c2aa Fixed mark rounding
8 years ago
Connor Taylor-Brown 0f316afb3c Added colour indication to next mark
8 years ago
Joseph 7a8ea7fea7 Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
Connor Taylor-Brown b902b05e5e Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)
8 years ago
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Jessica Syder 0cb008cef7 Removed a couple of old canvas lines.
8 years ago
Jessica Syder 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189]
8 years ago
zwu18 fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
8 years ago
Fan-Wu Yang 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]
8 years ago
Connor Taylor-Brown 5e35cd4195 Removed empty java files
8 years ago
Fan-Wu Yang 54a9140f31 lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188]
8 years ago
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 108643b59d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby.
8 years ago
Joseph Gardner 0da6931f8f Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
Fan-Wu Yang d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188]
8 years ago
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu c97706d86e Merge branch 'master' into story70
8 years ago
fjc40 346aa148ef Added some debug statements, and WIP MarkRoundingSequence class.
8 years ago
Fan-Wu Yang ae75bb86d3 Resized models to a similar size of the collision detectors. #story[1261]
8 years ago
Fan-Wu Yang 08ca42f786 Wrote some missing java docs #story[1261]
8 years ago
Fan-Wu Yang 9ac9c25923 Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]
8 years ago
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
David Wu 9a96131a33 Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]
8 years ago
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
8 years ago
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
Fan-Wu Yang a7eefca13a Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]
8 years ago