diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Axios_WP7.csproj
--- a/axios/Axios_WP7.csproj Wed Mar 21 00:12:11 2012 -0500
+++ b/axios/Axios_WP7.csproj Fri Mar 23 22:19:58 2012 -0500
@@ -179,6 +179,7 @@
+
diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Axios_Windows.csproj
--- a/axios/Axios_Windows.csproj Wed Mar 21 00:12:11 2012 -0500
+++ b/axios/Axios_Windows.csproj Fri Mar 23 22:19:58 2012 -0500
@@ -219,6 +219,7 @@
+
diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Axios_Xbox_360.csproj
--- a/axios/Axios_Xbox_360.csproj Wed Mar 21 00:12:11 2012 -0500
+++ b/axios/Axios_Xbox_360.csproj Fri Mar 23 22:19:58 2012 -0500
@@ -172,6 +172,7 @@
+
diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Axios_settings.cs
--- a/axios/Axios_settings.cs Wed Mar 21 00:12:11 2012 -0500
+++ b/axios/Axios_settings.cs Fri Mar 23 22:19:58 2012 -0500
@@ -48,6 +48,8 @@
* - Adding field to allow/disallow automated mouse joints per object
* - Fixing bug with last screen not exiting if it is a background screen
*
+ * 1.0.1.1 - 3/22/2012
+ *
*
*/
diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Engine/AxiosGameScreen.cs
--- a/axios/Engine/AxiosGameScreen.cs Wed Mar 21 00:12:11 2012 -0500
+++ b/axios/Engine/AxiosGameScreen.cs Fri Mar 23 22:19:58 2012 -0500
@@ -283,15 +283,15 @@
Rectangle uirect;
bool foundobject = false;
Vector2 mousepos = ConvertUnits.ToSimUnits(input.Cursor);
- Vector2 objpos;
+ //Vector2 objpos;
//System.Diagnostics.Debugger.Break();
foreach(AxiosUIObject uiobject in _uiobjects)
{
uiobjpos = uiobject.Position;
- objpos = this.Camera.ConvertScreenToWorld(uiobjpos);
+ //objpos = this.Camera.ConvertScreenToWorld(uiobjpos);
- uirect = new Rectangle((int)uiobjpos.X, (int)uiobjpos.Y, (int)ConvertUnits.ToSimUnits(uiobject.Width), (int)ConvertUnits.ToSimUnits(uiobject.Height));
-
+ uirect = new Rectangle((int)uiobjpos.X, (int)uiobjpos.Y, (int)Math.Ceiling(ConvertUnits.ToSimUnits(uiobject.Width)), (int)Math.Ceiling(ConvertUnits.ToSimUnits(uiobject.Height) + 1));
+
if (uirect.Contains((int)position.X, (int)position.Y))
{
diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Engine/Structures/AxiosPoint.cs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/axios/Engine/Structures/AxiosPoint.cs Fri Mar 23 22:19:58 2012 -0500
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Axios.Engine.Structures
+{
+ class AxiosPoint
+ {
+
+ }
+}
diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Engine/Structures/AxiosRectangle.cs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/axios/Engine/Structures/AxiosRectangle.cs Fri Mar 23 22:19:58 2012 -0500
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Axios.Engine.Structures
+{
+ class AxiosRectangle
+ {
+ private float _width;
+ private float _height;
+ private float _x;
+ private float _y;
+
+ public float Width
+ {
+ get { return _width; }
+ set { _width = value; }
+ }
+
+ public float Height
+ {
+ get { return _height; }
+ set { _height = value; }
+ }
+
+ public float X
+ {
+ get { return _x; }
+ set { _x = value; }
+ }
+
+ public float Y
+ {
+ get { return _y; }
+ set { _y = value; }
+ }
+
+ public float Top
+ {
+
+ }
+
+ public float Bottom
+ {
+ get { return _y + _height; }
+ }
+
+ public bool Intersect(AxiosRectangle rect)
+ {
+ bool intersects = false;
+
+
+
+ return intersects;
+ }
+
+ public AxiosRectangle(float X, float Y, float width, float height)
+ {
+ _width = width;
+ _height = height;
+ _x = X;
+ _y = Y;
+ }
+
+
+ }
+}
diff -r 5f677872a79bd00352c998b7a4bd5edb8379cc33 -r 89349dfb846109efa7746c3c35c616ab778962de axios/Properties/AssemblyInfo.cs
--- a/axios/Properties/AssemblyInfo.cs Wed Mar 21 00:12:11 2012 -0500
+++ b/axios/Properties/AssemblyInfo.cs Fri Mar 23 22:19:58 2012 -0500
@@ -31,7 +31,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.0.9")]
+[assembly: AssemblyVersion("1.0.1.0")]
#if DEBUG
[assembly: AssemblyConfiguration("Debug")]