Skip to content

Commit

Permalink
Resolution point todo list
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nem0oo
Nem0oo committed Jan 19, 2014
1 parent cc82e27 commit 21ead21
Show file tree
Hide file tree
Showing 250 changed files with 2,436 additions and 53 deletions.
6 changes: 3 additions & 3 deletions Assembly-CSharp-vs.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1C09369F-29C4-14D4-C980-635AB981BEDF}</ProjectGuid>
<ProjectGuid>{9CC13FBD-7A38-9BF9-EA21-A0F2D154C6B0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -39,10 +39,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Assembly-CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1C09369F-29C4-14D4-C980-635AB981BEDF}</ProjectGuid>
<ProjectGuid>{9CC13FBD-7A38-9BF9-EA21-A0F2D154C6B0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -39,10 +39,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -98,7 +98,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-UnityScript-firstpass.unityproj">
<Project>{BD7761DF-6156-D0BA-831A-5F2020021573}</Project> <Name>Assembly-UnityScript-firstpass</Name> </ProjectReference>
<Project>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</Project> <Name>Assembly-UnityScript-firstpass</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
6 changes: 3 additions & 3 deletions Assembly-UnityScript-firstpass-vs.unityproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BD7761DF-6156-D0BA-831A-5F2020021573}</ProjectGuid>
<ProjectGuid>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -39,10 +39,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Assembly-UnityScript-firstpass.unityproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BD7761DF-6156-D0BA-831A-5F2020021573}</ProjectGuid>
<ProjectGuid>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -39,10 +39,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Assembly-UnityScript-vs.unityproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CC84D0D6-02CF-1999-AE59-102BDD1EA0AF}</ProjectGuid>
<ProjectGuid>{0DDBE485-1F95-AE68-B4E3-1C9E79A57D68}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -39,10 +39,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Assembly-UnityScript.unityproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CC84D0D6-02CF-1999-AE59-102BDD1EA0AF}</ProjectGuid>
<ProjectGuid>{0DDBE485-1F95-AE68-B4E3-1C9E79A57D68}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -39,10 +39,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
<HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -61,7 +61,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-UnityScript-firstpass.unityproj">
<Project>{BD7761DF-6156-D0BA-831A-5F2020021573}</Project> <Name>Assembly-UnityScript-firstpass</Name> </ProjectReference>
<Project>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</Project> <Name>Assembly-UnityScript-firstpass</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
22 changes: 11 additions & 11 deletions Assets/Kinect/Script/Kinect/Gesture/KinectMebu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ void Start () {
listeGui = GameObject.FindGameObjectsWithTag ("GuiMenu");
guiChargement = GameObject.Find ("Affichage chargement");
guiChargement.guiText.text = "";

if (sw.pollSkeleton ())
{
tallInit = sw.bonePos [0, (int)Kinect.NuiSkeletonPositionIndex.ShoulderRight].y;
}
}

// Update is called once per frame
Expand Down Expand Up @@ -143,20 +146,17 @@ void MenuDetection()
tableauBoolPos [0] = true;
jouerson3 = true;
jouerson2 = true;

tallInit=shoulderRight.y;

}
//Geste secret !!
if (handRight.y > head.y) {

if (tallInit - shoulderRight.y < (tallInit / 2)) {
niveauChateau = true;
jouerson2 = true;
jouerson1 = true;
jouerson3 = true;
}
}
if (shoulderRight.y < (tallInit / 2)) {
niveauChateau = true;
jouerson2 = true;
jouerson1 = true;
jouerson3 = true;
}
}

//main d entre Ep et Hanche
if ((handRight.y < shoulderRight.y) && (handRight.y > hipMiddle.y)) {
Expand Down
1 change: 1 addition & 0 deletions Assets/Scenes/GameOver.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2218,6 +2218,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 202f65ac81f3aa245a1a290d549d4a5b, type: 3}
m_Name:
m_EditorClassIdentifier:
niveau: 1
--- !u!1 &2109452843
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 21ead21

Please sign in to comment.