4 Commits

Include renames

Author	SHA1	Message	Date
jancoow	3f8623d0bf	Merge remote-tracking branch 'origin/developer' into feature/Controller ... Added support for second controller # Conflicts: # CrystalPoint.cpp # CrystalPoint.h # CrystalPoint.vcxproj # CrystalPoint.vcxproj.filters	2016-06-21 11:24:55 +02:00
Remco	98f3645b6b	menu pauses game, able to resume the game. exit game by pause menu	2016-06-20 15:20:12 +02:00
Remco	6cf9437620	button is draw by menu	2016-06-20 12:11:24 +02:00
kennyboy55	ced3ff4462	Attempt implement menu (unresolved symbol error)	2016-06-09 17:56:37 +02:00