David Back
55a4c55f78
remove unused and rename var
2018-09-12 14:48:27 -07:00
David Back
3da442a8f9
allow highlights in hmd, fix center scale hmd math
2018-09-12 14:44:04 -07:00
Seth Alves
d5456eda6c
Merge pull request #13980 from birarda/bug/parented-traited-entities
...
revert avatar entity XORing, perform avatar entity cleanup in handleRemovedAvatar
2018-09-12 14:29:39 -07:00
John Conklin II
e243792cac
Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192
...
MS16192: Fix Near Grabbing After Using Web Entity
2018-09-12 12:50:44 -07:00
Stephen Birarda
b1f44d2ad7
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e
Revert "cycle avatar entity IDs for new avatar mixer"
...
This reverts commit 20912349a4
2018-09-12 12:22:07 -07:00
Stephen Birarda
6d3e6a661f
Revert "XOR incoming trait instance IDs for other avatars"
...
This reverts commit 9b3d9dd0f3
2018-09-12 12:20:31 -07:00
Stephen Birarda
4b93f9f5cd
Revert "use different XORed instance ID for replicas"
...
This reverts commit a37a19da1e
2018-09-12 12:20:03 -07:00
David Back
cf1c1296a7
fix center scale cube in hmd
2018-09-12 11:44:26 -07:00
Wayne Chen
521361293a
moving comment locations inside conditionals
2018-09-12 11:03:00 -07:00
Wayne Chen
acf34dcfdf
one more unused variable
2018-09-12 10:58:05 -07:00
Wayne Chen
8bef0d0de4
removing unused variables
2018-09-12 10:55:40 -07:00
Wayne Chen
a96e78c72d
removing debug
2018-09-12 10:54:38 -07:00
Simon Walton
7136698c6b
Move default pose flags out of joint-positions condition
2018-09-12 10:49:26 -07:00
Wayne Chen
b9f0af63e1
changing check for near grabbing modules - fixes grabbing for dynamic
2018-09-12 10:38:21 -07:00
Simon Walton
0d72e3808c
Small changes per review
2018-09-12 10:31:26 -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
Sam Gateau
f79c92b4ff
Merge pull request #13974 from samcake/black-ter
...
Fix a missing std::chrono::duration_cast
2018-09-12 08:27:19 -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
045ac4cb0d
allowing grip button for interrupting web scroll
2018-09-11 17:43:03 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight
2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back
2018-09-11 17:07:49 -07:00
Simon Walton
15f06264f9
Remove unneeded #include
2018-09-11 17:03:39 -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
SamGondelman
1a36693161
I hate blendshapes
2018-09-11 16:58:38 -07:00
Simon Walton
2a0ee1c532
Cherry-pick of commit cde2dc2e to fix merge issue
2018-09-11 16:58:21 -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
sam gateau
8c7781a6d4
use the std::chrono duration the way it should be
2018-09-11 15:57:57 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -07:00
Wayne Chen
b6c5ae2a68
staging changes
2018-09-11 15:23:40 -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
Wayne Chen
07bda90519
Merge pull request #2 from danteruiz/interstitalMerged
...
Dev review requests
2018-09-11 14:23:54 -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
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
