lp:~ahayzen/volleyball2d/bacon2d-10

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:volleyball2d/utopic at revision 38

Andrew Hayzen: Approve on 2016-08-14

Diff: 3206 lines (+1431/-908)

47 files modified

.bzrignore (+1/-0)
Bacon2D/qmldir (+0/-3)
Makefile (+0/-22)
deployment.pri (+9/-0)
manifest.json (+0/-15)
manifest/manifest.json.in (+15/-0)
manifest/manifest.pro (+28/-0)
scenes/FinishScene.qml (+0/-93)
scenes/MenuScene.qml (+0/-208)
tests/autopilot/run (+5/-0)
tests/autopilot/volleyball2d/__init__.py (+47/-29)
tests/autopilot/volleyball2d/test_game.py (+3/-3)
tests/autopilot/volleyball2d/test_high_score.py (+2/-2)
tests/autopilot/volleyball2d/test_main.py (+1/-1)
tests/autopilot/volleyball2d/test_menu.py (+5/-5)
tests/autopilot/volleyball2d/test_settings.py (+10/-10)
tests/unit/tst_ai_prediction.qml (+7/-8)
tests/unit/tst_game_ball.qml (+9/-9)
volleyball2d.pro (+8/-0)
volleyball2d.qmlproject (+0/-63)
volleyball2d/components/AIDebug.qml (+1/-1)
volleyball2d/components/AIPrediction.qml (+10/-8)
volleyball2d/components/Ball.qml (+13/-15)
volleyball2d/components/Character.qml (+2/-2)
volleyball2d/components/CharacterBarrier.qml (+12/-12)
volleyball2d/components/GameHeader.qml (+3/-3)
volleyball2d/components/PauseOverlay.qml (+12/-7)
volleyball2d/components/PointOverlay.qml (+13/-6)
volleyball2d/components/ScaleItem.qml (+37/-0)
volleyball2d/components/ScalePage.qml (+37/-0)
volleyball2d/components/Scoring.qml (+1/-1)
volleyball2d/components/SemiCircleEntity.qml (+23/-23)
volleyball2d/components/Wall.qml (+15/-14)
volleyball2d/fullscreen.cpp (+47/-0)
volleyball2d/fullscreen.h (+43/-0)
volleyball2d/main.cpp (+98/-0)
volleyball2d/main.qml (+73/-74)
volleyball2d/pages/FinishPage.qml (+93/-0)
volleyball2d/pages/GamePage.qml (+161/-67)
volleyball2d/pages/HighScorePage.qml (+79/-45)
volleyball2d/pages/MenuPage.qml (+210/-0)
volleyball2d/pages/RotateScreenPage.qml (+9/-2)
volleyball2d/pages/SettingsPage.qml (+194/-86)
volleyball2d/scenes/GameScene.qml (+29/-69)
volleyball2d/volleyball2d.desktop (+2/-2)
volleyball2d/volleyball2d.pro (+34/-0)
volleyball2d/volleyball2d.qrc (+30/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

41. By Andrew Hayzen on 2016-08-09

* Merge of trunk

40. By Andrew Hayzen on 2016-08-09

* Fix for not being able to save scores

39. By Andrew Hayzen on 2016-08-01

* Bump to UC1.3
* Always enable keyboard controls

38. By Andrew Hayzen on 2015-03-16

* Missed one qrc:/// conversion

37. By Andrew Hayzen on 2015-03-16

* Move sources to use qrc:/// fixes for .pro

36. By Andrew Hayzen on 2015-03-16

* Further tweaks for click

35. By Andrew Hayzen on 2015-03-16

* Make autopilot, unit tests and translations visible in qtc

34. By Andrew Hayzen on 2015-03-15

* Fixes for autopilot

33. By Andrew Hayzen on 2015-03-15

* Bump version and further tidy ups

32. By Andrew Hayzen on 2015-03-14

* Use signal in MainView to change QQuickView fullscreen mode