Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Warwick Allison | 2009-05-15 | 1 | -0/+1 |
|\ | |||||
| * | compile (rand()) | Warwick Allison | 2009-05-15 | 1 | -0/+1 |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Warwick Allison | 2009-05-15 | 7 | -2/+250 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ../master into contiguouscache | Ian Walters | 2009-05-14 | 36 | -76/+93 |
| |\ | |||||
| | * | Merge commit 'origin/4.5' | Olivier Goffart | 2009-05-13 | 2 | -2/+22 |
| | |\ | |||||
| | | * | Adding documentation to the fancy browser example | Morten Engvoldsen | 2009-05-12 | 2 | -2/+22 |
| * | | | Merge branch 'master' into contiguouscache | Ian Walters | 2009-05-12 | 36 | -46/+1471 |
| |\ \ \ | |||||
| * | | | | Update licensing headers. | Ian Walters | 2009-04-07 | 3 | -0/+121 |
| * | | | | Merge branch 'master' into contiguouscache | Ian Walters | 2009-04-06 | 19 | -15/+1233 |
| |\ \ \ \ | |||||
| * | | | | | Rename OffsetVector to ContiguousCache | Ian Walters | 2009-04-03 | 6 | -12/+12 |
| * | | | | | Squashed commit of the following: | Rhys Weatherley | 2009-03-24 | 5 | -0/+107 |
* | | | | | | spel | Warwick Allison | 2009-05-13 | 2 | -2/+2 |
* | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Alexis Menard | 2009-05-12 | 36 | -79/+84 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit. | Norwegian Rock Cat | 2009-05-12 | 34 | -74/+71 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.5' | Thiago Macieira | 2009-05-11 | 2 | -5/+13 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Only link against opengles .LIB files if on WinCE | Tom Cooksey | 2009-05-11 | 1 | -5/+7 |
| | * | | | Fixing hellogl_es2 for Windows CE | Thomas Hartmann | 2009-05-08 | 1 | -0/+6 |
* | | | | | Join some lines in examples. | Martin Jones | 2009-05-11 | 7 | -237/+77 |
* | | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | Michael Brasser | 2009-05-07 | 60 | -252/+1855 |
|\ \ \ \ \ | |||||
| * | | | | | Instead of adding animations for all properties to all transitions, we use | Eskil Abrahamsen Blomfeldt | 2009-05-06 | 1 | -7/+11 |
| * | | | | | Add chase state and ability to detect and fire at other tanks. This reveals an | Eskil Abrahamsen Blomfeldt | 2009-05-06 | 2 | -4/+92 |
| * | | | | | Avoid passage where the walls meet the edge of the scene rect. | Eskil Abrahamsen Blomfeldt | 2009-05-06 | 1 | -5/+6 |
| * | | | | | get rid of margin | Kent Hansen | 2009-05-05 | 1 | -1/+2 |
| * | | | | | add event as argument to onEntry(), onExit() and onTransition() | Kent Hansen | 2009-05-05 | 15 | -50/+50 |
| * | | | | | Add randomness. | Eskil Abrahamsen Blomfeldt | 2009-05-05 | 1 | -2/+2 |
| * | | | | | Make sure target state is set correctly. Also make sure eventTest() actually | Eskil Abrahamsen Blomfeldt | 2009-05-05 | 1 | -5/+8 |
| * | | | | | Set collidedLine for the implicit walls around the scene to allow for collision | Eskil Abrahamsen Blomfeldt | 2009-05-05 | 1 | -4/+21 |
| * | | | | | Make sure the correct position/direction is actually set at the end of a | Eskil Abrahamsen Blomfeldt | 2009-05-05 | 1 | -10/+16 |
| * | | | | | Fix support reverse actions. Logic was broken and would always return false | Eskil Abrahamsen Blomfeldt | 2009-05-05 | 1 | -2/+2 |
| * | | | | | Add unfinished "more advanced" AI for errorstate. | Eskil Abrahamsen Blomfeldt | 2009-04-30 | 6 | -5/+184 |
| * | | | | | Make design better. Remove the Tank interface. This is now an implicit interface | Eskil Abrahamsen Blomfeldt | 2009-04-30 | 16 | -86/+65 |
| * | | | | | Add two AIs: They are both designed to do the same. Spin until they see a tank | Eskil Abrahamsen Blomfeldt | 2009-04-30 | 14 | -26/+262 |
| * | | | | | kill QStateMachine::animationsFinished(), introduce QState::polished() | Kent Hansen | 2009-04-29 | 1 | -2/+2 |
| * | | | | | Compile against new QState::ChildMode API. | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 1 | -1/+1 |
| * | | | | | Kill gameOver signal as it was only used when you clicked the stop action | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 2 | -9/+6 |
| * | | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-29 | 21 | -117/+370 |
| |\ \ \ \ \ | |||||
| | * | | | | | Build fix for mingw | Thierry Bastian | 2009-04-27 | 18 | -54/+52 |
| | * | | | | | Add an OSD to display game progress in the scene | Alexis Menard | 2009-04-24 | 11 | -65/+320 |
| * | | | | | | replace QState::Type with QState::childMode property | Kent Hansen | 2009-04-29 | 2 | -2/+2 |
| * | | | | | | Adapt to recent API changes and bug fixes. | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 1 | -2/+6 |
| * | | | | | | modifiers --> modifiersMask | Kent Hansen | 2009-04-29 | 1 | -9/+0 |
| * | | | | | | make history state constructible | Kent Hansen | 2009-04-29 | 2 | -2/+2 |
| * | | | | | | say hello (again) to QAbstract{State,Transition}::machine() | Kent Hansen | 2009-04-29 | 2 | -37/+18 |
| * | | | | | | Work around an oddity in parallel states that causes all regions to exit | Eskil Abrahamsen Blomfeldt | 2009-04-28 | 1 | -4/+4 |
| * | | | | | | Some updates to the errorstate example. | Eskil Abrahamsen Blomfeldt | 2009-04-28 | 12 | -126/+270 |
| * | | | | | | compile after api changes | Kent Hansen | 2009-04-28 | 3 | -8/+8 |
| * | | | | | | Really broken plugin for errorState. Don't try to use this yet, it doesn't | Eskil Abrahamsen Blomfeldt | 2009-04-24 | 3 | -0/+115 |
| * | | | | | | Unfinished tank AI game. The idea is that you plug in AIs for the tanks, and | Eskil Abrahamsen Blomfeldt | 2009-04-24 | 8 | -0/+619 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'kinetic-statemachine' into kinetic-animations | Kent Hansen | 2009-04-24 | 8 | -27/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove API for setting specific restore policies on states. We have no clear | Eskil Abrahamsen Blomfeldt | 2009-04-23 | 1 | -1/+1 |