Permalink
Browse files

Fixed bug - was setting left and width of horizontal box instead of t…

…op and height. D'oh.
  • Loading branch information...
1 parent 471e09d commit b94a5da04daab75bb0042ff8bf00c6c464e21db8 @dylanbeattie committed Jun 5, 2011
Showing with 9 additions and 15 deletions.
  1. +7 −13 .idea/workspace.xml
  2. +2 −2 public/js/game/kaboom.game.js
View
@@ -1,16 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="7317696f-fc4e-428e-a525-03340f4ecdb5" name="Default" comment="Removed all hardcoded references to &quot;localhost&quot;. server.js will now listen on all available IPs on the specified port, and the KaboomClient passes window.location.hostname and window.location.port into the SocketClient init() routine. This means Kaboom now runs cleanly on remote servers.">
- <change type="DELETED" beforePath="D:\WebStorm\KaboomJS\public\images\blank.png" afterPath="" />
- <change type="DELETED" beforePath="D:\WebStorm\KaboomJS\public\images\destroyable-block.png" afterPath="" />
- <change type="DELETED" beforePath="D:\WebStorm\KaboomJS\public\images\solid-block.png" afterPath="" />
+ <list default="true" id="7317696f-fc4e-428e-a525-03340f4ecdb5" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/game/client.js" afterPath="$PROJECT_DIR$/public/js/game/client.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/game/kaboom.game.js" afterPath="$PROJECT_DIR$/public/js/game/kaboom.game.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/game/kaboom.renderer.js" afterPath="$PROJECT_DIR$/public/js/game/kaboom.renderer.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/game/kaboom.socket.js" afterPath="$PROJECT_DIR$/public/js/game/kaboom.socket.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/levelTest.htm" afterPath="$PROJECT_DIR$/public/levelTest.htm" />
</list>
<list id="07e85f89-abd1-48f0-9afd-84fa67e279d7" name="Failed commit: Default" comment="Removed all hardcoded references to &quot;localhost&quot;. server.js will now listen on all available IPs on the specified port, and the KaboomClient passes window.location.hostname and window.location.port into the SocketClient init() routine. This means Kaboom now runs cleanly on remote servers." />
<ignored path="KaboomJS.iws" />
@@ -64,7 +57,7 @@
<file leaf-file-name="kaboom.game.js" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/js/game/kaboom.game.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="2" selection-start="481" selection-end="481" vertical-scroll-proportion="0.37438422">
+ <state line="122" column="63" selection-start="4350" selection-end="4350" vertical-scroll-proportion="1.1855501">
<folding />
</state>
</provider>
@@ -296,20 +289,20 @@
<frame x="-8" y="-8" width="1696" height="1004" extended-state="6" />
<editor active="false" />
<layout>
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3278496" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Phing Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5652174" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21800368" sideWeight="0.74735606" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21800368" sideWeight="0.74735606" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25264394" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32858709" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -340,7 +333,7 @@
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Implemented a MockSocket fallback so if the client can't connect to a remote socket server, it'll use a local loopback server instead.&#10;" />
+ <option name="LAST_COMMIT_MESSAGE" value="First stab at implementing separate H/V collision detection so Marvin can &quot;wallbang&quot;..." />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -359,6 +352,7 @@
<MESSAGE value="Null reference checking before syncing level state on kaboom.game.js" />
<MESSAGE value="Removed all hardcoded references to &quot;localhost&quot;. server.js will now listen on all available IPs on the specified port, and the KaboomClient passes window.location.hostname and window.location.port into the SocketClient init() routine. This means Kaboom now runs cleanly on remote servers." />
<MESSAGE value="Implemented a MockSocket fallback so if the client can't connect to a remote socket server, it'll use a local loopback server instead.&#10;" />
+ <MESSAGE value="First stab at implementing separate H/V collision detection so Marvin can &quot;wallbang&quot;..." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -417,7 +411,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/js/game/kaboom.game.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="2" selection-start="481" selection-end="481" vertical-scroll-proportion="0.37438422">
+ <state line="122" column="63" selection-start="4350" selection-end="4350" vertical-scroll-proportion="1.1855501">
<folding />
</state>
</provider>
@@ -106,8 +106,8 @@ KaboomGame.prototype = {
verticalHitTestRect.width -= 16;
var horizontalHitTestRect = playerRect.contract(4);
- horizontalHitTestRect.left += 8;
- horizontalHitTestRect.width -= 16;
+ horizontalHitTestRect.top += 8;
+ horizontalHitTestRect.height -= 16;
var canMoveVertically = true;
var canMoveHorizontally = true;

0 comments on commit b94a5da

Please sign in to comment.