Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• a0e851832a Change title. main zwu18 2017-10-12 23:53:03 +13:00
• d75415a260 Merge branch 'new_finish_view' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into new_finish_view zwu18 2017-10-12 23:51:08 +13:00
• 9b9c3dfdaa Fixed problem where non-host cannot return to main menu after finish. zwu18 2017-10-12 23:50:56 +13:00
• a4c0aeb4a5 Merge branch 'master' into new_finish_view Joseph Gardner 2017-10-12 11:56:30 +13:00
• 4d6de8bc9f Merge branch 'easter_eggs' into 'master' Hamish Ball 2017-10-12 11:54:59 +13:00
• 0b718f4f57 Created new splash screen. zwu18 2017-10-12 02:22:04 +13:00
• 8f12f42007 fix hwball 2017-10-09 12:31:14 +13:00
• 79d90f6ad5 Fixed match client Fan-Wu Yang 2017-10-09 03:01:10 +13:00
• 804d27e055 You can no longer zoom in on sharks Fan-Wu Yang 2017-10-09 02:51:41 +13:00
• 58470ab1fe Seagulls have their own voices when konami cheat code is done and fannypride replaces the tomato. Fan-Wu Yang 2017-10-09 02:04:05 +13:00
• 5fd5a3bd54 Improved finish display. zwu18 2017-10-09 01:31:22 +13:00
• 9c4a949166 Fixed merge issues Fan-Wu Yang 2017-09-28 16:47:13 +13:00
• d4c355fcb5 Merge branch 'master' into upgradeStartBoat Fan-Wu Yang 2017-09-28 16:41:17 +13:00
• e63f53ec9a Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 David Wu 2017-09-28 16:39:10 +13:00
• 3c58c3fc09 Assest are loaded in loading place Fan-Wu Yang 2017-09-28 16:38:12 +13:00
• 08e6f726cc Added 8 seagulls to the game Fan-Wu Yang 2017-09-28 16:36:06 +13:00
• adebe1df96 Merge remote-tracking branch 'origin/master' Connor Taylor-Brown 2017-09-28 16:35:24 +13:00
• df95e2b3b1 We fully legit gg no re Connor Taylor-Brown 2017-09-28 16:35:14 +13:00
• ec4fc9da24 Skybox no longer preloaded Joseph Gardner 2017-09-28 16:34:47 +13:00
• 767a65f649 Boat now used updated textures Fan-Wu Yang 2017-09-28 16:32:44 +13:00
• 8ed0bf09ca Merge branch 'master' into nightmode Joseph Gardner 2017-09-28 16:14:46 +13:00
• 4e352a7d49 Merge branch 'master' into story1301-ingamelobby David Wu 2017-09-28 16:02:22 +13:00
• 165c3e77ab Can swap skyboxes in title screen. Joseph Gardner 2017-09-28 15:59:52 +13:00
• 851b8aa7a8 Merge branch 'master' into nightmode Joseph Gardner 2017-09-28 15:43:49 +13:00
• 1645933a94 Start in a nicer zoom. Jessica Syder 2017-09-28 15:31:59 +13:00
• 68dfa2d27a Fixed case sensitivity problems #story[1301] Fan-Wu Yang 2017-09-28 15:30:32 +13:00
• 55de754164 Stuff Joseph Gardner 2017-09-28 15:05:35 +13:00
• 0aad5a1bd6 Missing button image and zoom limit changed. Jessica Syder 2017-09-28 15:00:05 +13:00
• 685b508f1e Merge branch 'tom' into nightmode Joseph Gardner 2017-09-28 14:58:53 +13:00
• 38bcc9fa66 Sailer tom 8) Joseph Gardner 2017-09-28 14:53:21 +13:00
• f46f9b9bf5 Merge master in Jessica Syder 2017-09-28 14:52:30 +13:00
• c0e00899ef Merge branch 'master' into tom Joseph Gardner 2017-09-28 14:51:54 +13:00
• 35b5228cc6 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select Jessica Syder 2017-09-28 14:43:35 +13:00
• bd0c0ac5ef Stylin' Jessica Syder 2017-09-28 14:43:14 +13:00
• 3956affa01 removed timescale, and merged master Fan-Wu Yang 2017-09-28 14:26:33 +13:00
• fbb9d0910b Merge branch 'master' into new_3d_assets Fan-Wu Yang 2017-09-28 14:26:08 +13:00
• 6003bdf771 Fixed issue where finishing boats order could be be changed Fan-Wu Yang 2017-09-28 14:23:09 +13:00
• 4f681ced4e Sailer tom 8) Joseph Gardner 2017-09-28 14:18:13 +13:00
• 1196e853bf Stylin' Jessica Syder 2017-09-28 13:49:42 +13:00
• 4ddc369dbc Changed Collisions, and merged master Fan-Wu Yang 2017-09-28 13:49:27 +13:00
• bab7749138 Merged master into branch. #story[1301] David Wu 2017-09-28 13:48:25 +13:00
• 817b71339d updated images to show the arrows better aganst the wood hba56 2017-09-28 13:43:06 +13:00
• 6ec75e6ed7 Merge branch 'master' into new_3d_assets Fan-Wu Yang 2017-09-28 13:42:58 +13:00
• 52da88b1a1 Merge branch 'master' into custom_buttons David Wu 2017-09-28 13:39:26 +13:00
• 76db768b76 Fix join button disappearing. #story[1301] David Wu 2017-09-28 13:20:25 +13:00
• 0bfe93da06 Merge branch 'master' into story1301-start Connor Taylor-Brown 2017-09-28 13:20:20 +13:00
• e90aeccdef Merge branch 'master' into story1301-start Connor Taylor-Brown 2017-09-28 13:08:25 +13:00
• 7230cdf2a3 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select Jessica Syder 2017-09-28 13:06:12 +13:00
• edb0e1db2f Transparent maps. Jessica Syder 2017-09-28 13:05:52 +13:00
• 3b4ff51bff Created race background for ingame lobby. #user[zwu18] #story[1301] Fan-Wu Yang 2017-09-28 12:51:08 +13:00
• 05d9eeae01 Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary hba56 2017-09-28 12:42:26 +13:00
• 6187b83524 Merge remote-tracking branch 'origin/ac35_map_boundary' into ac35_map_boundary hba56 2017-09-28 12:42:09 +13:00
• c2de45ce01 Merge remote-tracking branch 'remotes/origin/boat_collision_fix' into ac35_map_boundary hba56 2017-09-28 12:42:03 +13:00
• 9b30877b5a Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato hba56 2017-09-28 12:32:11 +13:00
• fa4a2b28d2 Merge remote-tracking branch 'origin/raceView_UI' into nightmode Joseph Gardner 2017-09-28 12:01:08 +13:00
• a2d605fd5b Added nightmode skybox. Changed how next mark arrow works. Joseph Gardner 2017-09-28 11:56:49 +13:00
• c08cbb01d6 removed println messages Fan-Wu Yang 2017-09-28 11:39:06 +13:00
• 0da840a37e Fixed toggling and application of style Connor Taylor-Brown 2017-09-28 11:38:19 +13:00
• 31bb289723 Added button images in Jessica Syder 2017-09-28 11:38:10 +13:00
• fb8f1640ac Merge remote-tracking branch 'remotes/origin/master' into raceView_UI hba56 2017-09-28 11:32:39 +13:00
• 58cde8ce44 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI hba56 2017-09-28 11:32:25 +13:00
• 88d5a60696 Merge branch 'master' into story1301-start Connor Taylor-Brown 2017-09-28 11:30:47 +13:00
• 3c15cf9d02 Fixed up sharks size and spinning speed Fan-Wu Yang 2017-09-28 11:29:53 +13:00
• 3d605db924 Seagulls are spawnable and have semi-random motion, no sounds yets Fan-Wu Yang 2017-09-28 09:59:59 +13:00
• 98240532f0 Sharks are now seeable Fan-Wu Yang 2017-09-28 07:31:47 +13:00
• c582a66f9a Added new Highlight Fan-Wu Yang 2017-09-28 06:58:40 +13:00
• 63fbffdbc1 lots of trying seagull stuff but translate y doesn't want to work for some stupid reason. Fan-Wu Yang 2017-09-28 06:43:44 +13:00
• ca5b344181 Visual improvements made to tomato health bar. #story[1301] zwu18 2017-09-28 03:54:07 +13:00
• b48b83ab8e single mark rounding arrow now works Fan-Wu Yang 2017-09-28 02:49:19 +13:00
• e434af0728 fixed boat collisions. Increased boat collision radius 15 -> 50 Joseph 2017-09-28 01:29:58 +13:00
• 1b6197e0ac removed some files for seng teams sanity sake and moved the seasurface down a bit. Fan-Wu Yang 2017-09-28 01:01:01 +13:00
• 8a6997f29b Merge branch 'master' into new_3d_assets Fan-Wu Yang 2017-09-28 00:57:06 +13:00
• c1422d9a98 Changed Sea Surface to new Sea Surface and optimised some assets to load at the beginning Fan-Wu Yang 2017-09-28 00:50:53 +13:00
• e8886d70de Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary fjc40 2017-09-28 00:50:43 +13:00
• 5d9b574378 Zooming in while in birds eye no longer clips through sea surface. Zooming with mouse wheel is the same speed as zooming with keyboard. fjc40 2017-09-27 23:40:00 +13:00
• 7e1f6284cc Gave screen and minimap backgrounds uniform colours Connor Taylor-Brown 2017-09-27 23:50:49 +13:00
• 246d6bcc71 CSS now works on startup Connor Taylor-Brown 2017-09-27 23:39:17 +13:00
• 20ae978664 Merge branch 'story1301-start' into custom_buttons zwu18 2017-09-27 22:57:10 +13:00
• a8cd7755b8 color fix for multiple boats #story[1306] hba56 2017-09-27 22:47:33 +13:00
• f2a0f56cf0 Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary Connor Taylor-Brown 2017-09-27 22:46:53 +13:00
• 4415a501be Merge remote-tracking branch 'remotes/origin/minimap_crash_first_leg' into ac35_map_boundary Connor Taylor-Brown 2017-09-27 22:46:31 +13:00
• 9bb0fa6833 Arrows, Buttons and Title styling added to map selection. Jessica Syder 2017-09-27 22:42:01 +13:00
• 1783e73caf color fix for first leg #story[1306] hba56 2017-09-27 22:39:47 +13:00
• 0659bc64c8 Arrows, Buttons and Title styling added to map selection. Jessica Syder 2017-09-27 22:38:24 +13:00
• 315bb64bb3 Boat on start screen now follows infinite loop - Removed non-resizable property on TitleController Connor Taylor-Brown 2017-09-27 22:37:15 +13:00
• 95465285f4 Created custom buttons. #story[1301] zwu18 2017-09-27 22:01:37 +13:00
• c7f59b73d5 Expanded the boundary for ac35MapLayout.xml slightly. Fixes issue #63 fjc40 2017-09-27 16:56:20 +13:00
• 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. Fixes issue #64 fjc40 2017-09-27 16:08:02 +13:00
• abfa3ea863 Race now uses a 1 for timescale, which effectively disables time/speed scaling. fjc40 2017-09-27 15:51:00 +13:00
• 3e04ed12ad Removed raceSinglePlayer.xml and raceThreePlayers.xml as they are identical to raceSixPlayers.xml. Renamed raceSixPlayers.xml to ac35MapLayout.xml to be more consistent with other map names. Issue #63 fjc40 2017-09-27 15:41:24 +13:00
• 75f8231bc5 Merge branch 'story1292_hp_punish' into 'master' Fraser Cope 2017-09-27 15:24:38 +13:00
• 5ea4200e67 Some javadoc warning fixes. fjc40 2017-09-27 14:47:51 +13:00
• 7b5460abc5 info full screen map shows on top of hud #story[1306] hba56 2017-09-27 14:17:22 +13:00
• 2ac3bad6e1 info table shows on top of hud #story[1306] hba56 2017-09-27 13:54:02 +13:00
• 4e8f1a2b19 Placed the waypoint arrow in the HUD #story[1306] hba56 2017-09-27 13:39:27 +13:00
• 1a672e8ac8 Merge branch 'master' into story1292_hp_punish David Wu 2017-09-27 13:36:24 +13:00
• 2f6fa73349 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI hba56 2017-09-27 13:21:41 +13:00
• f9f3213397 Merge branch 'story1299_next_mark_direction' into 'master' Hamish Ball 2017-09-27 13:19:53 +13:00
• 7ac181f33d Fixed null pointer when race finishes #story[1299] Joseph Gardner 2017-09-27 13:08:29 +13:00
• 13f3f595d2 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction Joseph Gardner 2017-09-27 12:52:50 +13:00