Skip to content

Commit

Permalink
Merge pull request #52 from NYTimes/develop
Browse files Browse the repository at this point in the history
Merge develop into master for 1.1.0
  • Loading branch information
cdzombak committed Mar 22, 2017
2 parents 224582f + 5ec9a5b commit 98be582
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Changes for users of the library currently on `develop`:

_This space intentionally left blank._

## [1.1.0](https://github.com/NYTimes/ios-360-videos/releases/tag/1.1.0)

- Point camera toward correct video center to start ([#49](https://github.com/NYTimes/ios-360-videos/pull/49))

## [1.0.0](https://github.com/NYTimes/ios-360-videos/releases/tag/1.0.0)

Initial public release.
Expand Down
Binary file added Documentation/360.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Documentation/Release Process.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ _While tagging a new version of a library and pushing it to CocoaPods is concept
# NYT360Video Release Process

- Review [the diff between `master` and `develop`](https://github.com/NYTimes/ios-360-videos/compare/master...develop) to determine which part of the version number to increment, in accordance with [semantic versioning](http://semver.org/).
- Update [the Podspec](https://github.com/NYTimes/ios-360-videos/blob/develop/NYT360Video.podspec) and the framework targets in [the Xcode project](https://github.com/NYTimes/ios-360-videos/tree/develop/ios-360-videos.xcodeproj) to the new version number.
- Update [the Podspec](https://github.com/NYTimes/ios-360-videos/blob/develop/NYT360Video.podspec) and the framework target in [the Xcode project](https://github.com/NYTimes/ios-360-videos/tree/develop/ios-360-videos.xcodeproj) to the new version number.
- Make this change via a pull request to trigger notifications for those who watch the repository.
- Using [the diff](https://github.com/NYTimes/ios-360-videos/compare/master...develop), [the commit history](https://github.com/NYTimes/ios-360-videos/commits/develop), and any notes about `develop` which may have been written in the `CHANGELOG`, update [`CHANGELOG.md`](https://github.com/NYTimes/ios-360-videos/blob/develop/CHANGELOG.md) with changes in the new version which may affect library users.
- When reviewing the commit history, searching for “Merge pull request” helps find changes which should appear in [the `CHANGELOG`](https://github.com/NYTimes/ios-360-videos/blob/develop/CHANGELOG.md).
Expand Down
2 changes: 1 addition & 1 deletion NYT360Video.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NYT360Video'
s.version = '1.0.0'
s.version = '1.1.0'
s.summary = 'NYT360Video plays 360º video streamed from an AVPlayer.'

s.description = <<-DESC
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@

## 360º video playback from The New York Times

NYT360Video is a framework allowing playback of a 360º video stream from an `AVPlayer`.
NYT360Video plays [spherical 360º video](https://en.wikipedia.org/wiki/360-degree_video), allowing the user to explore the video via pan gestures and the iOS device’s gyroscope. The video can be played from a file or network stream, via a standard `AVPlayer` instance.

It provides no control user interface; it is intended to be embedded in your own video player implementation.
It provides no user interface for playback controls (like a play/pause button); it is intended to be embedded in your own video player implementation.

At the Times we use NYT360Video to support playback of our own content:

![Animation of 360º video playback in the Times’ iPhone app](Documentation/360.gif)

## Usage

Expand Down
2 changes: 1 addition & 1 deletion Sources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<string>1.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/NYT360CameraController.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ - (instancetype)initWithView:(SCNView *)view motionManager:(id<NYT360MotionManag

_pointOfView = view.pointOfView;
_view = view;
_currentPosition = CGPointMake(0, 0);
_currentPosition = CGPointMake(3.14, 0);
_allowedDeviceMotionPanningAxes = NYT360PanningAxisHorizontal | NYT360PanningAxisVertical;
_allowedPanGesturePanningAxes = NYT360PanningAxisHorizontal | NYT360PanningAxisVertical;

Expand Down

0 comments on commit 98be582

Please sign in to comment.