David Rowe
861ce2c27b
Reduce whitespace in Clara categories
2016-12-15 20:33:43 +13:00
David Rowe
eb7b2dbdcf
Improve robustness of navigation footer
2016-12-14 15:07:06 +13:00
David Rowe
2b0529bcea
Inform user if can't do Clara.io download because can't write to ATP
2016-12-14 14:45:33 +13:00
David Rowe
4890e92733
Start at HiFi marketplace page instead of directory page
2016-12-14 00:12:52 +13:00
David Rowe
8195393205
Fix Clara marketplace button appearing on top of navigation footer
2016-12-13 22:54:19 +13:00
David Rowe
20623ebddb
Raise and lower keyboard on password fields
2016-12-13 22:48:17 +13:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
samcake
9155f11b3d
Merge pull request #9190 from jherico/test_mode
...
Add test mode to interface
2016-12-12 15:37:05 -08:00
Chris Collins
4ce1bb3abc
Merge pull request #9172 from thoys/avatarFinderBeacon
...
avatarFinderBeacon.js -- Find other avatars more easily
2016-12-12 15:25:36 -08:00
Brad Davis
2a43f5fbef
Add test mode to interface
2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
David Rowe
14ecb24986
Remove extra browse history item created by Clara download
2016-12-11 17:43:55 +13:00
Faye Li Si Fi
78c96293a7
Staging cameras, lights, and backdrop
2016-12-09 17:25:18 -08:00
David Rowe
c87149cfc2
Tidying
2016-12-10 12:59:01 +13:00
Thijs Wenker
3ec06b1a6e
Remove redundant parentheses
2016-12-10 00:21:20 +01:00
David Rowe
a52d8d1982
Merge branch 'master' into 21089
2016-12-10 11:47:43 +13:00
Seth Alves
dd3f3957a9
Merge pull request #9164 from fayeli/last-edited-property
...
Exposing last edited property of Entity to Javascript
2016-12-09 13:13:11 -08:00
Thijs Wenker
4d467deb5e
Fix if statement to match style rule 4.2.8
2016-12-09 21:26:59 +01:00
Thijs Wenker
3f9aa00fd6
Increased show-radius to 20 meters
2016-12-09 19:39:48 +01:00
David Rowe
e956608fa4
Fix keyboard focus when switch highlight between overlays and entities
2016-12-09 18:31:52 +13:00
David Rowe
7d8926c802
Fix Web overlay x, y coordinate calcs
2016-12-09 17:00:00 +13:00
Thijs Wenker
9397108b3b
clear -> cleanup typo
2016-12-09 03:14:05 +01:00
Thijs Wenker
3ceac7d071
Fix for "cannot access member `sessionUUID' of deleted QObject" error
2016-12-09 02:44:43 +01:00
Thijs Wenker
28e8bb69ec
ignore camera man
2016-12-09 02:29:21 +01:00
Thijs Wenker
387f73b349
reset avatar beacons on domain change
2016-12-09 02:11:05 +01:00
Thijs Wenker
dfb4c7cf89
avatarFinderBeacon
2016-12-09 01:41:19 +01:00
Faye Li Si Fi
33142d6a7f
mvp progress
2016-12-08 16:01:50 -08:00
Faye Li Si Fi
1644c2eeb4
added unit test
2016-12-08 11:17:38 -08:00
David Rowe
4c236b293e
First pass at controller interaction with 3D Web overlay
2016-12-09 01:47:40 +13:00
David Rowe
c4c2a95e83
Add "back" button to marketplaces footer
2016-12-08 10:58:37 +13:00
David Rowe
1de2c14fee
Remove e-mail message hyperlink if displaying on tablet
2016-12-07 12:52:53 +13:00
David Rowe
e821ec5593
Inject navigation footer into Clara account createion page
2016-12-07 12:38:16 +13:00
David Rowe
01226b03ef
Improve text and robustness of marketplaces footer
2016-12-07 12:20:43 +13:00
David Rowe
eafd51ba9e
Merge branch 'master' into 21089
2016-12-07 11:27:15 +13:00
David Rowe
460d332c6f
Delete redundant code
2016-12-07 10:06:32 +13:00
David Rowe
8e30674069
Tidying
2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8
Handle Clara marketplace downloads
2016-12-07 09:16:59 +13:00
howard-stearns
3ba5e1ed4a
new mic toolbar button art
2016-12-06 10:52:40 -08:00
Andrew Meadows
7db8e8f31b
Merge pull request #9156 from hyperlogic/out-of-body-revert
...
Revert Out of Body experience
2016-12-06 08:37:20 -08:00
Ryan Downe Karpf
fa50e8eddd
Merge pull request #9157 from howard-stearns/mic-icon-swap
...
new mic unumute art
2016-12-05 17:01:59 -08:00
Ryan Huffman
a81e7c2d2c
Merge pull request #9148 from Polyrhythm/ryan/client-side-tests
...
Client script test runner
2016-12-05 16:23:17 -08:00
howard-stearns
7621672964
new mic unumute art
2016-12-05 16:00:03 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8
, reversing
changes made to 333e9ec7f4
.
2016-12-05 15:18:03 -08:00
Ryan Jones
094857949d
tabs -> spaces, remove raw ptr, remove unnecessary spec diff
2016-12-05 12:57:21 -08:00
Ryan Huffman
996d3f5875
Merge pull request #9135 from druiz17/nearGrab
...
Fixed pressing the grip button causes a near grabbed object to drop
2016-12-05 11:07:15 -08:00
Dante Ruiz
08301d488d
clean up
2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f
better solution
2016-12-05 18:08:36 +00:00
David Rowe
b83d5c6275
Inject Clara Web page modifications
2016-12-05 21:34:34 +13:00
David Rowe
2f42f4cfa5
Merge branch 'master' into 21089
2016-12-05 18:33:38 +13:00