Permalink
Browse files

Fixed player CSS so they're all different colours

  • Loading branch information...
dylanbeattie committed Jun 5, 2011
1 parent 4630165 commit 2665a7c98c9d8f23a757b7f3707d620a02d3a13f
Showing with 33 additions and 33 deletions.
  1. +30 −30 .idea/workspace.xml
  2. +3 −3 public/css/bomber.css
View
@@ -1,7 +1,10 @@
<?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="" />
+ <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/css/bomber.css" afterPath="$PROJECT_DIR$/public/css/bomber.css" />
+ </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" />
<ignored path=".idea/workspace.xml" />
@@ -27,7 +30,7 @@
<file leaf-file-name="server.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="0" selection-start="573" selection-end="573" vertical-scroll-proportion="0.0">
+ <state line="71" column="23" selection-start="1904" selection-end="1904" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -69,10 +72,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="kaboom.renderer.js" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="kaboom.renderer.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/game/kaboom.renderer.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="141" column="17" selection-start="5358" selection-end="5358" vertical-scroll-proportion="0.5365854">
+ <state line="139" column="50" selection-start="5269" selection-end="5269" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -87,10 +90,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="bomber.css" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="bomber.css" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/css/bomber.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="51" selection-start="1014" selection-end="1014" vertical-scroll-proportion="0.0">
+ <state line="75" column="38" selection-start="1068" selection-end="1068" vertical-scroll-proportion="0.6178862">
<folding />
</state>
</provider>
@@ -132,14 +135,14 @@
<option value="$PROJECT_DIR$/doc/object_idea_hacks.txt" />
<option value="$PROJECT_DIR$/etc/client_hax.txt" />
<option value="$PROJECT_DIR$/public/js/game/level.js" />
- <option value="$PROJECT_DIR$/server.js" />
<option value="$PROJECT_DIR$/public/js/game/kaboom.socket.js" />
<option value="$PROJECT_DIR$/public/js/game/client.js" />
<option value="$PROJECT_DIR$/public/index.html" />
- <option value="$PROJECT_DIR$/public/css/bomber.css" />
<option value="$PROJECT_DIR$/public/js/game/kaboom.game.js" />
<option value="$PROJECT_DIR$/public/js/game/kaboom.player.js" />
<option value="$PROJECT_DIR$/public/js/game/kaboom.renderer.js" />
+ <option value="$PROJECT_DIR$/server.js" />
+ <option value="$PROJECT_DIR$/public/css/bomber.css" />
</list>
</option>
</component>
@@ -377,7 +380,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" />
@@ -386,7 +389,7 @@
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10105758" 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.8989424" 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.8989424" 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="false" weight="0.25264394" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -450,16 +453,6 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/etc/client_hax.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state line="7" column="1" selection-start="170" selection-end="170" vertical-scroll-proportion="0.21341464" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/server.js">
- <provider selected="true" editor-type-id="text-editor">
- <state line="19" column="0" selection-start="573" selection-end="573" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/data/level.txt">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="0" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0" />
@@ -484,37 +477,44 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/css/bomber.css">
+ <entry file="file://$PROJECT_DIR$/public/js/game/kaboom.game.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="51" selection-start="1014" selection-end="1014" vertical-scroll-proportion="0.0">
+ <state line="146" column="0" selection-start="4650" selection-end="4650" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/index.html">
+ <entry file="file://$PROJECT_DIR$/public/js/game/kaboom.player.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="31" selection-start="907" selection-end="907" vertical-scroll-proportion="-12.086957">
+ <state line="54" column="6" selection-start="1337" selection-end="1337" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/js/game/kaboom.game.js">
+ <entry file="file://$PROJECT_DIR$/public/js/game/kaboom.renderer.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="146" column="0" selection-start="4650" selection-end="4650" vertical-scroll-proportion="0.0">
+ <state line="139" column="50" selection-start="5269" selection-end="5269" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/js/game/kaboom.player.js">
+ <entry file="file://$PROJECT_DIR$/server.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="54" column="6" selection-start="1337" selection-end="1337" vertical-scroll-proportion="0.0">
+ <state line="71" column="23" selection-start="1904" selection-end="1904" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/js/game/kaboom.renderer.js">
+ <entry file="file://$PROJECT_DIR$/public/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="31" selection-start="907" selection-end="907" vertical-scroll-proportion="-12.086957">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/public/css/bomber.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="141" column="17" selection-start="5358" selection-end="5358" vertical-scroll-proportion="0.5365854">
+ <state line="75" column="38" selection-start="1068" selection-end="1068" vertical-scroll-proportion="0.6178862">
<folding />
</state>
</provider>
View
@@ -65,15 +65,15 @@ body {
}
#player_2 {
- background: url(../images/player-1-sprite.png);
+ background: url(../images/player-2-sprite.png);
}
#player_3 {
- background: url(../images/player-1-sprite.png);
+ background: url(../images/player-3-sprite.png);
}
#player_4 {
- background: url(../images/player-1-sprite.png);
+ background: url(../images/player-4-sprite.png);
}
.boundingBox {

0 comments on commit 2665a7c

Please sign in to comment.