Bumperscript erweitert
Merge branch 'master' of https://github.com/sekklow/RollerCoasterPinball

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/OwnAssets/Skripts/FlipScript.cs.meta
	Assets/PinballTisch_01.unity
	Assets/Standard
Assets/Skyboxes/Textures/DawnDusk/DawnDusk_back.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/DawnDusk/DawnDusk_down.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/DawnDusk/DawnDusk_front.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/DawnDusk/DawnDusk_left.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/DawnDusk/DawnDusk_right.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/DawnDusk/DawnDusk_up.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Eerie/Eerie_back.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Eerie/Eerie_down.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Eerie/Eerie_front.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Eerie/Eerie_left.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Eerie/Eerie_right.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Eerie/Eerie_up.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/MoonShine/MoonShine_back.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/MoonShine/MoonShine_down.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/MoonShine/MoonShine_front.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/MoonShine/MoonShine_left.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/MoonShine/MoonShine_right.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/MoonShine/MoonShine_up.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast1/Overcast1_back.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast1/Overcast1_down.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast1/Overcast1_front.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast1/Overcast1_left.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast1/Overcast1_right.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast1/Overcast1_up.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast2/Overcast2_back.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast2/Overcast2_down.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast2/Overcast2_front.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast2/Overcast2_left.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast2/Overcast2_right.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/Overcast2/Overcast2_up.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/StarryNight/StarryNight_back.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/StarryNight/StarryNight_down.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/StarryNight/StarryNight_front.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/StarryNight/StarryNight_left.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/StarryNight/StarryNight_right.tif.meta
	Assets/Standard
