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

839 Commits (0b718f4f57fb66a4532153414f98b16a55fa59fe)

Author SHA1 Message Date
Fan-Wu Yang 3c15cf9d02 Fixed up sharks size and spinning speed
8 years ago
Fan-Wu Yang 3d605db924 Seagulls are spawnable and have semi-random motion, no sounds yets
8 years ago
Fan-Wu Yang 98240532f0 Sharks are now seeable
8 years ago
Fan-Wu Yang c582a66f9a Added new Highlight
8 years ago
Fan-Wu Yang 63fbffdbc1 lots of trying seagull stuff but translate y doesn't want to work for some stupid reason.
8 years ago
zwu18 ca5b344181 Visual improvements made to tomato health bar. #story[1301]
8 years ago
Fan-Wu Yang b48b83ab8e single mark rounding arrow now works
8 years ago
Joseph e434af0728 fixed boat collisions. Increased boat collision radius 15 -> 50
8 years ago
Fan-Wu Yang 1b6197e0ac removed some files for seng teams sanity sake and moved the seasurface down a bit.
8 years ago
Fan-Wu Yang 8a6997f29b Merge branch 'master' into new_3d_assets
8 years ago
Fan-Wu Yang c1422d9a98 Changed Sea Surface to new Sea Surface and optimised some assets to load at the beginning
8 years ago
fjc40 e8886d70de Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary
8 years ago
fjc40 5d9b574378 Zooming in while in birds eye no longer clips through sea surface.
8 years ago
Connor Taylor-Brown 7e1f6284cc Gave screen and minimap backgrounds uniform colours
8 years ago
Connor Taylor-Brown 246d6bcc71 CSS now works on startup
8 years ago
zwu18 20ae978664 Merge branch 'story1301-start' into custom_buttons
8 years ago
hba56 a8cd7755b8 color fix for multiple boats
8 years ago
Connor Taylor-Brown f2a0f56cf0 Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary
8 years ago
Connor Taylor-Brown 4415a501be Merge remote-tracking branch 'remotes/origin/minimap_crash_first_leg' into ac35_map_boundary
8 years ago
Jessica Syder 9bb0fa6833 Arrows, Buttons and Title styling added to map selection.
8 years ago
hba56 1783e73caf color fix for first leg
8 years ago
Jessica Syder 0659bc64c8 Arrows, Buttons and Title styling added to map selection.
8 years ago
Connor Taylor-Brown 315bb64bb3 Boat on start screen now follows infinite loop
8 years ago
zwu18 95465285f4 Created custom buttons. #story[1301]
8 years ago
fjc40 c7f59b73d5 Expanded the boundary for ac35MapLayout.xml slightly.
8 years ago
fjc40 e77208aea1 MarkRoundingSequence now stores data using the leg number, rather than the leg object itself. This was an issue as leg objects would be recreated when race xml files are received.
8 years ago
fjc40 abfa3ea863 Race now uses a 1 for timescale, which effectively disables time/speed scaling.
8 years ago
fjc40 3e04ed12ad Removed raceSinglePlayer.xml and raceThreePlayers.xml as they are identical to raceSixPlayers.xml.
8 years ago
fjc40 5ea4200e67 Some javadoc warning fixes.
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 7ac181f33d Fixed null pointer when race finishes #story[1299]
8 years ago
Joseph Gardner 13f3f595d2 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
Joseph Gardner 08c097f153 Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
8 years ago
Joseph Gardner 6e913d6c45 Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
8 years ago
Connor Taylor-Brown 73bffb35e3 Removed stutter
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
Connor Taylor-Brown d6b0fec6d3 Start race in third person by default
8 years ago
David Wu 48e7b6970c Merged master in. Added documentation. #story[1292]
8 years ago
David Wu 3adc5330b4 Merge branch 'master' into story1292_hp_punish
8 years ago
Joseph Gardner 26e2035ea2 Changed 3d arrow to point downwards #story[1299]
8 years ago
Fan-Wu Yang 8120b1bbab Upgraded marks and how to look rounded #story[1299]
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 699df2e775 Using new arrow / arrow textures. Made sails not clickable.
8 years ago
zwu18 1b8fa59f0e Having 0 hp now removes the boat from being an active boat. #story[1292]
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 ba82328c42 Removed souts for speedometer. #story[1311]
8 years ago
zwu18 f4001e0ae3 Added visual display when boat dies. Added sound when boat dies. #story[1311]
8 years ago
Fan-Wu Yang 1ca276ec62 Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323]
8 years ago
Fan-Wu Yang d6884a6981 Deprecated a method that shouldn't be used but is still being used, and merged in most recent master #story[1323]
8 years ago
Fan-Wu Yang d599df3901 Merge branch 'master' into raceLength
8 years ago
Fan-Wu Yang a33583d67d Fixed racescaling a mark twice and removed println statements #story[1323]
8 years ago
zwu18 11d6d3a880 Documentation added. Master merged. #story[1311]
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
Fan-Wu Yang 967bdb394f Merged in master and realigned center of the boat #story[1306]
8 years ago
Fan-Wu Yang cd99492467 Merge branch 'master' into story1306_wind_arrow
8 years ago
Joseph 3f04485b78 Added manual connections works while also receiving available games from the server. #story[1352]
8 years ago
Joseph 5ebee27baa Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix
8 years ago
Fan-Wu Yang 980d1d7977 Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails
8 years ago
Fan-Wu Yang a14307a6bf Merge branch 'master' into story1297_sails
8 years ago
fjc40 76dff8009c Removed countdown timer from lobby screen.
8 years ago
fjc40 9763150e85 Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
Fan-Wu Yang 9da0d238c2 Removed printlns ready for DoD
8 years ago
Joseph Gardner 44268cc30b Fixed not being able to add custom connections. Still need to test if it works with the http match browser (can't test it atm. #story[1352]
8 years ago
Fan-Wu Yang 6cfb076fef Merge branch 'master' into story1297_sails
8 years ago
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
Joseph Gardner 7d789c04bb Fixed sails out / colliding issue. #story[1297]
8 years ago
Joseph Gardner 332722e099 Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]
8 years ago
Joseph Gardner f9f5cfef7d Chanegd next mark arrow to fit with new UI. #story[1299]
8 years ago
Jessica Syder 915d61b9f3 Map can be zoomed out in birds eye view only to a specified distance.
8 years ago
Jessica Syder ab49d62c0d Map can be zoomed in / out at all times.
8 years ago
Joseph Gardner 327c052b1d Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
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
Jessica Syder e64e6ddbdb Boat scaling is correct.
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
Connor Taylor-Brown 4f229ad01c Implemented basic 3D start screen with no background race
8 years ago
Connor Taylor-Brown 51413257b2 Modified title screen to use View3D with skybox and ambient lighting
8 years ago
Jessica Syder f1c1fc7063 Race length is affected by slider value.
8 years ago
David Wu 45b2f0b6db Created more fire instances. #story[1292]
8 years ago
fjc40 46192af628 Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
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
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 c527ad0c52 Forgot to add image file. #story[1292]
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