CM branch add
Updated gitignore

Signed-off-by: Captain Murphy <captain@teamduck.com>
Added new Ocean

Signed-off-by: Captain Murphy <captain@teamduck.com>
Adding Hoy and Test Object

Signed-off-by: Captain Murphy <captain@teamduck.com>
Updated scene with ocean and buoyancy on Hoy

Signed-off-by: Captain Murphy <captain@teamduck.com>
Added Sphynx vessel

Signed-off-by: Captain Murphy <captain@teamduck.com>
disregaurd

Saved to wrong location
Added fonts, music, sounds, and textures.
Working on the ocean texture some more
Adding test version of splash effect that distorts a plane for the effect
Merge branch 'CM' of https://github.com/trunks518/HoO-Unity into CM

Conflicts:
	Hearts of Oak/Assembly-UnityScript-firstpass-vs.unityproj
	Hearts of Oak/Assembly-UnityScript-firstpass.unityproj
	Hearts of Oak/Assets/Materials/OceanIndie.mat
	Hearts of Oak/Assets/Models/Ships/Materials/M_proxy.mat
	Hearts of Oak/Assets/Scenes/Demoisland.unity
	Hearts of Oak/Assets/Skyboxs/Blended/Day 1.mat
	Hearts of Oak/Hearts of Oak.userprefs
	Hearts of Oak/ProjectSettings/ProjectSettings.asset
Added new Buoyancy.cs script

Signed-off-by: Captain Murphy <captain@teamduck.com>
Forward movement script added
Buoyancy updated

Signed-off-by: Captain Murphy <captain@teamduck.com>
Updated ocean shader/mat
Updated a couple of the ship mats

Signed-off-by: Captain Murphy <captain@teamduck.com>
Merge ssh://github.com/trunks518/HoO-Unity into CM

