Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SFML/SFML
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: beverlycodes/SFML
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 9 files changed
  • 1 contributor

Commits on Oct 5, 2012

  1. Makes joystick button ordering predictable.

    Fixes unpredictable or unintentional joystick button ordering by sorting
    buttons according to their HID Usage property.  This allows SFML to
    adhere to a manufacturer's (or driver implentation's) intended button
    ordering.
    Ryan Fields committed Oct 5, 2012
    Configuration menu
    Copy the full SHA
    d648f76 View commit details
    Browse the repository at this point in the history
  2. Brings sf::Window getPosition and setPosition closer to parity on OS X.

    The coordinate system transforation that occurs when dealing with window
    positions on OS X requires (or at least warrants) some fuzzy logic in
    dealing with getting and setting window positions.  In any windowing
    system, requesting a position should effectively yield the components
    for an identity transform of the window's current position.  In other
    words, coordinates obtained by a call to getPosition should have no
    impact in the window's position when immediately applied to setPosition.
    
    This change brings getPosition and setPosition much closer to acheiving
    that identity transform in the OS X implementation, correcting the error
    in most cases, and producing far less unpredictable results in the cases
    that remain affected.
    Ryan Fields committed Oct 5, 2012
    Configuration menu
    Copy the full SHA
    fc160b2 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'joybutton-ordering-osx'

    Ryan Fields committed Oct 5, 2012
    Configuration menu
    Copy the full SHA
    de93cce View commit details
    Browse the repository at this point in the history
  4. Brings sf::Window getPosition and setPosition closer to parity on OS X.

    The coordinate system transforation that occurs when dealing with window
    positions on OS X requires (or at least warrants) some fuzzy logic in
    dealing with getting and setting window positions.  In any windowing
    system, requesting a position should effectively yield the components
    for an identity transform of the window's current position.  In other
    words, coordinates obtained by a call to getPosition should have no
    impact in the window's position when immediately applied to setPosition.
    
    This change brings getPosition and setPosition much closer to acheiving
    that identity transform in the OS X implementation, correcting the error
    in most cases, and producing far less unpredictable results in the cases
    that remain affected.
    Ryan Fields committed Oct 5, 2012
    Configuration menu
    Copy the full SHA
    6d17c42 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'osx-window-pos'

    Ryan Fields committed Oct 5, 2012
    Configuration menu
    Copy the full SHA
    af1c703 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2012

  1. Merge remote-tracking branch 'upstream/master'

    Ryan Fields committed Oct 8, 2012
    Configuration menu
    Copy the full SHA
    21805cb View commit details
    Browse the repository at this point in the history
  2. Improves fullscreen support on OS X by adding proper display mode

    switching.
    
    The existing fullscreen implementation simply opens a window to the size
    of the desktop (while creating a context of the requested mode size).
    This change tests the requested fullscreen mode for validity and, if the
    mode is a valid hardware mode, switches the main display to the
    requested mode.  The original mode is retained so that when the window
    is deallocated, the desktop can be restored to the user's normal display
    mode.
    
    This could be further improved by offering the option to fullscreen onto
    another display, but that requires multi-display support higher up in
    SFML as a prerequisite.
    Ryan Fields committed Oct 8, 2012
    Configuration menu
    Copy the full SHA
    8b99119 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'osx-modeswitch'

    Ryan Fields committed Oct 8, 2012
    Configuration menu
    Copy the full SHA
    9c70979 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2012

  1. Removes code duplication leftover from previous commit.

    Video mode listing has become a responsibility of the DisplayImpl
    object, which makes sense because the display itself is the source of
    the video mode list.
    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    429bace View commit details
    Browse the repository at this point in the history
  2. Merge branch 'osx-modeswitch'

    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    b56edbb View commit details
    Browse the repository at this point in the history
  3. Switches video mode back to desktop resolution when a fullscreen

    application window loses focus.
    
    As a consequence of performing a true mode switch on fullscreen window
    creation, the desktop will no longer be at the user's normal operating
    resolution while the SFML application is running.  This change resolves
    that issue by performing a mode switch back to the original mode
    whenever the application window loses key focus.
    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    9854ab9 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'osx-modeswitch'

    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    b3b8b55 View commit details
    Browse the repository at this point in the history
  5. Removes unneeded method declarations that were added by mistake when

    working on the previous change.
    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    b40adf2 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'osx-modeswitch'

    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    7875324 View commit details
    Browse the repository at this point in the history
  7. Adds DisplayImpl to the Xcode project in CMake.

    This feature branch added a couple files that need to be part of the
    Xcode project or it fails to link.
    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    3af5958 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'osx-modeswitch'

    Ryan Fields committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    f1afb43 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2012

  1. Merge remote-tracking branch 'upstream/master'

    Ryan Fields committed Oct 21, 2012
    Configuration menu
    Copy the full SHA
    bf499bd View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/master'

    Ryan Fields committed Oct 21, 2012
    Configuration menu
    Copy the full SHA
    1aaf27a View commit details
    Browse the repository at this point in the history
Loading