gamestate

skeleton for gamestate
lives and points
gamestate

added get methodes
This commit contains the framework for drawing and updating logic of all
objects to be drawn/that will interact.
Removing database directories

This should greatly improve organization in the project. Just for the
record, it were 58 flipping directories.
Merge remote-tracking branch 'origin/Phoenix' into vincent
Merge remote-tracking branch 'origin/Startscherm-+-Grond-+-Geluidjes' into vincent
Intergreren

code is samengevoegd, kan niet tesen heb blobresult niet.
Merge branch 'master' of https://github.com/viny93/JTI2.4-A2
working includes

.h files should no longer cause problems
Removing test.cpp and pyramid.cpp

These classes were giving errors upon compiling because they have the
same method names as Startscreen.cpp
Moving intro.png to MyOpenCV map

Otherwise it won't work in application.
Fixed missing classes

Removed the references to the removed classes 'test' and 'pyramid' from
the .vcxproj file. This will stop the conflict where Visual Studo thinks
they still exist.
Also removed pingme.txt in the ongoing effort to clean up the project.
cleard

cleared master branch for clean commit of working code
Merge remote-tracking branch 'origin/vincent'

Conflicts:
	Squishy/Camera.cpp
	Squishy/Debug/Squishy.exe
	Squishy/Debug/Squishy.ilk
	Squishy/Debug/Squishy.pdb
	Squishy/Squishy.sdf
	Squishy/Squishy.v11.suo
	Squishy/main.cpp
	Squishy/main.h
	Squishy/myNewOpenCV/Debug/CL.read.1.tlog
	Squishy/myNewOpenCV/Debug/CL.write.1.tlog
	Squishy/myNewOpenCV/Debug/Squishy.lastbuildstate
	Squishy/myNewOpenCV/Debug/cl.command.1.tlog
	Squishy/myNewOpenCV/Debug/link.command.1.tlog
	Squishy/myNewOpenCV/Debug/link.read.1.tlog
	Squishy/myNewOpenCV/Debug/link.write.1.tlog
	Squishy/myNewOpenCV/Debug/main.obj
	Squishy/myNewOpenCV/Debug/myNewOpenCV.log
	Squishy/myNewOpenCV/Debug/vc110.idb
	Squishy/myNewOpenCV/Debug/vc110.pdb
	Squishy/myNewOpenCV/myNewOpenCV.vcxproj
	Squishy/myNewOpenCV/myNewOpenCV.vcxproj.filters
	Squishy/stb_image.cpp
	Squishy/stb_image.h
working and intergrated code

added local libraries
First draft in fatal collision and enemies

First draft in fatal collision and enemies

This contains a first draft of fatal collision that required the
expansion of quite a few classes:
- RenderObject now has standard fields for the location and boundingbox
of the object.
- RenderObject contains a field to hold its own type following an
Enumerator.
- World now specifies that it is of Enum WORLD.
- Player now keeps track of its own location, bounding box, and Enum
PLAYER.
- Main has had its UpdateAll updated to check for collision between the
player and enemies. Can easily be expanded for traps.
- Collision with walls requires a different tactic, to be specified
later once the heightmap is done.

Other changes:
- GameState has been added to the projectlist.
- Kirby.wavhas been disabled.
- Remapped the movement keys to WASD.
added gamestate and ricardo's fatal colission