Kerry Ivan Kurian
f2a046da91
Install marketplace item tester
2018-09-18 00:08:09 -07:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor
...
Fixing Error State for Timeout/localhost Redirection
2018-09-13 15:19:55 -07:00
John Conklin II
8e5f2d0e08
Merge pull request #13983 from danteruiz/disable-interstitial
...
disable interstitial by default and fix crash
2018-09-13 14:01:28 -07:00
Wayne Chen
647c4e1694
adding true fix for localhost timeouts
2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
Wayne Chen
380f24b37f
adding fix, changing window title
2018-09-13 11:53:21 -07:00
Wayne Chen
bcd014ddc8
Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor
2018-09-13 10:29:02 -07:00
Dante Ruiz
dca34c7cbe
remove warning for GCC
2018-09-13 08:32:47 -07:00
Wayne Chen
5902699870
adding updated models for redirect
2018-09-12 22:54:23 -07:00
Wayne Chen
fc007982e0
muting opt out activity if login fail/success
2018-09-12 21:25:41 -07:00
Wayne Chen
be650d5af0
changing when to log - there is broken code in bodyLoader
2018-09-12 16:00:43 -07:00
Dante Ruiz
d76a2c1add
disable interstitial by default and fix crash
2018-09-12 15:31:03 -07:00
Stephen Birarda
b1f44d2ad7
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
2018-09-12 12:30:15 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
...
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-11 18:53:06 -07:00
Wayne Chen
30e9d57026
adding pattern for during timeout to put into error state
2018-09-11 18:52:28 -07:00
Wayne Chen
a7321f950a
pushing requested changes - adding timeout refusal
2018-09-11 18:32:17 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb
...
Avatar loading orb now indicates loading status
2018-09-11 18:01:40 -07:00
Wayne Chen
2267085dbf
removing unused counter variable
2018-09-11 17:46:01 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch
...
Pop up login dialog on launch
2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Wayne Chen
84f95dd4b8
updating typo
2018-09-11 17:03:06 -07:00
Wayne Chen
d4dfaec8ea
updating typo
2018-09-11 17:02:38 -07:00
Wayne Chen
d478fcf027
remove unused signal from domain handler
2018-09-11 17:01:14 -07:00
Wayne Chen
9ee21c9956
removing virtual keyword from destructor
2018-09-11 16:49:11 -07:00
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars
...
handle agent avatar clear on avatar mixer disconnect
2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged
...
making requested changes and fixing compile issue for jenkins
2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908
expose domain connection error to Window
2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -07:00
Anthony Thibault
23ed314250
Fix for missing return warning
2018-09-11 14:50:50 -07:00
Dante Ruiz
b665dbe13e
finished requested changes
2018-09-11 14:18:12 -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
Anthony Thibault
bc5d9a46a2
Avatar loading orb now indicates status
...
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
2018-09-11 13:12:46 -07:00
Wayne Chen
e7aef92e99
fixing logout bug from syntax reversion
2018-09-11 12:51:51 -07:00
Wayne Chen
d69e536120
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 12:18:36 -07:00
Dante Ruiz
cc2c208b12
fix small issue
2018-09-11 12:12:31 -07:00
Dante Ruiz
735ff04fad
fixing merge conflicts
2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d
first round of requested changes
2018-09-11 12:01:55 -07:00
Wayne Chen
800df1b077
Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch
2018-09-11 11:02:16 -07:00
Wayne Chen
e931b661a5
login dialog pops up in HMD again
2018-09-11 11:00:39 -07:00
Wayne Chen
2a7e2af44f
syntax reversion + removing poppedUp var
2018-09-11 10:36:10 -07:00
Wayne Chen
84cf40f8aa
changing calculation of load percentage
2018-09-11 10:07:57 -07:00
Wayne Chen
aa62a89318
removing more logging for login dialog
2018-09-11 09:49:12 -07:00
Wayne Chen
9d7ba377ca
removing logging for login dialog
2018-09-11 09:42:53 -07:00
Wayne Chen
ee516fd79f
adding proper checking for saved username/login
2018-09-11 09:36:46 -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
Brad Hefta-Gaub
ab1718747b
Merge pull request #13970 from jherico/fix/fb18149
...
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
2018-09-11 09:31:33 -07:00
Wayne Chen
6bcf6eaae7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 09:13:41 -07:00
Wayne Chen
565bf7f6bd
adding correct implementation of show password
2018-09-11 09:08:35 -07:00
Wayne Chen
030ee13f31
removing logging from tabletlogindialog
2018-09-10 23:05:31 -07:00
