Kerry Ivan Kurian
697f556a60
Persist list of marketplace items in test
...
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
2018-09-24 16:30:49 -07:00
Kerry Ivan Kurian
f9c25f2f32
Allow user to select asset type in marketplace item tester
2018-09-20 16:36:06 -07:00
Kerry Ivan Kurian
c1cc031bd0
Remove cruft and refactor
2018-09-20 14:50:27 -07:00
Kerry Ivan Kurian
ae4352f450
Rez entity in marketplace item tester
2018-09-20 13:55:22 -07:00
Kerry Ivan Kurian
afa8e44e66
Refactor
2018-09-20 10:53:32 -07:00
Kerry Ivan Kurian
5445d6f670
Switch to localhost before replacing content
2018-09-19 16:06:43 -07:00
Kerry Ivan Kurian
38fd9523ee
Attempt to load content set
...
This does not result in the user seeing the content set.
2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian
5bc7d944f9
Remove whitespace
2018-09-19 15:17:13 -07:00
Kerry Ivan Kurian
cfa9d185f0
Add full resource paths to list in marketplace item tester
2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b
Enable marketplace item test for avatar file
2018-09-18 13:25:01 -07:00
Kerry Ivan Kurian
645ad2bb7a
Enable marketplace item test for avatar url
2018-09-18 12:36:03 -07:00
Kerry Ivan Kurian
8f5923d562
Show installed apps on start of marketplace item tester
...
Also, refactor a bit.
2018-09-18 11:23:32 -07:00
Kerry Ivan Kurian
f2a046da91
Install marketplace item tester
2018-09-18 00:08:09 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Seth Alves
3b3006efb0
Merge pull request #13911 from ElderOrb/FB17982_master
...
Avatar App: stop reloading existing selected bookmarks on app relaunch (master)
2018-09-11 14:04:19 -07:00
Brad Hefta-Gaub
299e9d0d38
Merge pull request #13897 from ElderOrb/filter_out_hands_from_joints
...
filter out left/right hands from joints list in avatarapp
2018-09-11 09:34:48 -07:00
John Conklin II
9c546fc780
Merge pull request #13957 from ElderOrb/FB18024
...
fix keyboard collapsing in VR/goto
2018-09-10 13:09:28 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901
...
Improve HMD Menu page navigation
2018-09-10 11:34:21 -07:00
Alexander Ivash
7058b07aea
FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized
2018-09-07 12:41:39 +03:00
Wayne Chen
72818f3729
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged
2018-09-06 17:37:36 -07:00
Zach Fox
0e785f9bdb
Fix MS17877: Persist Connections table sort choice
2018-09-06 15:35:26 -07:00
David Rowe
ab47e16be1
Fix up titles and leading white space of some dev menu tablet dialogs
2018-09-06 14:35:08 +12:00
David Rowe
8420afd143
Fix title not not going back to "Settings" upon Save or Cancel
2018-09-06 14:00:33 +12:00
David Rowe
a7099025dc
Fix up some Settings dialogs' titles
2018-09-06 11:15:14 +12:00
David Rowe
960bf00e12
Modify look of HMD mode Settings dialogs' titles
2018-09-06 11:02:24 +12:00
David Kelly
b022697dfa
volume slider on users fixed
2018-09-05 15:36:07 -07:00
David Rowe
398724de73
Make Save in HMD settings dialogs return to previous dialog
...
Same as Cancel key does.
2018-09-06 10:23:45 +12:00
David Rowe
f144308334
Make tablet menu page title navigation go back a level
2018-08-31 16:58:59 +12:00
Alexander Ivash
07739453c5
coding standards
2018-08-31 01:51:13 +03:00
Alexander Ivash
cb1855b0d7
filter out left/right hands from joints list in avatarapp
...
should fix:
FB17884 - Wearable disappears when added to some joints
FB17885 - Changing werable joint moves the model and detaches from avatar body
2018-08-31 01:51:13 +03:00
Alexander Ivash
daf81bbcb8
FB17982 Avatar App reloads existing selected bookmark on app relaunch
2018-08-31 00:36:52 +03:00
Wayne Chen
6cdcae3349
switching address syntax, updating redirection domain
2018-08-29 16:11:51 -07:00
David Rowe
c29c9f98c1
Make Cancel in HMD settings dialogs return to Settings dialog
2018-08-28 11:15:57 +12:00
Zach Fox
dddb2141f0
Implement Wallet Security feature - Auto Logout checkbox
2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588
Merge howard/wallet-locker2 into my branch
2018-08-23 14:45:16 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184
...
Add Support for Managing Avatar Entities to the Avatar App
2018-08-22 10:20:04 -07:00
Alexander Ivash
cfb820762d
bulk adjusting to coding guidelines
2018-08-22 00:42:01 +03:00
Alexander Ivash
9f92ff5de9
fix for duplicating wearables on saving
...
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25
take 'relayParentJoints' into account during wearables comparison
2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2
explicitely specify localRotations on joint change, otherwise it will be updated by engine
2018-08-18 16:32:31 +03:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
...
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184
2018-08-16 02:08:47 +03:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll
...
Auto scroll
2018-08-14 20:56:53 -07:00
Roxanne Skelly
50b0a458ce
Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled.
2018-08-14 16:32:56 -07:00
Roxanne Skelly
5a8da4ce97
Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app
2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae
Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll
2018-08-14 15:27:22 -07:00
Seth Alves
832eefd3a2
Merge pull request #13752 from ctrlaltdavid/M17208
...
Improve text in Avatar app's pop-ups
2018-08-14 08:48:04 -07:00
unknown
c622a587e3
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-11 07:59:56 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340
...
Only update gain if it really changed
2018-08-10 16:20:24 -07:00
Zach Fox
096be16bb1
Only restart timer if feedMouseArea doesn't contain mouse
2018-08-10 15:32:44 -07:00
