Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moved sprite images into 32/ and 48/ subfolders

  • Loading branch information...
commit d235f8d8ef3dd6901e293509443ac858d7f9be32 1 parent b94a5da
@dylanbeattie authored
View
10 .idea/workspace.xml
@@ -3,7 +3,6 @@
<component name="ChangeListManager">
<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/kaboom.game.js" afterPath="$PROJECT_DIR$/public/js/game/kaboom.game.js" />
</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" />
@@ -57,7 +56,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="122" column="63" selection-start="4350" selection-end="4350" vertical-scroll-proportion="1.1855501">
+ <state line="122" column="63" selection-start="4350" selection-end="4350" vertical-scroll-proportion="0.93760264">
<folding />
</state>
</provider>
@@ -287,7 +286,7 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1696" height="1004" extended-state="6" />
- <editor active="false" />
+ <editor active="true" />
<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" />
@@ -333,7 +332,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="First stab at implementing separate H/V collision detection so Marvin can &quot;wallbang&quot;..." />
+ <option name="LAST_COMMIT_MESSAGE" value="Fixed bug - was setting left and width of horizontal box instead of top and height. D'oh." />
<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" />
@@ -353,6 +352,7 @@
<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;..." />
+ <MESSAGE value="Fixed bug - was setting left and width of horizontal box instead of top and height. D'oh." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -411,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="122" column="63" selection-start="4350" selection-end="4350" vertical-scroll-proportion="1.1855501">
+ <state line="122" column="63" selection-start="4350" selection-end="4350" vertical-scroll-proportion="0.93760264">
<folding />
</state>
</provider>
View
BIN  public/images/32/blank.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/32/destroyable-block.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/32/solid-block.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/48/blank.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/48/destroyable-block.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/48/solid-block.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.