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 19:55:42 +0000 (22:55 +0300)]
Added icon
Heli Hyvättinen [Tue, 26 Jul 2011 18:37:05 +0000 (21:37 +0300)]
Outcommented a qDebug
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 18:19:21 +0000 (21:19 +0300)]
Outcommented testcode
Heli Hyvättinen [Tue, 26 Jul 2011 18:16:18 +0000 (21:16 +0300)]
Upped version number to 0.3.0 and edited package files
Proper README, proper changelog, proper show in application manager name
in control. Version number upped also for about box.
Heli Hyvättinen [Tue, 26 Jul 2011 17:50:17 +0000 (20:50 +0300)]
Proper copyright file
Heli Hyvättinen [Tue, 26 Jul 2011 17:42:59 +0000 (20:42 +0300)]
Debian control file edit
Description, homepage, email adress
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:32:51 +0000 (18:32 +0300)]
Centered the texts in victory screen
(Still in fremantle positions)
Conflicts:
seascene.cpp
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 15:28:16 +0000 (18:28 +0300)]
Changed some comments
Changed "Maemo 5" to "Meego 1.2 Harmattan" in the title of the copyright
texts.
Heli Hyvättinen [Tue, 26 Jul 2011 12:01:16 +0000 (15:01 +0300)]
Updated scene/view size as the frame is gone
(Frame was gone because of inheriting from QDeclarativeView instead of
QGraphicsView.)
Heli Hyvättinen [Tue, 26 Jul 2011 11:53:05 +0000 (14:53 +0300)]
Add web page address to about
Heli Hyvättinen [Tue, 26 Jul 2011 09:48:41 +0000 (12:48 +0300)]
Changed font size/style in victory screen to better fit Harmattan
Heli Hyvättinen [Tue, 26 Jul 2011 09:43:28 +0000 (12:43 +0300)]
Victory screen integrated into the game view/scene
Tap screen return from -pause did not work once when testing this with fremantle, could not repeat the
bug. Menu worked. Bug did not appear on Harmattan.
Conflicts:
seascene.cpp
seascene.h
Heli Hyvättinen [Mon, 25 Jul 2011 20:50:17 +0000 (23:50 +0300)]
Collision handling restored
...by doing it inside setPos()
Heli Hyvättinen [Mon, 25 Jul 2011 20:22:26 +0000 (23:22 +0300)]
Found a fluent animation for ship movement
Still does not react to collisions
Heli Hyvättinen [Mon, 25 Jul 2011 20:12:06 +0000 (23:12 +0300)]
Attempt to animate ship movement
..to overcome inability to change sensor speed
The problem is how to check hitting obstacles.
Heli Hyvättinen [Mon, 25 Jul 2011 19:19:56 +0000 (22:19 +0300)]
Bigger fonts in about
Heli Hyvättinen [Mon, 25 Jul 2011 19:16:45 +0000 (22:16 +0300)]
Cleaned up after automerge
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 13:34:36 +0000 (16:34 +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.
Picked up this commit from master (for fremantle) and merged it with harmattan.
Conflicts:
seascene.cpp
Heli Hyvättinen [Mon, 25 Jul 2011 13:27:02 +0000 (16:27 +0300)]
Merge branch 'base' into harmattan
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 [Mon, 25 Jul 2011 11:05:36 +0000 (14:05 +0300)]
Merge branch 'qdeclarativeview2' into harmattan
Heli Hyvättinen [Mon, 25 Jul 2011 03:02:28 +0000 (06:02 +0300)]
SeaView now inherits QDeclarativeViev instead of QGraphicsView
Heli Hyvättinen [Sat, 23 Jul 2011 09:10:47 +0000 (12:10 +0300)]
Merge branch 'autopause3' into harmattan
Heli Hyvättinen [Sat, 23 Jul 2011 09:04:18 +0000 (12:04 +0300)]
Merge branch 'savingsettings' into harmattan
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 14:51:28 +0000 (17:51 +0300)]
Merge branch 'vibrationforharmattan' into harmattan
Heli Hyvättinen [Wed, 20 Jul 2011 14:49:57 +0000 (17:49 +0300)]
Vibration now in Harmattan too
Used QFeedbackHapticsEffect, since the DBus way did not work for
Harmattan. DBus complained about not having rights and the
/etc/mci/mci.ini does not even have vibrator patterns as in maemo5.
Using maximum strenght, but still a very faint effect.
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: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 12:45:58 +0000 (15:45 +0300)]
The scene/view sizes are set to fit Harmattan
N950 screen anyway...
Heli Hyvättinen [Wed, 20 Jul 2011 12:33:17 +0000 (15:33 +0300)]
Bigger font in pause text and menu
Heli Hyvättinen [Wed, 20 Jul 2011 12:27:20 +0000 (15:27 +0300)]
Fixed a crash
...caused by deleting Ship in a slot handler. The connection between
picking all ghosts and starting a new level now uses
Qt::QueuedConnection to delay the deletion until its safe.
Heli Hyvättinen [Wed, 20 Jul 2011 08:36:58 +0000 (11:36 +0300)]
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
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 19:08:24 +0000 (22:08 +0300)]
Menubar hidden
Got rid of the menu. Now need to recreate its functionality otherwise.
Heli Hyvättinen [Wed, 13 Jul 2011 19:02:56 +0000 (22:02 +0300)]
The application is now fullscreen
Got rid of the grey bar at the bottom by going fullscreen.
Tiny gray frame around the app.
Menu is semi-useless and ugly.
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 14:50:31 +0000 (17:50 +0300)]
Ship speed changed to suite N950
The divider that limits the ship speed is 5 for Harmattan, 15 for Maemo.
The way the change was done it also means that with Harmattan 5 degree
tilt is enough ti trigger move, whereas Maemo needs 15 degrees. Need to
test if this feels good.
Again, no proper ifdefs, just commenting Maemo stuff out and writing
Harmattan stuff in. *Must* ifdef properly before merging to master.
Heli Hyvättinen [Tue, 12 Jul 2011 14:34:06 +0000 (17:34 +0300)]
Ship now moves to correct direction in N950
Had to swap the x and y values and negate the y value to get it right.
In waiting for proper ifdefs to start working just outcommented Maemo
lines and added Harmattan ones. *Must* use proper ifdefs before merging
to master.
Heli Hyvättinen [Tue, 12 Jul 2011 14:29:47 +0000 (17:29 +0300)]
Added debian files for Harmattan
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