1611 Commits (main)
 

Author SHA1 Message Date
zwu18 a0e851832a Change title.
8 years ago
zwu18 d75415a260 Merge branch 'new_finish_view' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into new_finish_view
8 years ago
zwu18 9b9c3dfdaa Fixed problem where non-host cannot return to main menu after finish.
8 years ago
Joseph Gardner a4c0aeb4a5 Merge branch 'master' into new_finish_view
8 years ago
Hamish Ball 4d6de8bc9f Merge branch 'easter_eggs' into 'master'
8 years ago
zwu18 0b718f4f57 Created new splash screen.
8 years ago
hwball 8f12f42007 fix
8 years ago
Fan-Wu Yang 79d90f6ad5 Fixed match client
8 years ago
Fan-Wu Yang 804d27e055 You can no longer zoom in on sharks
8 years ago
Fan-Wu Yang 58470ab1fe Seagulls have their own voices when konami cheat code is done and fannypride replaces the tomato.
8 years ago
zwu18 5fd5a3bd54 Improved finish display.
8 years ago
Fan-Wu Yang 9c4a949166 Fixed merge issues
8 years ago
Fan-Wu Yang d4c355fcb5 Merge branch 'master' into upgradeStartBoat
8 years ago
David Wu e63f53ec9a Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7
8 years ago
Fan-Wu Yang 3c58c3fc09 Assest are loaded in loading place
8 years ago
Fan-Wu Yang 08e6f726cc Added 8 seagulls to the game
8 years ago
Connor Taylor-Brown adebe1df96 Merge remote-tracking branch 'origin/master'
8 years ago
Connor Taylor-Brown df95e2b3b1 We fully legit gg no re
8 years ago
Joseph Gardner ec4fc9da24 Skybox no longer preloaded
8 years ago
Fan-Wu Yang 767a65f649 Boat now used updated textures
8 years ago
Joseph Gardner 8ed0bf09ca Merge branch 'master' into nightmode
8 years ago
David Wu 4e352a7d49 Merge branch 'master' into story1301-ingamelobby
8 years ago
Joseph Gardner 165c3e77ab Can swap skyboxes in title screen.
8 years ago
Joseph Gardner 851b8aa7a8 Merge branch 'master' into nightmode
8 years ago
Jessica Syder 1645933a94 Start in a nicer zoom.
8 years ago
Fan-Wu Yang 68dfa2d27a Fixed case sensitivity problems #story[1301]
8 years ago
Joseph Gardner 55de754164 Stuff
8 years ago
Jessica Syder 0aad5a1bd6 Missing button image and zoom limit changed.
8 years ago
Joseph Gardner 685b508f1e Merge branch 'tom' into nightmode
8 years ago
Joseph Gardner 38bcc9fa66 Sailer tom 8)
8 years ago
Jessica Syder f46f9b9bf5 Merge master in
8 years ago
Joseph Gardner c0e00899ef Merge branch 'master' into tom
8 years ago
Jessica Syder 35b5228cc6 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
8 years ago
Jessica Syder bd0c0ac5ef Stylin'
8 years ago
Fan-Wu Yang 3956affa01 removed timescale, and merged master
8 years ago
Fan-Wu Yang fbb9d0910b Merge branch 'master' into new_3d_assets
8 years ago
Fan-Wu Yang 6003bdf771 Fixed issue where finishing boats order could be be changed
8 years ago
Joseph Gardner 4f681ced4e Sailer tom 8)
8 years ago
Jessica Syder 1196e853bf Stylin'
8 years ago
Fan-Wu Yang 4ddc369dbc Changed Collisions, and merged master
8 years ago
David Wu bab7749138 Merged master into branch. #story[1301]
8 years ago
hba56 817b71339d updated images to show the arrows better aganst the wood
8 years ago
Fan-Wu Yang 6ec75e6ed7 Merge branch 'master' into new_3d_assets
8 years ago
David Wu 52da88b1a1 Merge branch 'master' into custom_buttons
8 years ago
David Wu 76db768b76 Fix join button disappearing. #story[1301]
8 years ago
Connor Taylor-Brown 0bfe93da06 Merge branch 'master' into story1301-start
8 years ago
Connor Taylor-Brown e90aeccdef Merge branch 'master' into story1301-start
8 years ago
Jessica Syder 7230cdf2a3 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
8 years ago
Jessica Syder edb0e1db2f Transparent maps.
8 years ago
Fan-Wu Yang 3b4ff51bff Created race background for ingame lobby. #user[zwu18] #story[1301]
8 years ago