

Nextrek
Changeset 131
Committed by DRuega on Thu 06 Nov, 2014 18:25:48 +0000
Commit Message:
Merge.
Changes
Modified
/3DSpace/3DSpace-csharp.sln
Diff
Modified
/3DSpace/3DSpace.sln
Diff
Modified
/3DSpace/3DSpace.userprefs
Diff
Modified
/3DSpace/Assembly-CSharp-Editor-vs.csproj
Diff
Modified
/3DSpace/Assembly-CSharp-Editor.csproj
Diff
Modified
/3DSpace/Assembly-CSharp-firstpass-vs.csproj
Diff
Modified
/3DSpace/Assembly-CSharp-firstpass.csproj
Diff
Modified
/3DSpace/Assembly-UnityScript-vs.unityproj
Diff
Modified
/3DSpace/Assembly-UnityScript.unityproj
Diff
Modified
/3DSpace/Assets/Custum/Prefebs/Ally.prefab
Diff
Modified
/3DSpace/Assets/Custum/Scripts/AllyShip.cs
Diff
Modified
/3DSpace/Assets/Custum/Scripts/CommunicationCenter.cs
Diff
Modified
/3DSpace/Assets/Custum/Scripts/EnemyShip.cs
Diff
Modified
/3DSpace/Library/AssetServerCacheV3
Diff
Modified
/3DSpace/Library/CurrentLayout.dwlt
Diff
Modified
/3DSpace/Library/EditorUserBuildSettings.asset
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-CSharp.dll
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-UnityScript.dll
Diff
Modified
/3DSpace/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
Diff
Modified
/3DSpace/Library/ScriptMapper
Diff
Modified
/3DSpace/Library/assetDatabase3
Diff
Modified
/3DSpace/Library/expandedItems
Diff
Modified
/3DSpace/Library/guidmapper
Diff
Modified
/3DSpace/Library/metadata/28/28cf10a7636df7c4a9ffce89181cb6b9
Diff
Modified
/3DSpace/Library/metadata/6e/6e6453dd5e2074f408dd708367384e66
Diff
Modified
/3DSpace/Library/metadata/b0/b04615eb6ffe81341af1a507b99cb347
Diff
Modified
/3DSpace/Library/metadata/d6/d6d7c8a69503a48a98152ae7131ec364
Diff
Modified
/3DSpace/Library/metadata/f5/f5f519c7deaf5c9498a249a58e36f2f7
Diff