Heli Hyvättinen [Wed, 27 Jul 2011 21:33:44 +0000 (00:33 +0300)]
Changed back to using forcePause and softContinue when app
activated/Deactivated
Previous change caused funny behaviour with showstatusbar
Also removed a misleading comment from seascene.cpp
Heli Hyvättinen [Wed, 27 Jul 2011 08:02:40 +0000 (11:02 +0300)]
Polls for screen locked status
to pause when locked
Heli Hyvättinen [Wed, 27 Jul 2011 06:47:26 +0000 (09:47 +0300)]
Should pause at device lock
Would fix the bug that device unlocks itself a while after being locked
by user by lock key.
Also moved to use normal pause when app goes background and not
unpausing when going foreground. Former way was bug risky.
The signal used would require QtMobility 1.2. That would lock the app
into extras-devel until 1.2 gets to extras, if ever.
Heli Hyvättinen [Tue, 26 Jul 2011 20:43:43 +0000 (23:43 +0300)]
Fixed autopause
No longer uses forcePause(), thus no longer messes up the pause system.
(forcePause() requires to be returned from with softContinue() )
Heli Hyvättinen [Tue, 26 Jul 2011 18:58:42 +0000 (21:58 +0300)]
Added autopause to upgrade sescription in debian control file
Heli Hyvättinen [Tue, 26 Jul 2011 18:52:34 +0000 (21:52 +0300)]
Added autopause to changelog
Heli Hyvättinen [Tue, 26 Jul 2011 18:32:21 +0000 (21:32 +0300)]
Removed unused pic from qrc
Heli Hyvättinen [Tue, 26 Jul 2011 17:36:15 +0000 (20:36 +0300)]
Clarified menu item text
"Vibration effects on" is now "Turn vibration effects on". Same for off.
Heli Hyvättinen [Tue, 26 Jul 2011 15:21:25 +0000 (18:21 +0300)]
Upped version number to 0.3.0 and changed packaging files to reflect it
Heli Hyvättinen [Tue, 26 Jul 2011 15:06:40 +0000 (18:06 +0300)]
Outcommented some qDebug()s
Heli Hyvättinen [Tue, 26 Jul 2011 14:04:03 +0000 (17:04 +0300)]
Centered the texts in victory screen
Heli Hyvättinen [Tue, 26 Jul 2011 13:10:25 +0000 (16:10 +0300)]
Add web page address to about
Conflicts:
seascene.cpp
Heli Hyvättinen [Tue, 26 Jul 2011 13:05:09 +0000 (16:05 +0300)]
Added aboutboxitem and vivtoryscreenitem to set items to NULL function
Heli Hyvättinen [Tue, 26 Jul 2011 13:02:02 +0000 (16:02 +0300)]
Merge branch 'victoryscreen'
Victory dialog integrated to view/scene
Conflicts:
seascene.cpp
seascene.h
Heli Hyvättinen [Mon, 25 Jul 2011 18:57:39 +0000 (21:57 +0300)]
About box integrated to view/scene
Heli Hyvättinen [Mon, 25 Jul 2011 17:26:59 +0000 (20:26 +0300)]
Victory screen integrated into the game view/scene
Tap screen return from -pause did not work once, could not repeat the
bug. Menu worked.
Heli Hyvättinen [Mon, 25 Jul 2011 13:26:20 +0000 (16:26 +0300)]
Menu no longer crashes randomly
Moved the unpausing to be handled by each menu item themselves. Now
unpauses only after restart game and restart level.
Mysterios crashes caused by the former unpause if condition thus gone.
Heli Hyvättinen [Mon, 25 Jul 2011 13:08:34 +0000 (16:08 +0300)]
Fixed a typo
compiles again
Heli Hyvättinen [Mon, 25 Jul 2011 12:31:24 +0000 (15:31 +0300)]
Merge branch 'base'
Vibration menu item is now togglable
Conflicts:
seascene.cpp
Heli Hyvättinen [Mon, 25 Jul 2011 12:25:55 +0000 (15:25 +0300)]
The togglable vibration menu item now works correctly
Heli Hyvättinen [Mon, 25 Jul 2011 11:52:54 +0000 (14:52 +0300)]
Cleaned up after merge with mergetool
Handling tapping vibration item now makes sense again
Heli Hyvättinen [Mon, 25 Jul 2011 11:43:27 +0000 (14:43 +0300)]
Merge branch 'savingsettings' into base
Conflicts:
seascene.cpp
Heli Hyvättinen [Mon, 25 Jul 2011 11:42:14 +0000 (14:42 +0300)]
Togglable vibration effects menu item
Does not update its text.
Heli Hyvättinen [Sat, 23 Jul 2011 11:50:21 +0000 (14:50 +0300)]
Merge branch 'minimizebutton'
Heli Hyvättinen [Sat, 23 Jul 2011 11:49:38 +0000 (14:49 +0300)]
"Go to background ims no "Show statusbar" and works
Menu layout changed to suite 6 menu items.
Heli Hyvättinen [Sat, 23 Jul 2011 09:10:21 +0000 (12:10 +0300)]
Merge branch 'autopause3'
Heli Hyvättinen [Sat, 23 Jul 2011 09:02:17 +0000 (12:02 +0300)]
Vibration setting is now saved
Heli Hyvättinen [Wed, 20 Jul 2011 13:49:45 +0000 (16:49 +0300)]
Autopausetimer now singleshot
Heli Hyvättinen [Wed, 20 Jul 2011 13:48:17 +0000 (16:48 +0300)]
Tried to add minimize to menu CRASHES
Heli Hyvättinen [Wed, 20 Jul 2011 13:16:24 +0000 (16:16 +0300)]
Added autopause
Autopauses after 15 minutes. Restarted at start of level and returning
from pause. Timer stopped during paused.
Heli Hyvättinen [Wed, 20 Jul 2011 07:59:43 +0000 (10:59 +0300)]
Changed menu text for settings
It is now "vibration effects", since that is the only setting for now,
and a two row text is easier to hit.
Heli Hyvättinen [Wed, 20 Jul 2011 07:52:16 +0000 (10:52 +0300)]
Bigger quit and about menu buttons and about box icon back
Changed "Quit" and "About" to "Quit game" and "About game", so that they
are easier to hit. Set the default window icon in QApplication, brought
about box icon back.
Heli Hyvättinen [Tue, 19 Jul 2011 18:07:37 +0000 (21:07 +0300)]
added .desktop file for Harmattan
Heli Hyvättinen [Tue, 19 Jul 2011 18:05:36 +0000 (21:05 +0300)]
Color and font size of menu pause text and menu items changed
...for better visibility and appearance.
Heli Hyvättinen [Tue, 19 Jul 2011 13:45:15 +0000 (16:45 +0300)]
Added a "Quit" item to the menu.
The application can again be exited on N900...
Heli Hyvättinen [Tue, 19 Jul 2011 13:21:41 +0000 (16:21 +0300)]
Game is now inpaused after done with menu
Heli Hyvättinen [Tue, 19 Jul 2011 13:17:16 +0000 (16:17 +0300)]
Got rid of MainWindow
All remaining functionality moved to SeaView, which is now directly
created in main.cpp
Heli Hyvättinen [Tue, 19 Jul 2011 13:04:16 +0000 (16:04 +0300)]
The app is now fullscreen
Heli Hyvättinen [Tue, 19 Jul 2011 12:59:01 +0000 (15:59 +0300)]
The menu items trigger expected behaviour
Restart level and restart game made functional.
Settings prompts a temporary solution dialog asking whether vibration
effects should be enabled and acts on the answer.
Heli Hyvättinen [Tue, 19 Jul 2011 12:01:32 +0000 (15:01 +0300)]
Moved menu actions to SeaScene from MainWindow
Also, the levellist information is now stored in the SeaScene itself
instead of MainWindow
Also, when tapping the screen in paused state: if menu item is selected
act upon it and clear the selection. Otherwise unpause.
Also, moved checking for minimizing and maximizing events to SeaView
from MainWindow.
Heli Hyvättinen [Sat, 16 Jul 2011 21:00:02 +0000 (00:00 +0300)]
All menu items in place. Still do nothing.
Substituted vibrate with settings, as togglable hard to implement and
other settings will come later. Must make it to open a dialog where
vibrate can be changed and the settings are saved.
Heli Hyvättinen [Sat, 16 Jul 2011 20:32:30 +0000 (23:32 +0300)]
Menu items can be selected
Do nothing but give a debug message, though. Also, the game is unpaused
when selecting a menu item.
Heli Hyvättinen [Sat, 16 Jul 2011 18:12:01 +0000 (21:12 +0300)]
Pause/unpause by tapping the screen now works
Using toggled() signal instead of triggered() now in checkable QActions.
Heli Hyvättinen [Sat, 16 Jul 2011 16:06:38 +0000 (19:06 +0300)]
work towards new pause and menu systems
Heli Hyvättinen [Wed, 13 Jul 2011 14:36:35 +0000 (17:36 +0300)]
Updated the web page to reflect release of v.0.2.1
Heli Hyvättinen [Wed, 13 Jul 2011 13:15:47 +0000 (16:15 +0300)]
Fixed a bug in vibration effects and upped version number
Vibration effects no longer disappear when changing or restarting level.
Version is now 0.2.1.
Updated changelog and upgrade message in control.
Heli Hyvättinen [Wed, 13 Jul 2011 12:03:39 +0000 (15:03 +0300)]
Updated the web page to reflect release of v.0.2.0
Heli Hyvättinen [Tue, 12 Jul 2011 18:24:55 +0000 (21:24 +0300)]
Restored debian files listing in .pro file
Had disappeared during careless branch hopping...
Heli Hyvättinen [Tue, 12 Jul 2011 00:31:16 +0000 (03:31 +0300)]
Removed SeaView class files from project
They are not used (never been).
Heli Hyvättinen [Tue, 12 Jul 2011 00:27:37 +0000 (03:27 +0300)]
Updated files under /debian to reflect version 0.2.0
Heli Hyvättinen [Mon, 11 Jul 2011 21:52:35 +0000 (00:52 +0300)]
Added copyright & licence info where missing
Heli Hyvättinen [Mon, 11 Jul 2011 21:49:56 +0000 (00:49 +0300)]
Upped the version number to 0.2.0
Heli Hyvättinen [Mon, 11 Jul 2011 20:55:36 +0000 (23:55 +0300)]
Fine tuned levels
Changed number of octopuses for third and fourth levels to avoid fift
level look like reloading the fourth.
Heli Hyvättinen [Tue, 5 Jul 2011 16:04:45 +0000 (19:04 +0300)]
Moved "Restart game" place in menu
Is now after "Restart Level" (instead of after "About").
Heli Hyvättinen [Tue, 5 Jul 2011 15:56:37 +0000 (18:56 +0300)]
Merge branch 'levelstructure'
Conflicts:
mainwindow.cpp
Multiple levels now supported. 5 levels now.
"Restart game" added to the menu.
Heli Hyvättinen [Mon, 4 Jul 2011 16:32:51 +0000 (19:32 +0300)]
Changes in levels (numbers of ghosts and speeds of octopuses)
Heli Hyvättinen [Mon, 4 Jul 2011 16:28:22 +0000 (19:28 +0300)]
"Vibration effects" now in menu before "Pause"
Heli Hyvättinen [Mon, 4 Jul 2011 16:25:18 +0000 (19:25 +0300)]
The initial directions of octopuses are now random
Heli Hyvättinen [Fri, 1 Jul 2011 05:15:21 +0000 (08:15 +0300)]
The menu option "Vibration effects" now works
Heli Hyvättinen [Wed, 29 Jun 2011 15:02:22 +0000 (18:02 +0300)]
Vibration on/off now in the menu.
Defaults to off.
Untested for now.
Heli Hyvättinen [Mon, 27 Jun 2011 11:39:07 +0000 (14:39 +0300)]
Vibration when hitting rocks and octopuses
Vibrates when hits or gets hit by something that drops ghots (or would
drop if there were any). Bit too loud vibrating sound.
Heli Hyvättinen [Sun, 26 Jun 2011 09:55:38 +0000 (12:55 +0300)]
Removed obsolete include
Heli Hyvättinen [Sun, 26 Jun 2011 09:46:06 +0000 (12:46 +0300)]
Octopuses now stopped if speed is set 0 (or less) on the go
Change made in the base class of Octopus,
TimerControlledGraphicsPixmapObject.
The game does not actually change speed after starting movement for the
first time.
Heli Hyvättinen [Thu, 23 Jun 2011 19:14:25 +0000 (22:14 +0300)]
Octopus speed given can now be zero or less
If it is the octopus won't move.
Heli Hyvättinen [Thu, 23 Jun 2011 12:01:34 +0000 (15:01 +0300)]
Now supports multiple levels.
Now has 5 levels.
Heli Hyvättinen [Thu, 23 Jun 2011 11:21:48 +0000 (14:21 +0300)]
Added a Level class
...and SeaScene now accepts it as a parameter to setupMap
Heli Hyvättinen [Thu, 23 Jun 2011 06:22:58 +0000 (09:22 +0300)]
Edited the web page
Clarified a phrase.
Heli Hyvättinen [Thu, 23 Jun 2011 06:09:29 +0000 (09:09 +0300)]
Added author, copyright and license information to source files.
Forgot to add them before first release...
Also changed my screenlitkeeper to correctly state GPLv2.
Heli Hyvättinen [Tue, 21 Jun 2011 16:17:16 +0000 (19:17 +0300)]
Edited the web page
Scaled screenshot smaller, added link to git repository
Heli Hyvättinen [Tue, 21 Jun 2011 07:53:05 +0000 (10:53 +0300)]
Octopuses no longer need fixed pixmap size
Also removed obsolete Timercontrolletursas class
Heli Hyvättinen [Tue, 21 Jun 2011 07:41:55 +0000 (10:41 +0300)]
Qctopuses now drop the ghosts when hitting the ship
Heli Hyvättinen [Mon, 20 Jun 2011 17:35:06 +0000 (20:35 +0300)]
Class restructure for octopus
Class TimerControlledTursas replaced by class Octopus that derives from
the class TimerControlledGraphicsPixmapObject (where most of the
contents of TimerControlledTursas now are).
Also updated UML model.
Some work towards dropping the ghosts when the ship is hit by an
octopus.
Heli Hyvättinen [Mon, 20 Jun 2011 16:31:07 +0000 (19:31 +0300)]
Octopuses stay on the screen now
Heli Hyvättinen [Mon, 20 Jun 2011 16:07:33 +0000 (19:07 +0300)]
Octopuses now change direction
...when crossing borders or hitting something.
Heli Hyvättinen [Sat, 18 Jun 2011 17:23:05 +0000 (20:23 +0300)]
Created a web page for the app.
Heli Hyvättinen [Sat, 18 Jun 2011 12:11:11 +0000 (15:11 +0300)]
Added debian compat and rules files to git
These are unchanged QtCreator generated files.
Heli Hyvättinen [Sat, 18 Jun 2011 12:07:25 +0000 (15:07 +0300)]
Added libqtm-dev and libqtm-sensors to build-depends
Heli Hyvättinen [Sat, 18 Jun 2011 09:32:22 +0000 (12:32 +0300)]
Changed the program icon etc.
Changed the desktop icon, the icon shown in application manager and the
icon in about box.
Changed the description shown in program manager.
Fine tuning in packaging files.
Cleaned away debug messages.
Heli Hyvättinen [Sat, 18 Jun 2011 08:18:53 +0000 (11:18 +0300)]
Merge remote-tracking branch 'garage/master'
root [Thu, 16 Jun 2011 09:20:02 +0000 (12:20 +0300)]
welcome
Heli Hyvättinen [Wed, 15 Jun 2011 11:30:54 +0000 (14:30 +0300)]
Keeps screen lit and pauses when app is backgrounded
The screen is now kept lit unless the game is paused. The game is auto-
(paused or not) before minimizing is restored (using the state of the
pause action from menu).
Heli Hyvättinen [Tue, 14 Jun 2011 19:01:34 +0000 (22:01 +0300)]
started to use fixed scene size and upped version number to 0.1.0
Fixed scene size is a workaround for a bug in dynamic setting of scene
size. Dynamic setting would be needed for flexible portability.
The game should now be playable. (Although there is just one level, no
octopuses and the screen does not stay lit.)
Heli Hyvättinen [Tue, 14 Jun 2011 18:50:55 +0000 (21:50 +0300)]
Bugtracker adress now fully visible in the about box
Heli Hyvättinen [Tue, 14 Jun 2011 17:48:22 +0000 (20:48 +0300)]
Added bugtracker info
...to about box and the debian control file
Heli Hyvättinen [Tue, 14 Jun 2011 17:38:39 +0000 (20:38 +0300)]
Pause works again
Pause re-created to fit current code and stop octopuses too.
(untested for octopuses)
Window title now correct.
Heli Hyvättinen [Tue, 14 Jun 2011 16:56:40 +0000 (19:56 +0300)]
Set up packaging from QtCreator
Heli Hyvättinen [Tue, 14 Jun 2011 12:10:35 +0000 (15:10 +0300)]
Cleaned away some outcommented and debug code
Heli Hyvättinen [Tue, 14 Jun 2011 12:03:58 +0000 (15:03 +0300)]
Victory dialog shown and game restarted when all ghosts found
Does not support more than one level yet.
Heli Hyvättinen [Tue, 14 Jun 2011 08:32:41 +0000 (11:32 +0300)]
Merge branch 'randomize'
Heli Hyvättinen [Tue, 14 Jun 2011 08:31:16 +0000 (11:31 +0300)]
Debug code changes
Heli Hyvättinen [Tue, 14 Jun 2011 08:23:07 +0000 (11:23 +0300)]
Now sets random seed
And moved setting the background to the constructor of SeaScene.
Heli Hyvättinen [Tue, 14 Jun 2011 02:32:49 +0000 (05:32 +0300)]
Fixed crashes when restrating level
...caused by list of moving items not cleared when setting up map,
leaving already deleted objects in the list.
Heli Hyvättinen [Tue, 14 Jun 2011 01:41:07 +0000 (04:41 +0300)]
Merge branch 'shipimages'
Heli Hyvättinen [Tue, 14 Jun 2011 01:39:54 +0000 (04:39 +0300)]
Added the number of ghots to test ship images
Heli Hyvättinen [Tue, 14 Jun 2011 01:32:34 +0000 (04:32 +0300)]
Corrected the file name for the about box image
Heli Hyvättinen [Tue, 14 Jun 2011 01:31:33 +0000 (04:31 +0300)]
Added the about box
Heli Hyvättinen [Fri, 10 Jun 2011 02:06:31 +0000 (05:06 +0300)]
Spread ghost should no longer be placed on top of the ship and octupuses
Slots occupied by moving objects now excluded when randomizimg ghost
placing. Needs huge amounts of testing to verify it's working...
Heli Hyvättinen [Wed, 8 Jun 2011 19:24:44 +0000 (22:24 +0300)]
Ghosts now visible aboard
The ship now has different images for 0-10 ghosts aboard. for more than
ten, the image with ten ghosts is used.
Heli Hyvättinen [Wed, 8 Jun 2011 10:45:15 +0000 (13:45 +0300)]
Merge branch 'levels'
Heli Hyvättinen [Wed, 8 Jun 2011 10:40:05 +0000 (13:40 +0300)]
Added "restart level" to the menu