TriggerHatch bearbeitet
Anfang Configs zu mergen
trigger button fehler behoben
config sollte nun fertig sein
applicationStarter
trigger
*Jonas sein zeug*
benny + alex: playerscripts
Merge branch 'scripts' of https://github.com/Jonas90/iss into scripts
*caveTest*
Fix Bug in PlayerInteractionGame.cs
Doortrigger aktiviert
git cleanup + movement performance++
Merge branch 'scripts' of https://github.com/Jonas90/iss into scripts

Conflicts:
	Assembly-CSharp-firstpass.pidb
	Assembly-CSharp.pidb
	Assets/Scenes/Main.unity
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/metadata/31/315b3a5b88841814d86a800b11668122
	Library/metadata/58/584d894eb26d9934db7d1b1be4c96182
	Library/metadata/5d/5d85de17fba73744dba09529b4f92aaa
	Library/metadata/83/83d404ca97f82eb44a4b5db4cf358109
	Library/metadata/ae/aed62515d9f400f49970b197d7e95927
	Library/metadata/c3/c3c1528ffa78c1a4486a538923c58ae0
	Library/metadata/ca/ca48bd89ebfca6145a7c668ccd9af333
	Library/metadata/cf/cfd4a3a678cc09446ad7386ae79b5018
	Library/metadata/e1/e12880d9f46ac15409e93ee249b74a9a
	Library/metadata/ea/eae93d8ebb82c6343bfc679630c566d7
geraetekoordinaten_dummy fix
unityproj fix
Add dll's
hhkjkj
Merge branch 'scripts' of https://github.com/Jonas90/iss into scripts

Conflicts:
	Assets/Scripts/TriggerHatch.cs
ben's smoke