howard-stearns
|
a007c1fe4b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
|
2017-05-03 13:46:00 -07:00 |
|
howard-stearns
|
42887d41c4
|
debugging
|
2017-05-03 13:45:48 -07:00 |
|
Zach Pomerantz
|
4a8f5e380f
|
Merge pull request #10358 from zzmp/fix/minimize-deadlock
Fix deadlock from minimizing
|
2017-05-03 15:06:27 -04:00 |
|
Howard Stearns
|
fb8cfd720e
|
Merge pull request #10362 from cfresquet/requestModuleRefactor
Request module refactor
|
2017-05-03 11:57:23 -07:00 |
|
Zach Fox
|
ae72b9b73d
|
Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2
Lots of Snapshot app improvements, Round Two
|
2017-05-03 11:44:40 -07:00 |
|
howard-stearns
|
33356b94d1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
|
2017-05-03 11:43:18 -07:00 |
|
Zach Fox
|
c82a07016d
|
New Preparing text; Better disabled behavior
|
2017-05-03 11:30:44 -07:00 |
|
Stephen Birarda
|
5d1abe4499
|
Merge pull request #10307 from huffman/fix/ktx-crash
Fix for resource downloads getting capped
|
2017-05-03 11:25:51 -07:00 |
|
Zach Fox
|
09488c4987
|
Disabled state for share butotns
|
2017-05-03 11:02:44 -07:00 |
|
CFresquet
|
afa72210e0
|
requested tweaks to makeUserConnection.js
|
2017-05-03 10:28:44 -07:00 |
|
Ryan Huffman
|
44b6d12b75
|
Merge pull request #10356 from sethalves/fix-grab-cleanups
Fix grab cleanups
|
2017-05-03 09:53:31 -07:00 |
|
CFresquet
|
28b166c51f
|
further request fiddling
|
2017-05-03 07:51:49 -07:00 |
|
CFresquet
|
b54ea63af7
|
incremental request module fixes
|
2017-05-03 07:35:30 -07:00 |
|
CFresquet
|
15db80c8ba
|
request module updates
|
2017-05-03 07:32:23 -07:00 |
|
Zach Fox
|
ff3a76f716
|
No magic numbers!
|
2017-05-02 18:23:15 -07:00 |
|
Zach Fox
|
653dda7000
|
Fix pausing after snapshot in HMD
|
2017-05-02 17:21:50 -07:00 |
|
Zach Fox
|
aa46534b60
|
Whoops.
|
2017-05-02 17:10:57 -07:00 |
|
Zach Pomerantz
|
ad8d3e5490
|
continue idling while minimized
|
2017-05-02 20:05:55 -04:00 |
|
Zach Fox
|
964e79ce14
|
It's working!
|
2017-05-02 16:58:33 -07:00 |
|
Zach Fox
|
68fa8e06ef
|
Super amped about this. Only need to add disabled state?
|
2017-05-02 16:38:16 -07:00 |
|
Seth Alves
|
0cd0e46ca5
|
make clone work again
|
2017-05-02 16:20:59 -07:00 |
|
howard-stearns
|
6f52bb4b37
|
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
|
2017-05-02 16:16:27 -07:00 |
|
Zach Fox
|
5d38cd543d
|
Yet another checkpoint
|
2017-05-02 16:06:13 -07: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 |
|
Zach Fox
|
7817c72ea1
|
Another checkpoint
|
2017-05-02 15:58:43 -07:00 |
|
Seth Alves
|
f1170dc17d
|
AvatarList not AvatarManager
|
2017-05-02 15:48:12 -07:00 |
|
Seth Alves
|
eed4da3570
|
some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero
|
2017-05-02 15:36:38 -07:00 |
|
Zach Fox
|
0beceae59b
|
Checkpoint
|
2017-05-02 15:19:20 -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
|
1067d1e0f6
|
Don't let user blast in certain cases
|
2017-05-02 14:43:16 -07:00 |
|
Zach Fox
|
d8095c5ea5
|
New setup instructions; new 'blank snapshot' text
|
2017-05-02 14:20:27 -07:00 |
|
Zach Fox
|
d1dff7606c
|
Lint cleanup; Immediate share button visibility;
|
2017-05-02 14:10:24 -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 |
|
howard-stearns
|
750f1e5723
|
Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances
|
2017-05-02 11:57:21 -07:00 |
|
howard-stearns
|
9b117165bd
|
expire our announcements when we leave, and turn off messagesWaiting when
everything is expired.
|
2017-05-02 11:44:16 -07: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 |
|
samcake
|
df54ad2339
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-02 10:50:39 -07: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 |
|
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 |
|