try one
Rendering shapes.
Adding needed width and height in triangle attr.
Implementing triangle component.
Merge remote-tracking branch 'upstream/master'
Implementing shape components using Crafty shapes

Shape components are using the "2D" component variables to define
themselves. This is creating an inaccurate collision box for the
"Collision" component. Switching to use of built-in polygon hitboxes.

Separating shape component logic from game logic.
Merge remote-tracking branch 'upstream/master'
Merge branch 'shapes'

Conflicts:
	game.js

Movement is broken and I don't know why!
Things are broken in ways I do not understand.

Making everything simpler.
Code cleanup

shapes.js never worked properly, deleting.

README.txt isn't actually used, deleting.

index.html updated with new positions.

Creating a style.css file for style purposes.

Putting all javascript into js directory.
- game.js on the first level
- movement.js in the lib directory within
- crafty.js in the js/lib/external area

Switching to development mode crafty (so looking at the code
documentation is easier).

Adding jquery.js to external lib area (because jquery should be used).
Collisions no longer stick on top of themselves
Readding shapes to lib area.
Successfully implementing "elastic" collisions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.txt
Merge branch 'master' into andy_master_merge

Conflicts:
	game.js
Removing shapes from codebase.

Shapes don't work correctly. Rendering is weird, collisions are weird.
Not playing nice with crafty components.
Moving color changing code only to demo

Objects shouldn't change color in the game when colliding. It's just a
means of verifying collisions are working as desired. Moving that code
into a demo, and making colors not appear in main game.
Adding control options.

Creating player control logic file alice.js.

Defaulting one unit to user control (nicknamed "Alice").

Left-clicking any square will make that Alice, and the old Alice will no
longer be an Alice.

Right-clicking applies velocity changes to Alice.
eatme
index