commmitcommitcomim
t
added view
gameview class
some changes to entry point (canvas stuff)
Merge branch 'master' of git@github.com:pholtz/magicprogram.git

Conflicts:
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Board.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogramUI/.classpath
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
gameview update
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
fixed creep test class after changes to creep.java
more gameview work
accidentally changed packages into folders
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/test/edu/ycp/cs320/magicprogramtest/TestCreep.java
	magicprogramUI/.classpath
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
game change
replaced tower array with terrain array(all emcompassing)
semi fixed waypoints issue
added rpc service (authored by D. Hovemeyer
commit to merge
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Terrain.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Tower.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Point.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Structure.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Tower.java
	magicprogramUI/.classpath
	magicprogramUI/.settings/com.google.gdt.eclipse.core.prefs
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameController.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java