amantley
73e628bb8d
merge with master fixes
2018-09-05 14:42:49 -07:00
sam gateau
15f54ac47d
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
2018-09-05 14:37:20 -07:00
sam gateau
1feaf286b4
keeping position separated from the other attributes
2018-09-05 14:35:50 -07:00
Ryan Huffman
335f66d165
Add filtering support to entity list
2018-09-05 14:30:48 -07:00
Ryan Huffman
739530cb85
Limit Entity List to only getting the properties it needs
2018-09-05 14:30:36 -07:00
Ryan Huffman
a9a5bf1e97
Replace entity list UI with custom, brute-force solution
2018-09-05 14:30:19 -07:00
Ryan Huffman
f2cc2f1485
Update entity list UI to be updated in a single batch
2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae
Add profiling to edit.js fof the entity list
2018-09-05 14:30:19 -07:00
Ryan Huffman
133ac0662a
Move entity list qml to scripts dir
2018-09-05 14:30:19 -07:00
David Rowe
097b4c177a
Merge branch 'master' into M17901
2018-09-06 09:30:10 +12:00
John Conklin II
649a22a70b
Merge pull request #13930 from misslivirose/fix-17828
...
Fix MS 17828: Explore Desktop Text Visible
2018-09-05 13:44:37 -07:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset
...
mark and cycle trait instances needing to be sent on mixer reconnect
2018-09-05 12:43:27 -07:00
Wayne Chen
841080ea72
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-05 11:54:21 -07:00
Wayne Chen
77bb6fa4d5
adding position to try again zone; updating whitespace
2018-09-05 11:53:49 -07:00
Sam Gateau
f5843c24d4
Merge branch 'black' of github.com:samcake/hifi into black-bis
2018-09-05 11:36:53 -07:00
Sam Gateau
2ced6d9681
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 11:35:59 -07:00
sam gateau
0e614ad578
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 11:35:08 -07:00
sam gateau
ce86e94e6f
Add simple optim and instrumentation for tthe number of input buffer changes per frame"
2018-09-05 11:34:33 -07:00
Thijs Wenker
198ec294ac
restore window parent on presentationMode switch
2018-09-05 20:13:48 +02:00
sam gateau
8344cb9aff
REfactor the FBXReader_Mesh for different vertex formats
2018-09-05 11:07:04 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
...
HMD mode bug fix for avatars with no eyes
2018-09-05 10:57:21 -07:00
Anthony Thibault
536de03637
Merge pull request #13935 from hyperlogic/bug-fix/takeoff-to-in-air-glitch
...
Fix for glitch when entering in-air state from takeoff.
2018-09-05 10:56:34 -07:00
Seth Alves
1bea6c9ea3
if not already logged in, show login dialog at launch-time rather than connect-to-domain-time
2018-09-05 10:38:12 -07:00
Wayne Chen
c6229c5c60
updating serverless file to have dynamic oops
2018-09-05 10:37:45 -07:00
Wayne Chen
179138aa10
updating serverless file to have dynamic oops
2018-09-05 10:36:06 -07:00
Andrew Meadows
db28ac0224
Merge pull request #13926 from FlameSoulis/fix/Build_LINUX.md-18.04
...
Updated and Revised BUILD_LINUX.md - Includes Ubuntu 18.04 steps
2018-09-05 10:18:26 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager
...
Miscellaneous low-level performance improvements
2018-09-05 10:12:05 -07:00
Wayne Chen
ebedbabace
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-05 09:06:36 -07:00
Wayne Chen
f38a26a1ff
updating location of oops dialog script
2018-09-05 09:04:17 -07:00
Sam Gateau
d2dcf6a3eb
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 08:40:30 -07:00
sam gateau
7de8f4867e
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 08:38:04 -07:00
Thijs Wenker
62d4b1805d
Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive
2018-09-05 17:25:14 +02:00
Wayne Chen
d6442b350c
updating redirect to the interstitial page url
...
TODO: Fix this link to s3 bucket hosted file
2018-09-04 23:18:57 -07:00
Wayne Chen
62abb51b26
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-04 23:18:06 -07:00
Wayne Chen
afd7321e7f
updating redirect with proper fbx
...
TODO: fix path when uploaded the fbx files
2018-09-04 23:16:59 -07:00
Wayne Chen
8b6c21e0bb
updating script path
...
TODO: will fix with s3 hosted script
2018-09-04 22:19:20 -07:00
Wayne Chen
7721cba483
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-04 22:18:16 -07:00
Wayne Chen
29b96d0bb2
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect
2018-09-04 22:17:49 -07:00
Wayne Chen
af1c473a9c
updating with models in meshes folder
2018-09-04 22:17:33 -07:00
Wayne Chen
0be7a5ffaa
fixing typo in domain handler
2018-09-04 19:58:56 -07:00
Wayne Chen
98c4d05b4a
fixing typo in domain handler
2018-09-04 19:54:30 -07:00
Wayne Chen
1ce6c84c08
updating metacall for loadServerlessDomain
2018-09-04 18:24:49 -07:00
Wayne Chen
2e17140c07
fixing loadServerlessDomain function to be from 404 redirect
2018-09-04 18:24:01 -07:00
Wayne Chen
c47788efe4
merging with dante's PR
2018-09-04 18:00:06 -07:00
Wayne Chen
9e0fa08cf1
adding property to location, updating domain
2018-09-04 17:46:23 -07:00
sam gateau
adcabf52c5
Refactoring the FBXReader_MEsh.cpp for better interleaving
2018-09-04 17:33:18 -07:00
SamGondelman
9e76c164ac
fix aabox operator+=
2018-09-04 16:25:47 -07:00
Anthony Thibault
e210fadc7c
Fix for glitch when entering inAir state from takeoff.
...
This was due to a frame lag of blend factor used for inAir blending. So the first frame the upward velocity would be 0, followed by 3.5 m/s the next frame.
This is fixed by using the workingVelocity instead of _lastVelocity to drive the blend.
2018-09-04 14:36:56 -07:00
John Conklin II
476887a224
Merge pull request #13909 from NissimHadar/fixFileUtils
...
Create correct folder.
2018-09-04 14:20:20 -07:00
Wayne Chen
002c6547ee
entity script URL update
2018-09-04 14:08:13 -07:00
