Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 5eeb65ad41 Merge branch 'raceLength' into 'master' Joseph Gardner 2017-09-27 12:47:32 +13:00
• 08c097f153 Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction Joseph Gardner 2017-09-27 12:38:40 +13:00
• 6e913d6c45 Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction Joseph Gardner 2017-09-27 12:38:29 +13:00
• 73bffb35e3 Removed stutter Connor Taylor-Brown 2017-09-27 12:15:13 +13:00
• ea1170a48e Merge remote-tracking branch 'origin/master' into raceLength Joseph Gardner 2017-09-27 12:05:09 +13:00
• 173b4444da Placed the wind arrow in the HUD #story[1306] hba56 2017-09-27 12:04:56 +13:00
• fc267a6a49 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI hba56 2017-09-27 12:04:03 +13:00
• d6b0fec6d3 Start race in third person by default - Third person zoom limit has been lowered - Next mark highlighting and arrow only follows player boat Connor Taylor-Brown 2017-09-27 12:02:56 +13:00
• 48e7b6970c Merged master in. Added documentation. #story[1292] David Wu 2017-09-27 11:59:54 +13:00
• 3adc5330b4 Merge branch 'master' into story1292_hp_punish David Wu 2017-09-27 11:48:06 +13:00
• 26e2035ea2 Changed 3d arrow to point downwards #story[1299] Joseph Gardner 2017-09-27 11:39:12 +13:00
• 8120b1bbab Upgraded marks and how to look rounded #story[1299] Fan-Wu Yang 2017-09-27 02:20:29 +13:00
• 416eb1e6bf On death a menu will pop up telling the user he is dead. #story[1292] zwu18 2017-09-27 01:09:03 +13:00
• 569204b771 New skin for 2d next mark arrow. #story[1299] Joseph 2017-09-27 00:36:05 +13:00
• 699df2e775 Using new arrow / arrow textures. Made sails not clickable. Joseph 2017-09-26 18:30:29 +13:00
• 1b8fa59f0e Having 0 hp now removes the boat from being an active boat. #story[1292] zwu18 2017-09-26 18:20:11 +13:00
• affbb69029 Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction Joseph 2017-09-26 17:54:49 +13:00
• d86d043992 Merge branch 'master' into story1299_next_mark_direction Joseph 2017-09-26 17:53:46 +13:00
• 666e9d0ad9 Merge branch 'story_speedometer' into 'master' Connor Taylor Brown 2017-09-26 17:10:55 +13:00
• ba82328c42 Removed souts for speedometer. #story[1311] zwu18 2017-09-26 17:09:00 +13:00
• f4001e0ae3 Added visual display when boat dies. Added sound when boat dies. #story[1311] zwu18 2017-09-26 17:05:22 +13:00
• 1ca276ec62 Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323] Fan-Wu Yang 2017-09-26 16:48:23 +13:00
• d6884a6981 Deprecated a method that shouldn't be used but is still being used, and merged in most recent master #story[1323] Fan-Wu Yang 2017-09-26 16:41:31 +13:00
• d599df3901 Merge branch 'master' into raceLength Fan-Wu Yang 2017-09-26 16:40:03 +13:00
• a33583d67d Fixed racescaling a mark twice and removed println statements #story[1323] Fan-Wu Yang 2017-09-26 16:38:03 +13:00
• 11d6d3a880 Documentation added. Master merged. #story[1311] zwu18 2017-09-26 16:20:48 +13:00
• 1d95004811 Merge branch 'master' into story_speedometer zwu18 2017-09-26 16:11:14 +13:00
• e53d7d894b Warning sound added. Sound synced with visual display. #story[1292] zwu18 2017-09-26 16:03:35 +13:00
• 5ed1bc1737 Merge branch 'story1306_wind_arrow' into 'master' Hamish Ball 2017-09-26 15:46:37 +13:00
• 967bdb394f Merged in master and realigned center of the boat #story[1306] Fan-Wu Yang 2017-09-26 15:21:30 +13:00
• cd99492467 Merge branch 'master' into story1306_wind_arrow Fan-Wu Yang 2017-09-26 15:04:02 +13:00
• 7d3ec940eb Merge branch 'story1297_sails' into 'master' Jessica Syder 2017-09-26 14:43:18 +13:00
• 3f04485b78 Added manual connections works while also receiving available games from the server. #story[1352] Joseph 2017-09-26 13:16:09 +13:00
• 5ebee27baa Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix Joseph 2017-09-26 13:11:39 +13:00
• 980d1d7977 Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails Fan-Wu Yang 2017-09-26 00:24:05 +13:00
• a14307a6bf Merge branch 'master' into story1297_sails Fan-Wu Yang 2017-09-26 00:23:38 +13:00
• 13e0b4bd5c Merge branch 'game_start_button_1352' into 'master' David Wu 2017-09-25 23:53:03 +13:00
• 76dff8009c Removed countdown timer from lobby screen. fjc40 2017-09-25 23:48:00 +13:00
• 9763150e85 Merge remote-tracking branch 'origin/master' into game_start_button_1352 fjc40 2017-09-25 22:39:29 +13:00
• 3007fe1ee5 Everyone has a single email address according to mailmap Connor Taylor-Brown 2017-09-25 16:57:13 +13:00
• 8e4f7e8b04 Fixed mailmap Connor Taylor-Brown 2017-09-25 16:45:15 +13:00
• 9da0d238c2 Removed printlns ready for DoD Fan-Wu Yang 2017-09-25 15:33:33 +13:00
• 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] Joseph Gardner 2017-09-25 15:30:49 +13:00
• 6cfb076fef Merge branch 'master' into story1297_sails Fan-Wu Yang 2017-09-25 15:30:18 +13:00
• a1b6de5638 Merge branch 'master' into story1306_wind_arrow Fan-Wu Yang 2017-09-25 15:29:04 +13:00
• eca921cb11 Removed println's ready for DoD Fan-Wu Yang 2017-09-25 15:28:37 +13:00
• 7d789c04bb Fixed sails out / colliding issue. #story[1297] Joseph Gardner 2017-09-25 14:07:29 +13:00
• 332722e099 Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297] Joseph Gardner 2017-09-25 13:48:03 +13:00
• f9f5cfef7d Chanegd next mark arrow to fit with new UI. #story[1299] Joseph Gardner 2017-09-25 13:11:09 +13:00
• 5a1dbc83b5 Merge branch 'zoomzoom' into 'master' Fan-Wu Yang 2017-09-25 12:37:50 +13:00
• 915d61b9f3 Map can be zoomed out in birds eye view only to a specified distance. Jessica Syder 2017-09-25 12:35:46 +13:00
• ab49d62c0d Map can be zoomed in / out at all times. Jessica Syder 2017-09-25 12:17:37 +13:00
• 34789ce3b5 mailmap hba56 2017-09-25 12:15:41 +13:00
• 327c052b1d Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction Joseph Gardner 2017-09-25 12:15:10 +13:00
• 9212ec91f0 mailmap Joseph Gardner 2017-09-25 11:58:42 +13:00
• 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. fjc40 2017-09-25 11:56:55 +13:00
• e64e6ddbdb Boat scaling is correct. Jessica Syder 2017-09-25 11:41:42 +13:00
• 6d55168c61 Added Textures to boats as well as added texture to arrow #story[1306] Fan-Wu Yang 2017-09-25 03:31:38 +13:00
• 45ba3ae6ac Added 3D wind arrow and it also rotates #story[1306] Fan-Wu Yang 2017-09-25 02:35:52 +13:00
• 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] David Wu 2017-09-25 02:15:09 +13:00
• d280c0bdae Merged master and added a few comments Fan-Wu Yang 2017-09-25 01:44:31 +13:00
• 12b7d10f24 Merge branch 'master' into story1297_sails Fan-Wu Yang 2017-09-25 01:43:23 +13:00
• 4f229ad01c Implemented basic 3D start screen with no background race Connor Taylor-Brown 2017-09-25 00:56:21 +13:00
• 51413257b2 Modified title screen to use View3D with skybox and ambient lighting Connor Taylor-Brown 2017-09-25 00:23:46 +13:00
• f1c1fc7063 Race length is affected by slider value. Jessica Syder 2017-09-24 22:56:14 +13:00
• 45b2f0b6db Created more fire instances. #story[1292] David Wu 2017-09-24 22:50:12 +13:00
• 46192af628 Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes). The start button (visible to host) starts the race in whatever the prepatory time is. #story[1352] fjc40 2017-09-24 22:15:11 +13:00
• 1070842ada Fire is now rotated and standing up-write. Found problem with fire not being directly on the boat. #story[1292] David Wu 2017-09-24 22:05:37 +13:00
• 4f838a3598 Fire follows boat. TODO: rotate fire. #story[1292] David Wu 2017-09-24 21:37:15 +13:00
• da901d6e0c Merge remote-tracking branch 'origin/master' into game_start_button_1352 fjc40 2017-09-24 20:01:15 +13:00
• 612b4b455e Added start button for host on the ingameLobby screen. #story[1352] fjc40 2017-09-24 19:59:56 +13:00
• c527ad0c52 Forgot to add image file. #story[1292] David Wu 2017-09-24 18:58:49 +13:00
• 45eb557256 Displaying visual effect with imageview. #story[1292] David Wu 2017-09-24 18:58:19 +13:00
• 819cdc49ab Created a slider on the Host Game screen. Jessica Syder 2017-09-24 17:59:36 +13:00
• bf6282c697 3D arrow added for zoomed view. Shows relative direction to mark. #story[1299] Joseph 2017-09-24 17:28:13 +13:00
• 088e73414b Fixed small bug where the sail never stopps jittering after moving #story[1297] Fan-Wu Yang 2017-09-24 00:36:35 +12:00
• 2b8ca9265f Sails now slowly spin to the correct position #story[1297] Fan-Wu Yang 2017-09-23 23:36:21 +12:00
• ff59f7ff9c Added a new hud for the race view #story[1301] hba56 2017-09-23 22:38:27 +12:00
• bb24e13387 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI hba56 2017-09-23 22:35:22 +12:00
• 7418f7b4e6 adding new assets for race view hud #story[1301] hba56 2017-09-23 18:58:54 +12:00
• c43633f197 Merge branch 'master' into raceView_UI hba56 2017-09-23 18:37:12 +12:00
• 67779eb9ad Same changes to dev. #story[1311] zwu18 2017-09-23 00:38:33 +12:00
• 64ae01113a Added delay for position update. This fixes fps issue. #story[1311] zwu18 2017-09-22 22:15:28 +12:00
• d3a6b82031 Commit before checking out developement Fan-Wu Yang 2017-09-22 21:39:48 +12:00
• 1946bfd658 Added audio indication when the user boat is low on hp. Audio rate changes when hp is critically low. #story[1292] zwu18 2017-09-22 21:19:35 +12:00
• 908f31bcde Merge branches 'master' and 'zoomzoom' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom Jessica Syder 2017-09-22 20:54:02 +12:00
• 0b02727bf1 Set limits and more appearance changes for speedometer. #story[1311] zwu18 2017-09-22 20:33:56 +12:00
• 49c08f5687 Merge branch 'story1298_boat_highlight' into 'master' Connor Taylor Brown 2017-09-22 20:22:18 +12:00
• 86fc911f98 Minor changes to improve look of third person view. Jessica Syder 2017-09-22 13:32:52 +12:00
• 62535720d4 Removed commented out code. Jessica Syder 2017-09-22 13:04:42 +12:00
• fa6543a713 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom Jessica Syder 2017-09-22 13:00:12 +12:00
• 1ecd2dd7b6 Zooming motion is more natural. Jessica Syder 2017-09-22 12:59:44 +12:00
• e2ea6a5f03 Fixed issue with speedometer and sails interaction. #story[1311] zwu18 2017-09-22 02:40:54 +12:00
• 1b4b980081 Exponentially decrease speed as boat loses health - Boat halves in speed after 90% health loss Connor Taylor-Brown 2017-09-22 00:49:36 +12:00
• 16da9e009b Cherry-picked FXML changes from Development Connor Taylor-Brown 2017-09-22 00:21:56 +12:00
• 985f784066 Removed broken stuff from FXML after merge Connor Taylor-Brown 2017-09-21 23:41:18 +12:00
• dc9445a8a6 Merge branch 'master' into story1291-hp Connor Taylor-Brown 2017-09-21 23:40:46 +12:00
• 4cf9b67db8 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction Joseph 2017-09-21 22:44:30 +12:00
• 322d7b38b6 Merge remote-tracking branch 'origin/master' into story1298_boat_highlight Joseph 2017-09-21 22:33:31 +12:00
• b1657e8bfc Merge branch 'minimap_test' into 'master' Joseph Gardner 2017-09-21 22:27:57 +12:00