Skip to content

Commit

Permalink
Fixed bug in UI after updating engine.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lance Zimmerman committed Jun 16, 2019
1 parent 95f09af commit 965304d
Show file tree
Hide file tree
Showing 24 changed files with 48 additions and 47 deletions.
2 changes: 1 addition & 1 deletion CFNGamejam2/CFNGamejam2.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<AssemblyFileVersionSettings>MMddStamp.DayOfYearStamp.MonthStamp.TimeStamp</AssemblyFileVersionSettings>
<AssemblyInfoVersionSettings>YearStamp.DateStamp.DeltaDayStamp.Increment</AssemblyInfoVersionSettings>
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
<AssemblyVersion>1.766.16.0</AssemblyVersion>
<AssemblyVersion>1.769.16.0</AssemblyVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
Expand Down
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/Bomb.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Bomb.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Bomb.png
map_Ka Bomb.png
map_Kd Bomb.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/DuckBody.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\DuckBody.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\DuckBody.png
map_Ka DuckBody.png
map_Kd DuckBody.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/DuckLWing.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\DuckLWing.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\DuckLWing.png
map_Ka DuckLWing.png
map_Kd DuckLWing.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/DuckRWing.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\DuckRWing.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\DuckRWing.png
map_Ka DuckRWing.png
map_Kd DuckRWing.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/ExtraLargeRock.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\ExtraLargeRock.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\ExtraLargeRock.png
map_Ka ExtraLargeRock.png
map_Kd ExtraLargeRock.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/GateDoor.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Gate-1.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Gate-1.png
map_Ka Gate-1.png
map_Kd Gate-1.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/GateFrame.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Gate-0.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Gate-0.png
map_Ka Gate-0.png
map_Kd Gate-0.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/GateWall.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Gate-2.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Gate-2.png
map_Ka Gate-2.png
map_Kd Gate-2.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/Ground.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Ground.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Ground.png
map_Ka Ground.png
map_Kd Ground.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/LargeRock.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\LargeRock.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\LargeRock.png
map_Ka LargeRock.png
map_Kd LargeRock.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/MedRock.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\MedRock.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\MedRock.png
map_Ka MedRock.png
map_Kd MedRock.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/Missile.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Missile.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Missile.png
map_Ka Missile.png
map_Kd Missile.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/MissileBatteryBase.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\MissileBattery-0.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\MissileBattery-0.png
map_Ka MissileBattery-0.png
map_Kd MissileBattery-0.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/MissileBatteryTurret.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\MissileBattery-1.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\MissileBattery-1.png
map_Ka MissileBattery-1.png
map_Kd MissileBattery-1.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/Mountain.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Mountain.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Mountain.png
map_Ka Mountain.png
map_Kd Mountain.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/SmallRock.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\SmallRock.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\SmallRock.png
map_Ka SmallRock.png
map_Kd SmallRock.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/TankBody.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankBody.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankBody.png
map_Ka TankBody.png
map_Kd TankBody.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/TankGun.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankGun.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankGun.png
map_Ka TankGun.png
map_Kd TankGun.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/TankTreads.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankTreads.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankTreads.png
map_Ka TankTreads.png
map_Kd TankTreads.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/TankTurret.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankTurret.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\TankTurret.png
map_Ka TankTurret.png
map_Kd TankTurret.png
4 changes: 2 additions & 2 deletions CFNGamejam2/Content/Models/Water.mtl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ newmtl palette
Kd 1.0000 1.0000 1.0000
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Water.png
map_Kd E:\Documents\Visual Studio 2017\Projects\VS2017C#\MonoGame\CFNGamejam2\CFNGamejam2\Content\Models\Water.png
map_Ka Water.png
map_Kd Water.png
5 changes: 3 additions & 2 deletions CFNGamejam2/Entities/UI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ public override void Update(GameTime gameTime)
viewPos.Y = 35;

Vector3 camRot = new Vector3();
camRot.Y = -Core.DefaultCamera.View.Rotation.Y;
camRot.X = -Core.DefaultCamera.View.Rotation.X;

camRot.Y = -Core.DefaultCamera.Rotation.Y;
camRot.X = -Core.DefaultCamera.Rotation.X;
TheScore.Change(viewPos + new Vector3(50, 0, 0), camRot);
TheScoreWords.Change(viewPos + new Vector3(-50, 0, 0), camRot);
}
Expand Down
4 changes: 2 additions & 2 deletions CFNGamejam2/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.766.16.0")]
[assembly: AssemblyFileVersion("0616.167.6.1658")]
[assembly: AssemblyVersion("1.769.16.0")]
[assembly: AssemblyFileVersion("0616.167.6.1722")]

0 comments on commit 965304d

Please sign in to comment.