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: TouchScript/TouchScript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9.0
Choose a base ref
...
head repository: TouchScript/TouchScript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 11 commits
  • 106 files changed
  • 1 contributor

Commits on Apr 25, 2017

  1. Fixed warnings in 5.6, updated minimum Unity version to 5.3.6 (though… 

    … it should work in 5.2 fine), uped TouchScript version to 8.3.
    @valyard
    valyard committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    b8df6c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2017

  1. Updated Asset Store Tools.

    @valyard
    valyard committed Jul 30, 2017
    Configuration menu
    Copy the full SHA
    33b1bd5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' 

    # Conflicts:
#	Source/Assets/TouchScript/Editor/Gestures/Base/PinnedTransformGestureBaseEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/Base/TransformGestureBaseEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/FlickGestureEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/GestureEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/LongPressGestureEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/TapGestureEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/InputSourceEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/MobileInputEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/MouseInputEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/StandardInputEditor.cs
#	Source/Assets/TouchScript/Examples/Cube/Scripts/LayerDelegate.cs
#	Source/Assets/TouchScript/Examples/Cube/Scripts/RedirectInput.cs
#	Source/Assets/TouchScript/Scripts/Devices/Display/GenericDisplayDevice.cs
#	Source/Assets/TouchScript/Scripts/TouchManager.cs
#	Source/ProjectSettings/ProjectSettings.asset
#	Source/ProjectSettings/ProjectVersion.txt
#	Source/ProjectSettings/UnityConnectSettings.asset
    @valyard
    valyard committed Jul 30, 2017
    Configuration menu
    Copy the full SHA
    d75482e View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @valyard
    valyard authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    891b1a1 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. Added some UNITY_5_6_OR_NEWER defines to work in 5.5.

    @valyard
    valyard committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    6ae7a00 View commit details
    Browse the repository at this point in the history

  2. Updated screenshots for Asset Store.

    @valyard
    valyard committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    61ac45b View commit details
    Browse the repository at this point in the history

  3. Pull example.

    @valyard
    valyard committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    a6713f0 View commit details
    Browse the repository at this point in the history

  4. Updated formatting.

    @valyard
    valyard committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    351487a View commit details
    Browse the repository at this point in the history

  5. Fixed an issue with touches and UI Slider.

    @valyard
    valyard committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    78e78c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Update README.md

    @valyard
    valyard authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    6229054 View commit details
    Browse the repository at this point in the history

  2. Allocation-free cursor spawning.

    @valyard
    valyard committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    74f5815 View commit details
    Browse the repository at this point in the history
Loading