Commit graph

1330 commits

Author SHA1 Message Date
Melissa Brown
20787c9c7c Merge pull request #11644 from cain-kilgore/21508
WL 21508 - Improve upon Skybox Changer
2017-10-23 10:30:55 -07:00
Cain Kilgore
b42afdaff0 WL 21508 - Cleanup from Code Review 2017-10-23 16:27:28 +01:00
vladest
b791dcba7f Add sound cues to create app 2017-10-22 14:59:53 +02:00
vladest
cf7b050680 Sound cues for GoTo interface 2017-10-21 20:47:56 +02:00
Cain Kilgore
bc772a2f9a WL 21508 - Improve upon Skybox Changer 2017-10-21 19:42:53 +01:00
Brad Hefta-Gaub
f6af1d1ecf Merge pull request #11387 from vladest/tablet_extended_sounds
Tablet extended sounds
2017-10-20 13:49:06 -07:00
Seth Alves
9d00606505 Merge pull request #11635 from druiz17/fix-hud-issues
actually fix toolbar from completely dispersing
2017-10-20 10:22:34 -07:00
vladest
fa349a694c Code style fixes 2017-10-20 15:12:09 +02:00
vladest
ea6c2e1bb5 Merge branch 'master' into tablet_extended_sounds 2017-10-20 14:46:02 +02:00
druiz17
f2ad61934b fix toolbar from completely dispearing 2017-10-19 14:02:21 -07:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Brad Hefta-Gaub
f951a23356 Merge pull request #11627 from druiz17/reload-script
fixed toolbar disapearing after reloading default scripts
2017-10-19 09:32:36 -07:00
Zach Fox
dc1b3aef8f Don't show purchases tutorial if user clicks what is rez 2017-10-18 16:25:06 -07:00
druiz17
36912f1cd4 fixed toolbar disapearing after reloading default scripts 2017-10-18 16:03:32 -07:00
Zach Fox
1b7b35fe91 What does Rez mean? 2017-10-18 15:44:06 -07:00
Zach Fox
91ac2ab58c LowerKeyboard button changes 2017-10-18 15:31:12 -07:00
Zach Fox
a993386613 Change color of 'Instructions Opened on Desktop' to disabled gray 2017-10-18 15:13:28 -07:00
Zach Fox
33508b6b2b Update help text 2017-10-18 14:55:45 -07:00
Zach Fox
e829bd2919 Fix 'Recent Activity' indentation 2017-10-18 14:47:14 -07:00
Zach Fox
6f5fafb62f Add 'showDebugButtons' switch on Help ta 2017-10-18 14:12:43 -07:00
Zach Fox
6b7c997a4c Minor text tweak 2017-10-13 13:37:11 -07:00
Zach Fox
051019a57a Fix certificate username text eliding too early 2017-10-13 12:10:37 -07:00
Zach Fox
95a9675220 Final help QA - minus link to blockchain docs 2017-10-13 10:58:15 -07:00
vladest
2d010980b0 Removed special sound for Mute and replace it with hover and click sounds 2017-10-12 19:15:09 +02:00
vladest
b965049651 Do not produce sound and highlight on disabled items and menu separators 2017-10-12 18:39:26 +02:00
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
Zach Fox
99109fe8e5 Merge pull request #11567 from zfox23/commerce_daveIntegration3
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Zach Fox
3f0ec73be6 Fix date displays 2017-10-11 10:55:14 -07:00
Zach Fox
5e383e2b1c My Item certificates 2017-10-10 14:56:17 -07:00
Dante Ruiz
742cf0debe Merge pull request #11383 from ElderOrb/case7384
7384 On Domains without Edit Access, Create Button Text still Highlights
2017-10-10 14:30:49 -07:00
Zach Fox
702528a8cc Fully integrate cert properties 2017-10-10 13:27:17 -07:00
Zach Fox
1c0a564155 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3 2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7 Merge pull request #11555 from zfox23/commerce_daveIntegration2
2017-10-09 Commerce Frontend Updates
2017-10-10 12:34:30 -07:00
Zach Fox
be2b241629 Lots of progress; don't yet have some things 2017-10-10 12:20:48 -07:00
Zach Fox
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Zach Fox
b81a8a95ea Final fixes 2017-10-09 15:23:22 -07:00
Zach Fox
38b95b5403 Instructions HTML file and flow 2017-10-09 15:07:14 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Zach Fox
acdd1e32e4 First round 2017-10-09 12:11:07 -07:00
druiz17
cd97ab0fdf fixed looping sample sound bug 2017-10-09 11:39:57 -07:00
Thijs Wenker
77a36bf788 Merge pull request #10892 from ctrlaltdavid/vr-edit-a
VR edit app
2017-10-07 02:19:00 +02:00
Zach Fox
051b63503c Merge pull request #11534 from zfox23/commerce_daveIntegration1
Commerce backend changes sync, October 5 2017
2017-10-06 09:45:45 -07:00
David Rowe
28c7ef2e97 Merge branch 'master' into vr-edit-a 2017-10-06 11:54:08 +13:00
Zach Fox
0b600a74c3 Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout 2017-10-05 14:34:53 -07:00
Zach Fox
9290a51685 Fix confirmed text 2017-10-05 14:03:56 -07:00
Andrew Meadows
05f2dfbbc3 Merge pull request #11529 from vladest/fix_audiotab_name_alignment
Fix alignment of audio devices input header
2017-10-05 13:50:29 -07:00
Zach Fox
8e82095135 Number sold and limited run 2017-10-05 12:46:20 -07:00
Zach Fox
d605bd9ef4 Preprocess inventory endpoint result 2017-10-05 11:01:15 -07:00
Ryan Huffman
f0c9badbd6 Fix misspelling in lost-connection-to-atp error 2017-10-05 09:10:46 -07:00
vladest
193dc83b99 Fix alignment of audio devices input header 2017-10-05 13:59:42 +02:00