Skip to content

Commit

Permalink
Preparing 0.1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jigglex committed Oct 25, 2011
1 parent 6621bc8 commit b311f8e
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 3 deletions.
34 changes: 34 additions & 0 deletions Jitter.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitterDemoContent", "Jitter
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JitterDemo", "JitterDemo", "{5FC265FF-3CD8-4120-905C-B0548A8E1EF4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jitter360", "Jitter\Jitter360.csproj", "{5054125C-91FF-44F9-8CB8-550B95B1509D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitterPhone", "Jitter\JitterPhone.csproj", "{812E48A0-03B3-462F-8873-612A0811865E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -65,6 +69,36 @@ Global
{5D1B10F2-1490-400F-A178-60D991F2509F}.Release|Windows Phone.ActiveCfg = Release|x86
{5D1B10F2-1490-400F-A178-60D991F2509F}.Release|x86.ActiveCfg = Release|x86
{5D1B10F2-1490-400F-A178-60D991F2509F}.Release|Xbox 360.ActiveCfg = Release|x86
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|Any CPU.ActiveCfg = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|Mixed Platforms.ActiveCfg = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|Mixed Platforms.Build.0 = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|Windows Phone.ActiveCfg = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|Windows Phone.Build.0 = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|x86.ActiveCfg = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|Any CPU.ActiveCfg = Release|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|Mixed Platforms.ActiveCfg = Release|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|Mixed Platforms.Build.0 = Release|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|Windows Phone.ActiveCfg = Release|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|Windows Phone.Build.0 = Release|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|x86.ActiveCfg = Release|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
{5054125C-91FF-44F9-8CB8-550B95B1509D}.Release|Xbox 360.Build.0 = Release|Xbox 360
{812E48A0-03B3-462F-8873-612A0811865E}.Debug|Any CPU.ActiveCfg = Debug|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Debug|Mixed Platforms.Build.0 = Debug|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Debug|Windows Phone.Build.0 = Debug|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Debug|x86.ActiveCfg = Debug|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Debug|Xbox 360.ActiveCfg = Debug|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Release|Any CPU.ActiveCfg = Release|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Release|Mixed Platforms.ActiveCfg = Release|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Release|Mixed Platforms.Build.0 = Release|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Release|Windows Phone.ActiveCfg = Release|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Release|Windows Phone.Build.0 = Release|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Release|x86.ActiveCfg = Release|Windows Phone
{812E48A0-03B3-462F-8873-612A0811865E}.Release|Xbox 360.ActiveCfg = Release|Windows Phone
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion Jitter/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("0.1.6.0")]
[assembly: AssemblyVersion("0.1.7.0")]
Binary file modified Other/Jitter OpenGL/assemblies/Jitter.dll
View file
Binary file not shown.
Binary file modified Other/Jitter PhoneDemo/Binary/JitterPhone.dll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Other/Jitter PhoneDemo/SimpleJitterPhoneDemo/DemoGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private void CreateInitialScene()
groundBody.IsStatic = true; // making the ground immovable
world.AddBody(groundBody); // finally add it to the world

for (int i = 0; i < 7; i++)
for (int i = 0; i < 17; i++)
{
RigidBody boxBody = new RigidBody(boxShape); // create a new box
boxBody.Position = new JVector(0, 0.5f + i * 2.2f, i*0.1f); // move it
Expand Down
4 changes: 3 additions & 1 deletion Other/Jitter PhoneDemo/SimpleJitterPhoneDemo/SimpleJitterPhoneDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
<XnaCompressContent>false</XnaCompressContent>
</PropertyGroup>
<ItemGroup>
<Reference Include="JitterPhone, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL" />
<Reference Include="JitterPhone">
<HintPath>..\Binary\JitterPhone.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xna.Framework">
<Private>False</Private>
</Reference>
Expand Down

0 comments on commit b311f8e

Please sign in to comment.