trent
fc3cce6b73
Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.
2017-05-03 12:35:35 -04:00
trent
24f2678cdd
Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.
2017-05-03 12:05:21 -04:00
trent
786838d092
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 20:21:35 -04:00
trent
557a8fffd7
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
2017-05-02 19:56:47 -04:00
Trent Polack
0a5dfbb9af
Changed l to interp.
...
In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.
2017-05-02 19:10:33 -04:00
Seth Alves
ef628eaec6
Merge pull request #10352 from highfidelity/move-recorder
...
Move old recorder.js script to script-archive
2017-05-02 16:03:36 -07:00
Sam Gateau
a7eecdfb26
Merge pull request #10265 from samcake/ambient
...
Making the render engine Job/Task system configurable and reusable
2017-05-02 14:55:53 -07:00
Zach Fox
5302110e7b
Merge pull request #10346 from zfox23/newSnapshotReview_Improvements
...
Lots of Snapshot app improvements, Round One
2017-05-02 13:00:08 -07:00
Howard Stearns
8e7b294380
Merge pull request #10351 from howard-stearns/handshake-touch
...
handshakes on rift
2017-05-02 12:22:55 -07:00
Anshuman Dewangan
0d1d6924e8
Adding to script-archive
2017-05-02 12:20:05 -07:00
Anshuman Dewangan
a22be93d69
Move old recorder.js script to script-archive
2017-05-02 12:15:06 -07:00
trent
f79e032841
Silly online git merge tool. You are silly. Errors fixed.
2017-05-02 14:48:27 -04:00
Howard Stearns
3a36feacad
On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint.
2017-05-02 11:29:51 -07:00
Zach Fox
c9e0679b70
Subscribe to changes to snapshotsLocation setter for better UX
2017-05-02 10:55:57 -07:00
trent
6d1fb8a6f8
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-02 13:55:39 -04:00
trent
49881b5ea2
Actually the full set of changes. Kids: don't forget to pop your stash.
2017-05-02 13:55:32 -04:00
samcake
df54ad2339
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-02 10:50:39 -07:00
Trent Polack
8f93a9a074
Merge branch 'master' into feature/snap-turn-smoothing-21270
2017-05-02 13:43:32 -04:00
trent
8f34ec4c7f
Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.
2017-05-02 13:41:34 -04:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Zach Fox
f453df36cf
Prevent cursor appearance in snaps
2017-05-02 10:11:54 -07:00
Zach Fox
a754c4d6cc
Still image on top
2017-05-02 10:11:54 -07:00
Zach Fox
0ead9e5a24
Visual fixes; Select only 1 image at a time
2017-05-02 10:11:53 -07:00
Zach Fox
d295b5a69d
ShareBarHeight-= 5px; Remove test call
2017-05-02 10:11:53 -07:00
Zach Fox
5b168301bc
Update some typefaces; Add margins to pics
2017-05-02 10:11:53 -07:00
Zach Fox
ac86c13477
Fix sharing; disable HiFi buttons independently
2017-05-02 10:11:53 -07:00
Seth Alves
b82a333a5e
Merge pull request #10196 from ZappoMan/poseFilters
...
support for input controller pose filters
2017-05-02 09:46:22 -07:00
trent
6317857e3d
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 12:11:39 -04:00
druiz17
18368cc073
Merge pull request #10343 from druiz17/tabletwebview-fix-links
...
fix Tablet webview issues of not loading correct url.
2017-05-02 08:09:22 -07:00
samcake
4514da2a09
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-01 16:49:35 -07:00
Howard Stearns
73c24a5240
Merge pull request #10344 from howard-stearns/announcement-styling
...
goto announcement card styling
2017-05-01 16:41:39 -07:00
howard-stearns
ca5318f121
remove debugging code
2017-05-01 15:57:22 -07:00
howard-stearns
545fd1355f
cleanup
2017-05-01 15:45:26 -07:00
howard-stearns
61b738e3cd
announcment styling
2017-05-01 15:35:17 -07:00
Dante Ruiz
a08b55d5f5
minimize diff
2017-05-01 23:08:25 +01:00
Dante Ruiz
07582c2624
Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links
2017-05-01 23:04:55 +01:00
druiz17
67daa4b0a9
Merge pull request #10335 from druiz17/webview-js
...
Implemented of a web app to bring up the tablet webView
2017-05-01 15:03:55 -07:00
Clément Brisset
42294fa8c0
Merge pull request #10306 from Atlante45/feat/progressive-load-ktx
...
Load High Mips before Fbx after skybox
2017-05-01 14:56:22 -07:00
Dante Ruiz
b00d7d763a
Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links
2017-05-01 22:45:42 +01:00
Dante Ruiz
64b8237bd6
fix twitter and facebook links
2017-05-01 22:45:13 +01:00
Dante Ruiz
62870d85d3
Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links
2017-05-01 21:58:09 +01:00
Dante Ruiz
bb9eb98625
prevent mouse events from propagating to far
2017-05-01 21:49:57 +01:00
Atlante45
4f368cc867
Load High Mips before Fbx after skybox
2017-05-01 13:35:14 -07:00
Dante Ruiz
c205bf0980
working on cleaner navigation
2017-05-01 21:23:38 +01:00
Seth Alves
a75544a9fb
Merge pull request #10319 from hyperlogic/feature/head-standard-action
...
Head, Hips and Chest IK can now be controlled from Controller inputs
2017-05-01 13:03:23 -07:00
Seth Alves
2b13d4d257
Merge pull request #10331 from ctrlaltdavid/21306
...
Fix keyboard not raising for Facebook username field
2017-05-01 13:02:19 -07:00
trent
4d7eeed343
Marking MyAvatar's rotation as dirty if smoothing is going down.
2017-05-01 15:21:25 -04:00
Brad Davis
40e4e2f307
Merge pull request #10327 from jherico/face_tracker_refactor
...
Remove Faceshift
2017-05-01 12:14:55 -07:00
Howard Stearns
9fab66b66a
Merge pull request #10328 from howard-stearns/tablet-discovery-events
...
fix announcement suggestions
2017-05-01 11:28:45 -07:00
Howard Stearns
0146d7550e
Merge pull request #10333 from howard-stearns/handshake-cleanup-2
...
Handshake cleanup
2017-05-01 11:15:54 -07:00
