David Kelly
0d1df2627d
Merge pull request #8356 from howard-stearns/feed-display
...
feed display
2016-08-09 14:52:53 -07:00
howard-stearns
f34030d276
factor out metaverseBase to make it easier to repoint to a test server
2016-08-09 12:48:01 -07:00
David Kelly
e0973f3c29
Merge pull request #8370 from howard-stearns/simple-snapshot-confirmation
...
simple snapshot confirmation
2016-08-05 10:21:00 -07:00
howard-stearns
fed775ff83
simple snapshot confirmation
2016-08-04 15:52:39 -07:00
howard-stearns
8a7bbbaaed
limit user stories to first 100
2016-08-04 12:37:09 -07:00
howard-stearns
04bd98b15f
new assets. remove margins between buttons (letting the graphics do the
...
work)
2016-08-04 12:33:50 -07:00
howard-stearns
1ecb01feac
center the scroll
2016-08-04 12:06:07 -07:00
howard-stearns
f5d07f4186
helper text size and italic
2016-08-04 11:55:31 -07:00
howard-stearns
d39446f340
no place name over user-story scroll items
2016-08-04 10:36:17 -07:00
howard-stearns
421707c5d8
fix typo that was making user stories not show date
2016-08-04 10:07:33 -07:00
howard-stearns
c44ce0f5b5
Fix forward/back button states.
2016-08-03 17:03:27 -07:00
howard-stearns
4d0c5c5d19
fix snapshot button hover
2016-08-03 16:22:46 -07:00
howard-stearns
8c6744e5e8
new address bar graphic
2016-08-03 16:18:41 -07:00
howard-stearns
30327d8135
New buttons, with hover behavior. Also don't impose test data if the api
...
gives data.
2016-08-03 16:02:22 -07:00
howard-stearns
188e525efc
basic ugly feed/places toggle button
2016-08-03 11:48:58 -07:00
Howard Stearns
e593077b4b
basic display of user story feed (hardcoded switch place names vs feed)
2016-08-03 09:39:27 -07:00
Howard Stearns
5a0db63a6f
Merge pull request #8347 from howard-stearns/live-vive-keyboard
...
keep qml text fields up to date with vive virtual keyboard
2016-08-02 15:35:54 -07:00
Howard Stearns
09557b1f9b
Merge pull request #8343 from howard-stearns/scroll
...
scrollable suggested places in address bar
2016-08-02 15:34:35 -07:00
Howard Stearns
c2d1f08551
Merge pull request #8342 from highfidelity/dk/snapshot
...
Snapshot button
2016-08-02 15:31:50 -07:00
David Kelly
d34e72512b
Add snapshot.js to defaultScripts
2016-08-02 15:13:48 -07:00
howard-stearns
70e07f3299
remove highlight move animation
2016-08-02 13:56:01 -07:00
howard-stearns
6e7b828203
keep qml text fields up to date with vive virtual keyboard
2016-08-02 10:13:35 -07:00
David Kelly
fcd2947b19
Doh -- forgot to push this
...
same logic as before to get a mono image in the HMD.
2016-08-01 18:37:22 -07:00
David Kelly
1d7cdff2bc
Snapshot button plus script
...
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does). Added button to do it, saves them to disk.
The plan is for us to add UI to share (or not) the snapshot. That's
why we are not going through the notifications. Also, the
script makes sure to hide/unhide hud and overlays. Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
2016-08-01 18:21:01 -07:00
howard-stearns
c3bf52267d
Don't suggest loaded places.
2016-08-01 15:27:29 -07:00
howard-stearns
45a49c390b
Merge branch 'discovery' of https://github.com/highfidelity/hifi into scroll
2016-08-01 13:09:20 -07:00
Howard Stearns
f8d3b7ce0b
Merge pull request #8340 from highfidelity/master
...
update discovery from master
2016-08-01 13:08:10 -07:00
howard-stearns
7cf41d441e
filtering by place
2016-08-01 12:28:57 -07:00
Anthony Thibault
f71a59276c
Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering
...
Fix alpha cut-outs and incorrect gamma on web overlays and entities
2016-07-29 17:44:46 -07:00
howard-stearns
611223f013
highlight to show that the cards can be clicked
2016-07-29 15:49:20 -07:00
howard-stearns
ae9421f1f6
smaller user label, and use the word "people"
2016-07-29 15:22:08 -07:00
howard-stearns
13771a52e8
Merge branch 'master' of https://github.com/highfidelity/hifi into scroll
2016-07-29 09:30:45 -07:00
Anthony Thibault
8e3bc97ef9
fix for unused variable warnings
2016-07-29 08:10:10 -07:00
Zach Pomerantz
a9c6d69aa6
Merge pull request #8328 from ZappoMan/punishSlowScripts
...
Fix punished scripts stopping behavior and application shutdown while scripts being punished
2016-07-28 17:42:02 -07:00
Seth Alves
2f80c5b68c
Merge pull request #8327 from PhilipRosedale/autoReverb
...
Tuned haptic pulses for grab, release, equip, de-quip
2016-07-28 16:38:44 -07:00
howard-stearns
ff17761769
basic minority-report scroll (fixed initial data, but infinite cards)
2016-07-28 15:46:32 -07:00
Brad Hefta-Gaub
e879f22c95
fix behavior with no entity server
2016-07-28 15:15:52 -07:00
Brad Hefta-Gaub
74a3835a1e
CR feedback
2016-07-28 15:15:33 -07:00
howard-stearns
ed811d0431
replace Row with ListView, but otherwise same user-functionality
2016-07-28 15:01:21 -07:00
Anthony Thibault
ea310bcc43
Web Entities now render correctly as well
2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a
Merge branch 'master' into bug-fix/web3doverlay-rendering
2016-07-28 11:20:35 -07:00
Brad Hefta-Gaub
22619a66ba
process events also
2016-07-28 10:51:17 -07:00
Anthony Thibault
6b8e912114
Fix for mac and linux builds
2016-07-28 10:02:19 -07:00
Brad Hefta-Gaub
755989b8ff
don't allow punished scripts to slow stop or shutdown
2016-07-28 10:01:05 -07:00
Eric Levin
5167809342
release near and far grab at trigger click detent
2016-07-28 08:51:11 -07:00
Eric Levin
f37570dc9a
only pulse on release when held
2016-07-28 08:23:45 -07:00
Eric Levin
0f7f9990c2
Tuned haptic pulses for grab, release, equip, de-quip
2016-07-27 17:58:24 -07:00
Brad Hefta-Gaub
17a5fa040d
Merge pull request #8322 from jherico/deferred_batches
...
Deferred batches
2016-07-26 21:43:53 -07:00
Bradley Austin Davis
5bbcbbb811
Update render perf tool to use the new API
2016-07-26 17:06:44 -07:00
Bradley Austin Davis
54a7265be8
Removing empty file, because jenkins
2016-07-26 16:32:56 -07:00
