Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zoom to mouse cursor #2810

Merged
merged 25 commits into from
Jun 17, 2015
Merged

Zoom to mouse cursor #2810

merged 25 commits into from
Jun 17, 2015

Commits on Jun 8, 2015

  1. Initial camera zoom to mouse cursor.

    @bagnell
    bagnell committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    a1895d9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'camera-mode' into zoom-to

    @bagnell
    bagnell committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    7aebc5f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2015

  1. Rotate towards zoom point WIP.

    @bagnell
    bagnell committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    0fa31b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2015

  1. Continued zoom to mouse position WIP.

    @bagnell
    bagnell committed Jun 10, 2015
    Configuration menu
    Copy the full SHA
    90abd1a View commit details
    Browse the repository at this point in the history

  2. Fix zoom to mouse position in Columbus view.

    @bagnell
    bagnell committed Jun 10, 2015
    Configuration menu
    Copy the full SHA
    4ead976 View commit details
    Browse the repository at this point in the history

  3. Fix zoom rotation when camera is not oriented towards north.

    @bagnell
    bagnell committed Jun 10, 2015
    Configuration menu
    Copy the full SHA
    701ac1d View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2015

  1. Merge branch 'master' into zoom-to

    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    2b17c90 View commit details
    Browse the repository at this point in the history

  2. Zoom to mouse in 2D WIP.

    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    4f52616 View commit details
    Browse the repository at this point in the history

  3. Fix camera shake when zooming in 2D.

    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    1925d1e View commit details
    Browse the repository at this point in the history

  4. Improved zoom speed in 2D.

    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    e44f585 View commit details
    Browse the repository at this point in the history

  5. Improved zoom to the edges of the viewport.

    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    069c8b5 View commit details
    Browse the repository at this point in the history

  6. Fix for slight camera bouncing and some code clean up.

    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    cb16671 View commit details
    Browse the repository at this point in the history

  7. More clean up. Use scratch variables. Another solution to the camera … 

    …bouncing.
    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    d7952d2 View commit details
    Browse the repository at this point in the history

  8. Fix zoom tests.

    @bagnell
    bagnell committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    a521d19 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2015

  1. Merge branch 'master' into zoom-to

    @bagnell
    bagnell committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    4ddd8b5 View commit details
    Browse the repository at this point in the history

  2. Update CHANGES.md.

    @bagnell
    bagnell committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    b80b94a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. Improved 2D zoom.

    @bagnell
    bagnell committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    35b3c19 View commit details
    Browse the repository at this point in the history

  2. Improve 3D zoom.

    @bagnell
    bagnell committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    164734c View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2015

  1. Another slight inprovement to 3D zoom and clean up code after the rew… 

    …rite.
    @bagnell
    bagnell committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    3f750bd View commit details
    Browse the repository at this point in the history

  2. Fix broken inertia when the camera is below terrain.

    @bagnell
    bagnell committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    bdf51cb View commit details
    Browse the repository at this point in the history

  3. Fix tests.

    @bagnell
    bagnell committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    c077a1f View commit details
    Browse the repository at this point in the history

  4. Change 3D zoom behavior after camera reaches a certain height and til… 

    …ts toward the horizon. Fix zoom in Columbus view.
    @bagnell
    bagnell committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    10dca67 View commit details
    Browse the repository at this point in the history

  5. Fix error where acos of values slightly greater than 1.0 return NaN.

    @bagnell
    bagnell committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    3cea7ac View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into zoom-to 

    Conflicts:
	CHANGES.md
    @bagnell
    bagnell committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    b7f1f87 View commit details
    Browse the repository at this point in the history

  7. Fix crash where picking the center of the screen does not hit terrain… 

    … when zooming in 3D.
    @bagnell
    bagnell committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    0d70af3 View commit details
    Browse the repository at this point in the history