Removed our location class due to upstream merge
Removed our location class due to upstream merge
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
Beginning making David and Alan's game
Fixed merge
Fixed Pixmap import.
Fixed merge conflict in the map from upstream. Added back the correct reachedGoal method
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
steps 1-5 done from the scroller API instructions on how to build a
game.
Fixed upstream merge problems in the level editor code. Changed test map to ensure this worked
change pictures and debug
Setting up developing environment for new game
Removed test code
Added more files to davidalan folder
Merge branch 'alananddayvid' of https://github.com/duke-compsci308-spring2013/vooga into alananddayvid
Resized ryu images
Merge branch 'jerryandjack' of https://github.com/duke-compsci308-spring2013/vooga into jerryandjack
Rescaled images
Fixed overwritted code in production
change pictures