Conflicts:
	.gitignore
	Hearts of Oak/Assembly-UnityScript-firstpass-vs.unityproj
	Hearts of Oak/Assembly-UnityScript-firstpass.unityproj
	Hearts of Oak/Assets/Materials/Buoy Materials/Material #31.mat
	Hearts of Oak/Assets/Materials/OceanIndie.mat
	Hearts of Oak/Assets/Materials/OceanWireframeIndie.mat
	Hearts of Oak/Assets/Mesh/Materials/Material #1.mat
	Hearts of Oak/Assets/Models/Ships/Materials/M_proxy.mat
	Hearts of Oak/Assets/Models/Ships/Materials/bronze_1_DIFF.mat
	Hearts of Oak/Assets/Models/Ships/Materials/deck_2_DIFF.mat
	Hearts of Oak/Assets/Models/Ships/Materials/glas_1_DIFF.mat
	Hearts of Oak/Assets/Models/Ships/Materials/kompass_1.mat
	Hearts of Oak/Assets/Models/Ships/Materials/lambert1.mat
	Hearts of Oak/Assets/Models/Ships/Materials/metal_5_DIFF.mat
	Hearts of Oak/Assets/Models/Ships/Materials/metall_rusty_1_DIFF.mat
	Hearts of Oak/Assets/Models/Ships/Materials/ornament_4_DIFF.mat
	Hearts of Oak/Assets/Models/Ships/Materials/rope_3_Vorschau Farbe.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_1b_DIFF_Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_2b_DIFF_Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_4b_Blau (Royal Blue) Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_4b_Braun (BerghÃ¶lzer) Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_4b_gelb (Rumpf) Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_4b_rot (Innen und Lucken) Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_4b_weiss bis gelblich Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_5_DIFF.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_5b.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_planks_1b_DIFF_gelb_Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_planks_1b_blau (Huelle_innen) Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_planks_1b_gelb (Rumpf) Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_planks_1b_rot (Huelle_innen) Vorschau.mat
	Hearts of Oak/Assets/Models/Ships/Materials/wood_planks_1b_weiss (Unterwasserschiff) Vorschau.mat
	Hearts of Oak/Assets/Scenes/Demoisland.unity
	Hearts of Oak/Assets/Scripts/DayNight/DayNight1.cs
	Hearts of Oak/Assets/Scripts/Fire.js
	Hearts of Oak/Assets/Shaders/OceanIndie.shader
	Hearts of Oak/Assets/Shaders/OceanIndie.shader.meta
	Hearts of Oak/Assets/Standard Assets/Terrain Assets/Trees Ambient-Occlusion/Palm/Materials/palmbark.mat
	Hearts of Oak/Assets/Standard Assets/Terrain Assets/Trees Ambient-Occlusion/Palm/Materials/palmbranch.mat
	Hearts of Oak/Assets/Textures/Crate.jpg.meta
	Hearts of Oak/Assets/Tree_Textures/diffuse.png.meta
	Hearts of Oak/Hearts of Oak.userprefs
	Hearts of Oak/HeartsOfOakUnity.exe
	Hearts of Oak/HeartsOfOakUnity_Data/Managed/Assembly-CSharp-firstpass.dll
	Hearts of Oak/HeartsOfOakUnity_Data/Managed/Assembly-CSharp.dll
	Hearts of Oak/HeartsOfOakUnity_Data/Managed/Assembly-UnityScript-firstpass.dll
	Hearts of Oak/HeartsOfOakUnity_Data/Managed/Assembly-UnityScript.dll
	Hearts of Oak/HeartsOfOakUnity_Data/PlayerConnectionConfigFile
	Hearts of Oak/HeartsOfOakUnity_Data/mainData
	Hearts of Oak/HeartsOfOakUnity_Data/output_log.txt
	Hearts of Oak/HeartsOfOakUnity_Data/sharedassets0.assets
	Hearts of Oak/Library/CurrentLayout.dwlt
	Hearts of Oak/Library/InspectorExpandedItems.asset
	Hearts of Oak/Library/ProjectSettings.asset
	Hearts of Oak/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Hearts of Oak/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Hearts of Oak/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Hearts of Oak/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Hearts of Oak/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hearts of Oak/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hearts of Oak/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Hearts of Oak/Library/ScriptMapper
	Hearts of Oak/Library/assetDatabase3
	Hearts of Oak/Library/expandedItems
	Hearts of Oak/Library/guidmapper
	Hearts of Oak/Library/metadata/00/00000000000000002000000000000000
	Hearts of Oak/Library/metadata/00/00000000000000003000000000000000
	Hearts of Oak/Library/metadata/00/00000000000000004000000000000000
	Hearts of Oak/Library/metadata/00/00000000000000004100000000000000
	Hearts of Oak/Library/metadata/00/00000000000000005000000000000000
	Hearts of Oak/Library/metadata/00/00000000000000005100000000000000
	Hearts of Oak/Library/metadata/00/00000000000000006000000000000000
	Hearts of Oak/Library/metadata/00/00000000000000006100000000000000
	Hearts of Oak/Library/metadata/00/00000000000000007000000000000000
	Hearts of Oak/Library/metadata/00/00000000000000008000000000000000
	Hearts of Oak/Library/metadata/00/00000000000000009000000000000000
	Hearts of Oak/Library/metadata/00/0000000000000000a000000000000000
	Hearts of Oak/Library/metadata/00/0000000000000000b000000000000000
	Hearts of Oak/Library/metadata/00/0000000000000000c000000000000000
	Hearts of Oak/Library/metadata/02/02749dc14cae0634e847f89965ca28d8
	Hearts of Oak/Library/metadata/09/09519dc9ec5de8f41b635ab9de2cfec2
	Hearts of Oak/Library/metadata/0a/0a0517c8f07c047f2965315b8dac81aa
	Hearts of Oak/Library/metadata/0d/0d64cf85603324c6d89204084bbb3438
	Hearts of Oak/Library/metadata/14/145539da7e4562c44adcfb418f26b24d
	Hearts of Oak/Library/metadata/15/15577174a872740edb59495b6549a0c3
	Hearts of Oak/Library/metadata/17/17e234879cb994b7f93d7437c10d23d6
	Hearts of Oak/Library/metadata/1b/1bf34b610fe6f466faff3dcd833c06f6
	Hearts of Oak/Library/metadata/1e/1e3cbdfe3644f44aeb1c053d96cc254e
	Hearts of Oak/Library/metadata/1e/1e68e75546e8d4feab8846bfaf8878d3
	Hearts of Oak/Library/metadata/1e/1edfae5c7fc834f76b77bee26e88e0a4
	Hearts of Oak/Library/metadata/24/24f8b7f726c7047cb906be889dbf5ac1
	Hearts of Oak/Library/metadata/29/290a0be1997c93b488845efcdaeb42c1
	Hearts of Oak/Library/metadata/2b/2b382c059b23e074fb9415cac425ca6c
	Hearts of Oak/Library/metadata/2c/2c538784885b34a5987ed9f6651d9ecd
	Hearts of Oak/Library/metadata/2f/2fd60b04f7c434a4dafd253d09bfa783
	Hearts of Oak/Library/metadata/30/3033e46ab6c9e44a9b9dd0e9f5130357
	Hearts of Oak/Library/metadata/31/3186f38ca67e7441e8299da2e169f9f9
	Hearts of Oak/Library/metadata/32/32569ca6b14e24176be40165ccaa300c
	Hearts of Oak/Library/metadata/33/33850b67ffcaa4b6c9a7146e4be0b917
	Hearts of Oak/Library/metadata/34/34294cb9b6ae44f469c86ef54fc27338
	Hearts of Oak/Library/metadata/35/356d385a59c53487ebe6e3363ff4ffa2
	Hearts of Oak/Library/metadata/3b/3bbbb1d2bfc4f43f79f3226bca2d1f64
	Hearts of Oak/Library/metadata/3c/3c5bb2bad5622497490fdbd0f36e9674
	Hearts of Oak/Library/metadata/3c/3cc8ac37e0da341db819af6143a07b03
	Hearts of Oak/Library/metadata/3f/3fa3d5ae10b3e284fa586e99edfddf5b
	Hearts of Oak/Library/metadata/40/40b01469ebddf42bc84870ba2f3d8c4c
	Hearts of Oak/Library/metadata/46/46e871058d317418fab60bb84a290869
	Hearts of Oak/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc
	Hearts of Oak/Library/metadata/4c/4ca8e16c3e0ab45e69aef7738ef77d3a
	Hearts of Oak/Library/metadata/4d/4d893394d1a709b4680e30f8b3da6949
	Hearts of Oak/Library/metadata/51/510306bf62c654a548c9d0193dbedd8e
	Hearts of Oak/Library/metadata/52/527393b10fb66418bbaa072e104f5a30
	Hearts of Oak/Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Hearts of Oak/Library/metadata/57/5710a1f47af2947699139509aae39149
	Hearts of Oak/Library/metadata/5f/5f32776e6f3e6464191e1cc146b4eaf5
	Hearts of Oak/Library/metadata/60/607426a9820414bfd8081fb22854dbd4
	Hearts of Oak/Library/metadata/61/6134a184b1d49498fb473b6276533784
	Hearts of Oak/Library/metadata/62/621604404d307e348ae2048fb955de9f
	Hearts of Oak/Library/metadata/63/63e618e4b55634c8fb3bf5c5cd6679ea
	Hearts of Oak/Library/metadata/65/656fde119942645aa8e062e04c119aa1
	Hearts of Oak/Library/metadata/66/66207ff69de6b4d73a445036c3a195f6
	Hearts of Oak/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Hearts of Oak/Library/metadata/6a/6aa58ee2f84094af2846e1a7bb0c23f9
	Hearts of Oak/Library/metadata/70/706eadfad28bc4c1c9bb137b31052b14
	Hearts of Oak/Library/metadata/70/7097f369c5ba74821bd76c430889322a
	Hearts of Oak/Library/metadata/70/70a4c3571f5624280bd8605def97056d
	Hearts of Oak/Library/metadata/70/70b8fa2f5ec811e4a9116ca08f49ab51
	Hearts of Oak/Library/metadata/73/73604ae94aea741dfa9b7732c8994b19
	Hearts of Oak/Library/metadata/76/76f6d0029ef96a849b2379473bbebc76
	Hearts of Oak/Library/metadata/79/794a3489a6afd4daf80d98a5844341b9
	Hearts of Oak/Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Hearts of Oak/Library/metadata/7e/7e6f84bf81c8d4de280f1133cff7e601
	Hearts of Oak/Library/metadata/82/8269a010592f549af8f11b1683d9e794
	Hearts of Oak/Library/metadata/85/85cde262bee344ae28a0bf86762219ac
	Hearts of Oak/Library/metadata/86/8668f96cc207b4965afadab0edade16a
	Hearts of Oak/Library/metadata/8a/8af0f21f411904d65a90f87110818a7e
	Hearts of Oak/Library/metadata/8c/8c1f929571ef549619212d9405d4f923
	Hearts of Oak/Library/metadata/8c/8c75dadc1f18e42f5be29942a71d83c4
	Hearts of Oak/Library/metadata/92/92722830d4a3f49e5bf7e68441337edb
	Hearts of Oak/Library/metadata/97/97593109f34de48109618fb5687a88b8
	Hearts of Oak/Library/metadata/9a/9a59d4872d73b416f8e0c2c4ca57fbe2
	Hearts of Oak/Library/metadata/9a/9a7a5a5fe36c5554fa260519aa50efe5
	Hearts of Oak/Library/metadata/9b/9b9106e5cf82342e78e4fcc288becd41
	Hearts of Oak/Library/metadata/9e/9ef50104b12ed4ca9bed40f105986cd7
	Hearts of Oak/Library/metadata/9f/9fadc0eecbffa4c95a05ce54af27726c
	Hearts of Oak/Library/metadata/a7/a771af3b1958445078af5fe2e9ec726c
	Hearts of Oak/Library/metadata/aa/aadd99b5f57c2486b98d31bcbb5c640e
	Hearts of Oak/Library/metadata/ab/ab90c5d984b4d4e9e935ae8760fd47ef
	Hearts of Oak/Library/metadata/ac/ac85670a1b2274f22905d6a43940371a
	Hearts of Oak/Library/metadata/ac/ac865f55780124eeabc4a99d6d0b0115
	Hearts of Oak/Library/metadata/b0/b0960427f5c1c8444a09aaf72a55534d
	Hearts of Oak/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Hearts of Oak/Library/metadata/b5/b5b8c0f9acc2944f086c02cb83f4ae76
	Hearts of Oak/Library/metadata/b8/b8b8d85e7055f46448a4865d47b3cd20
	Hearts of Oak/Library/metadata/b9/b93f87b530fe2cb40b6877a0eb1968d7
	Hearts of Oak/Library/metadata/c2/c22094bc116524b2a95c9aae09278b22
	Hearts of Oak/Library/metadata/c4/c48f755640f4048aeaa765302f0c14b3
	Hearts of Oak/Library/metadata/c6/c66db1ffd799252438511c0adc583f3f
	Hearts of Oak/Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Hearts of Oak/Library/metadata/c8/c8e96a067d1ef4982b454cf5a686f648
	Hearts of Oak/Library/metadata/ca/caa1ec025a7c049ec8f67b889fb33a6d
	Hearts of Oak/Library/metadata/ca/cad4fe3deabb0452e9a372244c25287c
	Hearts of Oak/Library/metadata/cb/cba4562cece794697b418ce8e7c04b3c
	Hearts of Oak/Library/metadata/d5/d5396a3251db948279e0c7262385dafe
	Hearts of Oak/Library/metadata/d8/d8cfa4746d26d4715b9f848bce1e2f14
	Hearts of Oak/Library/metadata/da/da1fc52135d4b39419345eaf32b61b52
	Hearts of Oak/Library/metadata/da/daf8ab28ea6df4773bf38cb9e3e173e1
	Hearts of Oak/Library/metadata/db/dbda7710ef03c704fa3e4b3fd8d247b7
	Hearts of Oak/Library/metadata/dc/dc7abfa0435174ded902b073322d67cc
	Hearts of Oak/Library/metadata/df/df42ef794d3e0441783057cf822a525c
	Hearts of Oak/Library/metadata/e0/e02bf8d8fe18948ea8ce546b6a32bee5
	Hearts of Oak/Library/metadata/e3/e35293de2fbc1b24c9ce0bab13494cf4
	Hearts of Oak/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Hearts of Oak/Library/metadata/e5/e5bdb6135a74b444d8cebd065dbf9d08
	Hearts of Oak/Library/metadata/e7/e70b47c0cfc1d4b12a3c663d7582a523
	Hearts of Oak/Library/metadata/e9/e9b2eead3d2f84ce19c1d65f1dbf66f9
	Hearts of Oak/Library/metadata/f2/f2af333648c334319bd43c214449ab50
	Hearts of Oak/Library/metadata/f6/f6260e92399a294448aa8459e0c6159e
	Hearts of Oak/Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Hearts of Oak/Library/metadata/f8/f89a53f13e64bbbd73bd6eb9f8509a09
	Hearts of Oak/Library/metadata/fb/fb58fb63380c8144d853a5da8742abd8
	Hearts of Oak/Library/metadata/fc/fc4f25bb7b1048e4b8f9546513130878
	Hearts of Oak/Library/metadata/fe/fe5d00245bc1d42a7927f4b2879026b8
	Hearts of Oak/Library/metadata/ff/ff063c9db7e6e467d86d376ff5be5ca0
	Hearts of Oak/Library/shadercompiler-1.log
	Hearts of Oak/ProjectSettings/EditorBuildSettings.asset

Signed-off-by: Captain Murphy <captain@teamduck.com>
Last updates for main menu screen

Signed-off-by: Captain Murphy <captain@teamduck.com>
Merge pull request #1 from trunks518/CM

Cm