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
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
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
Sam Gateau
3fc47bf6fc
Merge pull request #13972 from samcake/black-ter
...
Replacing cpu timing calls from gl to std::chrono
2018-09-11 15:02:15 -07:00
Anthony Thibault
23ed314250
Fix for missing return warning
2018-09-11 14:50:50 -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
Ryan Huffman
530fa5aee9
Merge pull request #13865 from dback2/editHandleScaleImprovements
...
Edit handle scale improvements
2018-09-11 12:57:47 -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
sam gateau
77586933c8
Merge and fix the default _value of GLquery so it is 0, not broken
2018-09-11 11:43:14 -07:00
sam gateau
9516c42db9
Merge branch 'master' of github.com:highfidelity/hifi into black-ter
2018-09-11 11:35:27 -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
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
sam gateau
840c8c95fd
cleaning the code and comments
2018-09-11 09:34:42 -07:00
Ryan Huffman
c7f6bf181b
Merge pull request #13943 from huffman/perf/create-profile-no-listjs
...
Improvements to entity list loading times
2018-09-11 09:33:28 -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
sam gateau
5895ef218d
Merge branch 'master' of github.com:highfidelity/hifi into black-ter
2018-09-11 08:26:44 -07:00
Wayne Chen
030ee13f31
removing logging from tabletlogindialog
2018-09-10 23:05:31 -07:00
Wayne Chen
69ae475787
adding user activity logging
2018-09-10 23:04:50 -07:00
Sam Gateau
5e76a0c6d7
changing the cpu timer of the batch to std::chrono instead of using gl cpu time stamp
2018-09-10 22:55:12 -07:00
Wayne Chen
5ece8d8707
using different paradigm for checking login dialog popup
2018-09-10 18:32:21 -07:00
Anthony Thibault
1e972595b1
Merge pull request #13962 from hyperlogic/bug-fix/recorded-blendshapes-2x
...
Fix for blendshapes playing back in recordings at 2x their proper values
2018-09-10 17:53:17 -07:00
Stephen Birarda
a50e55b83a
use more efficient iterate and clear for removal
2018-09-10 17:06:57 -07:00
John Conklin II
b184ad1334
Merge pull request #13722 from wayne-chen/fixAudioStats-RC71-13955
...
MS13955: Audio Stats are blank
2018-09-10 17:03:31 -07:00
Sam Gateau
47cea49f78
Merge pull request #13922 from samcake/black-bis
...
Optimize the vertex formats of meshes for less input buffer bindings
2018-09-10 16:58:40 -07:00
Ryan Huffman
4b8f5ea6b9
Fix syntax and duplicate event handlers in entityList.js
2018-09-10 16:44:13 -07:00
Wayne Chen
dcacfdba7c
adding popup property to qml
2018-09-10 16:22:55 -07:00
unknown
1ad3a09984
CR changes
2018-09-10 16:09:21 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
...
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
unknown
17c3163264
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements
2018-09-10 15:31:58 -07:00
Brad Davis
ba1ac7c180
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
2018-09-10 15:07:15 -07:00
Wayne Chen
e7616c7d34
added logging + activity logging
2018-09-10 15:06:14 -07:00
John Conklin II
5a1485a4f5
Merge pull request #13968 from thoys/fix/create/reloadCrash
...
MS18269: Fix Reloading Scripts with Create open crashes system
2018-09-10 15:01:43 -07:00
John Conklin II
29c80fc075
Merge pull request #13959 from thoys/bug/create/createPosNewEntities
...
MS17841: CreateApp - Adjust default position of new entities
2018-09-10 14:45:56 -07:00
Sam Gateau
082d47d20f
Set the correct assert in replacment of the unecessary if branch
2018-09-10 14:31:49 -07:00
Roxanne Skelly
c7b07c8f27
Merge pull request #13946 from roxanneskelly/featuredStories
...
For stories, use the action string for notifications instead of a hard-coded value.
2018-09-10 14:25:03 -07:00
John Conklin II
558f3dc7e5
Merge pull request #13964 from dback2/reloadScriptQThreadCrash
...
Destroy script thread on finish instead of on ScriptEngine destroyed
2018-09-10 14:11:37 -07:00
Ryan Huffman
5aa5552727
Fix PROFILE not forwarding calls when disabled
2018-09-10 14:07:25 -07:00
Anthony Thibault
4754ff7f54
Merge pull request #13963 from hyperlogic/feature/improve-jump-anims
...
Improve animations for jump, inAir and less feminine walk cycle
2018-09-10 13:57:33 -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
Anthony Thibault
1570ae6424
Merge branch 'master' into bug-fix/recorded-blendshapes-2x
2018-09-10 12:58:53 -07:00
