projects / ghostsoverboard / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 878d9e7 67541ef)
The menu is now located on the game screen.
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Wed, 20 Jul 2011 08:36:58 +0000 (11:36 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Wed, 20 Jul 2011 08:36:58 +0000 (11:36 +0300)
commited1ca09c651348279b1a114c0eb4b8968154f817
tree37bb22861feb26db5c26bbd3fbb19f122f810ddatree | snapshot
parent878d9e71b972d86895673789925fdbe819dd763ccommit | diff
parent67541efd8bc06e053aa1858b61a30510d8a37c5fcommit | diff
The menu is now located on the game screen.
The game is paused (and the menu revealed) by tapping the screen.
When tapping anything but menu items the game is unpaused.
All functionality of MainWindow has been moved to SeaScene and SeaView.
SeaView is the main widget now.

Merge branch 'onviewmenu' into harmattan

Conflicts:
mainwindow.cpp
qtc_packaging/debian_harmattan/README
qtc_packaging/debian_harmattan/changelog
qtc_packaging/debian_harmattan/copyright
Unnamed repository; edit this file to name it for gitweb.