summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-04-2910-145/+358
|\
| * Small refactor of QVariantAnimation::updateCurrentValueThierry Bastian2009-04-291-17/+7
| * Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-291-3/+3
| |\
| * | kill QStateMachine::animationsFinished(), introduce QState::polished()Kent Hansen2009-04-297-115/+317
| * | Compile against new QState::ChildMode API.Eskil Abrahamsen Blomfeldt2009-04-291-1/+1
| * | Kill gameOver signal as it was only used when you clicked the stop actionEskil Abrahamsen Blomfeldt2009-04-292-9/+6
| * | SCXML defines an atomic state as a <state> with no children or <final>. However,Eskil Abrahamsen Blomfeldt2009-04-292-3/+27
* | | Merged local changes.David Boddie2009-04-295-9/+13
| |/ |/|
* | remove multiplication by 1 in easing curvesThierry Bastian2009-04-291-3/+3
|/
* Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-2924-176/+406
|\
| * compile fix for the benchmarkThierry Bastian2009-04-293-59/+36
| * Build fix for mingwThierry Bastian2009-04-2718-54/+52
| * Add an OSD to display game progress in the sceneAlexis Menard2009-04-2411-65/+320
* | update stale docKent Hansen2009-04-291-1/+1
* | kill QStateMachine::states() and QState::transitions()Kent Hansen2009-04-295-37/+16
* | docKent Hansen2009-04-291-1/+7
* | kill source/target-specific animationsKent Hansen2009-04-293-154/+85
* | kill dead function declarationKent Hansen2009-04-291-1/+0
* | rename QBoundEvent to QWrappedEvent and make it publicKent Hansen2009-04-2910-76/+99
* | add missing QT_END_HEADERKent Hansen2009-04-291-0/+2
* | replace QState::Type with QState::childMode propertyKent Hansen2009-04-298-29/+70
* | Add test that property assignments set on parallel states are actuallyEskil Abrahamsen Blomfeldt2009-04-291-3/+40
* | Adapt to recent API changes and bug fixes.Eskil Abrahamsen Blomfeldt2009-04-291-2/+6
* | Remove QEXPECT_FAIL because e06c2e15 fixes this test as well.Eskil Abrahamsen Blomfeldt2009-04-291-1/+0
* | Compile against new QHistoryState API.Eskil Abrahamsen Blomfeldt2009-04-291-2/+2
* | Merge the two queries for entry states to support having history states asEskil Abrahamsen Blomfeldt2009-04-292-71/+113
* | rename a few properties and methodsKent Hansen2009-04-297-21/+21
* | modifiers --> modifiersMaskKent Hansen2009-04-299-33/+98
* | compileKent Hansen2009-04-291-0/+1
* | kill unnecessary qmake variable modsKent Hansen2009-04-291-3/+0
* | make history state constructibleKent Hansen2009-04-299-59/+78
* | say hello (again) to QAbstract{State,Transition}::machine()Kent Hansen2009-04-296-39/+47
* | add animationsEnabled propertyKent Hansen2009-04-293-8/+47
* | move assignProperty() to QStateKent Hansen2009-04-299-56/+58
* | kill StateFinished from docsKent Hansen2009-04-291-1/+0
* | Work around an oddity in parallel states that causes all regions to exitEskil Abrahamsen Blomfeldt2009-04-281-4/+4
* | Add a test for the semantics of transitions from a region in parallel states.Eskil Abrahamsen Blomfeldt2009-04-281-0/+47
* | Some updates to the errorstate example.Eskil Abrahamsen Blomfeldt2009-04-2812-126/+270
* | kill StateFinished event type since it doesn't exist anymoreKent Hansen2009-04-281-2/+1
* | compile after api changesKent Hansen2009-04-283-8/+8
* | replace QStateFinished{Event,Transition} by QState::finished() signalKent Hansen2009-04-2710-423/+23
* | make the entry/exit order well-defined for all combinations of statesKent Hansen2009-04-271-4/+18
* | Really broken plugin for errorState. Don't try to use this yet, it doesn'tEskil Abrahamsen Blomfeldt2009-04-243-0/+115
* | Unfinished tank AI game. The idea is that you plug in AIs for the tanks, andEskil Abrahamsen Blomfeldt2009-04-248-0/+619
|/
* Merge branch 'kinetic-statemachine' into kinetic-animationsKent Hansen2009-04-2442-2484/+1178
|\
| * Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-241-4/+4
| |\
| * | Remove API for setting specific restore policies on states. We have no clearEskil Abrahamsen Blomfeldt2009-04-239-133/+73
| * | Compile.Eskil Abrahamsen Blomfeldt2009-04-231-2/+0
| * | Remove specific RestorePolicy per state from example. The semantics for thisEskil Abrahamsen Blomfeldt2009-04-233-15/+0
| * | kill the stateactions apiKent Hansen2009-04-2236-1720/+148