Assets/Skyboxes/Textures/StarryNight/StarryNight_up.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_back.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_down.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_front.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_left.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_right.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny1/Sunny1_up.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny2/Sunny2_back.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny2/Sunny2_down.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny2/Sunny2_front.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny2/Sunny2_left.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny2/Sunny2_right.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny2/Sunny2_up.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny3/Sunny3_back.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny3/Sunny3_down.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny3/Sunny3_front.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny3/Sunny3_left.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny3/Sunny3_right.tif.meta
	Assets/Standard Assets/Skyboxes/Textures/Sunny3/Sunny3_up.tif.meta
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000001000000000000000
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/00/00d7e64775d1332438c4996b372b953f
	Library/metadata/05/0568ecdd797316641b0203860b3929d9
	Library/metadata/05/05f6c978afe090d4d8f0af42a61bbe7f
	Library/metadata/06/060029a1aebb0b2499d54d873819bbd4
	Library/metadata/09/0904e339eb6fdd546b8539bd04db10ed
	Library/metadata/0c/0c78b5f06201a7247a5cbf2305ff1333
	Library/metadata/16/16522f49031ff414abdf1f83f1b6a36c
	Library/metadata/16/16dd8248d31591f4fbea40ca5d506411
	Library/metadata/19/195c271a9118d224c8562ae67cf47a66
	Library/metadata/1b/1bf34b610fe6f466faff3dcd833c06f6
	Library/metadata/1b/1bf5c205149788846aec7f717bcd345b
	Library/metadata/1d/1da31b5f0cf126543b66c7d9d24a574c
	Library/metadata/1e/1e9d8b5f1e2d7ae48a0d33c6ebc3cde9
	Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
	Library/metadata/27/27befaa69bd883e498600589ec43b765
	Library/metadata/2c/2c57ac21562e47c40bae39b9e664e7a8
	Library/metadata/2c/2c93b54a9ce1c314b809b4c11cf9cdb6
	Library/metadata/32/32ef381921b3f7f479831b042c113762
	Library/metadata/33/33be91ebc0312406dbcb48f0970926ed
	Library/metadata/33/33f5dbe7dd6514448a3eeddb159c90d2
	Library/metadata/34/349809f45ef8a4529b756cbdeff1017d
	Library/metadata/35/352e5f82d7105ad408904c5f552b5fe7
	Library/metadata/35/356d385a59c53487ebe6e3363ff4ffa2
	Library/metadata/39/39a8706a9bd02c64783c071fb7438ecf
	Library/metadata/42/427ff48b098658742bdcce953d607e78
	Library/metadata/45/454585cca07f953479b902a00ead3015
	Library/metadata/51/517a230447c0af548a7679cdf69c3e56
	Library/metadata/53/53412155bc1016547b1a77b2333c0380
	Library/metadata/54/5410a64fad11e8d6d00011d98d76c639
	Library/metadata/56/565b8ff7771444e51a2a217635663038
	Library/metadata/58/5861c55756febc148902667397405ff9
	Library/metadata/59/59013702ca63d6e49a1cfa3cd409ee2e
	Library/metadata/5a/5a34a8d575bca4302ac715fa471e8f45
	Library/metadata/5a/5aab239cac7fe8a4c931693a7535da5c
	Library/metadata/5b/5ba172cd3918d7c44aa6d04446119a00
	Library/metadata/5d/5dbdf7dfcf86afa418926ee28fab2b1d
	Library/metadata/5f/5f75ef29233ec634facc1ba1e1f64725
	Library/metadata/60/607426a9820414bfd8081fb22854dbd4
	Library/metadata/61/6134a184b1d49498fb473b6276533784
	Library/metadata/63/63e618e4b55634c8fb3bf5c5cd6679ea
	Library/metadata/66/661663e7fa00ae64fa29cf54677bbef4
	Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
	Library/metadata/67/67db31eead11e8d6d00011d98d76c639
	Library/metadata/67/67de91b5513a4d8489588fb65de75caa
	Library/metadata/68/68287fe10cd30434b9c21ff1c55f613f
	Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e
	Library/metadata/6d/6dda5f499bc82c442aab32e4a6bdbe40
	Library/metadata/6e/6eef515e7c40d3244ad62dcdf6e8096a
	Library/metadata/75/752b01b0aec6184468996505d2ab8a9c
	Library/metadata/7a/7a3134e5f9749c449ad2289cfe93f5d5
	Library/metadata/7d/7d891a8df52e8d04395894e7705b00b9
	Library/metadata/87/87e98f563747ec04e8cd93b3fc3b1a29
	Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
	Library/metadata/8a/8af0f21f411904d65a90f87110818a7e
	Library/metadata/8c/8c75dadc1f18e42f5be29942a71d83c4
	Library/metadata/8c/8ca0735e520b5fc40a4e41b42fc288ea
	Library/metadata/91/91c222ac5463b7243849bc078d53e72c
	Library/metadata/93/931987be26c9646429c56f8a4692bb81
	Library/metadata/93/93bc7d6f0e1793c47a5f88178ecc75fe
	Library/metadata/95/956c1c0113bcd4c4388a3c239be09820
	Library/metadata/97/9785a5533d9270849a276a4bfbfa9418
	Library/metadata/99/99e86ee0ad11f8d6d00011d98d76c639
	Library/metadata/9b/9ba05f538ee36044da5cd2a4f14a8b18
	Library/metadata/9b/9bb8a33b9de494190ad0f64bea368f7a
	Library/metadata/9c/9c80732f7e125a54c9d19dbf33e5cd35
	Library/metadata/9d/9d2a2ce9c718dc24dae3b1ee427b27ee
	Library/metadata/9d/9da9699b195a3c648b5ddaa08a2de36d
	Library/metadata/9e/9ef26a39a400bec44a36b85fd38a2d65
	Library/metadata/9e/9ef50104b12ed4ca9bed40f105986cd7
	Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
	Library/metadata/a4/a4282fbcb91929d4db27590bba658590
	Library/metadata/a6/a6c23ad66d37f0e4c8c86d7c5293ac7c
	Library/metadata/a6/a6de6086ecd5fe84699b0bc7e00608a4
	Library/metadata/a9/a93a6af63a55a5d48bf033b997475160
	Library/metadata/a9/a9d582c4afa954ed8a03e968bd669a00
	Library/metadata/ae/aecdab3033c620c43a3695cc7a5296bb
	Library/metadata/b1/b19688c806c314070a8fcff160ffbde6
	Library/metadata/b8/b8a5478c3e4b02349a37bb69704d8713
	Library/metadata/bb/bbba6214b1838a64ebc939ac9a08726d
	Library/metadata/be/be7c377d128f1ff46a22853ecdb9e6d1
	Library/metadata/c4/c419698c0038a6e40868e7a0da6198dd
	Library/metadata/c4/c48f755640f4048aeaa765302f0c14b3
	Library/metadata/c5/c5983e0de5424da449eb9951e15a436a
	Library/metadata/c6/c6a0c9942fe754f4896e20d31f728ce1
	Library/metadata/c7/c76b3032d5d1c9e47a4f64134730c565
	Library/metadata/ca/cad4fe3deabb0452e9a372244c25287c
	Library/metadata/cc/cc2e0695659497144afe5a45ed3227ea
	Library/metadata/cd/cdf7d3f1ad11f8d6d00011d98d76c639
	Library/metadata/ce/cef3afbb29c0d4e1a85b35f9e7f61701
	Library/metadata/cf/cfeb7c9c75fe323418d42b8d2bc0de28
	Library/metadata/d4/d4d16ca3d56fb7142a32d49bbd323836
	Library/metadata/d5/d5c7a05aa139f574ea965c3a93b9d278
	Library/metadata/d6/d6dcb84e68578a8429abd2eda178bcf9
	Library/metadata/da/da976b1a4f7ebb949b0f71341e4f1821
	Library/metadata/da/daf8ab28ea6df4773bf38cb9e3e173e1
	Library/metadata/db/db6ded423daf6e449ac50a3e1f99a36a
	Library/metadata/dc/dc97187fca1dcaf4e84e8b5f414a64ba
	Library/metadata/e0/e0e8367cc866c7d4cae7b97d6ba94e88
	Library/metadata/e2/e228581791012c144900f8d7ccda2491
	Library/metadata/e3/e340b02bd24d6b44cbaaecb9296ea7b5
	Library/metadata/e3/e349c3f4b36417b48b65112d7bd0b54e
	Library/metadata/e3/e3e214f8620f35a4cb4e415a4b8c19cf
	Library/metadata/e5/e58d7769af939f944aa34c67b70e282b
	Library/metadata/e6/e683224912e790a4aad9fbfda3454396
	Library/metadata/e7/e7a88268a460f384cbef52d988810865
	Library/metadata/ee/ee911415b4c694c4c95ef96caf45b9eb
	Library/metadata/f3/f3938a461d184004e9daaf1426c3ac96
	Library/metadata/fa/fa9a139ead11e8d6d00011d98d76c639
	Library/metadata/fe/fe48ca40e9be666419e7d1a4bf3d808a
	Library/metadata/ff/ff063c9db7e6e467d86d376ff5be5ca0
	ProjectSettings/ProjectSettings.asset
	RollerCoasterPinball-csharp.sln
	RollerCoasterPinball.sln
	RollerCoasterPinball.userprefs
Conflict