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
Simon Walton
0738bcaebc
Unused variable from merge
2018-09-04 18:08:34 -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
Simon Walton
262dbaf5ed
Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling
2018-09-04 15:27:41 -07:00
Simon Walton
695fabf4f5
Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling
2018-09-04 15:27:18 -07:00
Simon Walton
6ae2ca1576
Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
...
Merge of Samuel's change to use simple sort instead of priority queue
2018-09-04 15:26:26 -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
Simon Walton
7af69b5450
Check that a requested listened port is used in NodeList
2018-09-04 13:53:25 -07:00
Wayne Chen
22a8164401
adding back refusal notifications + domain bounds/floor
2018-09-04 13:53:03 -07:00
Sam Gateau
b92d1061c4
Merge pull request #13920 from AndrewMeadows/dont-bid-for-locked
...
don't bid for simulation ownership of locked entities
2018-09-04 13:26:21 -07:00
SamGondelman
dff8292216
fix framebuffer debug
2018-09-04 12:50:25 -07:00
Zach Fox
3329dd8e71
Merge pull request #13929 from zfox23/MS17902_installApp
...
Fix MS17902: Prevent case where My Purchases says Open instead of Uninstall
2018-09-04 12:47:15 -07:00
John Conklin II
eaa5e2ea9a
Merge pull request #13927 from kencooke/audio-hrtf-avx2-more
...
Low-level performance improvements to audio-mixer
2018-09-04 12:06:32 -07:00
Anthony Thibault
b21fa1037f
Code review feedback and bug fixes for calibraiton matrices
2018-09-04 11:55:52 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Wayne Chen
a7abebd7aa
adding redirect json to post build in Mac
2018-09-04 11:11:34 -07:00
Simon Walton
fff6a10bcd
Remove some debug logging from safe landing additions
2018-09-04 10:58:40 -07:00
Simon Walton
058115b791
Add guard for sentJointDataOut
2018-09-04 10:38:18 -07:00
Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Sam Gateau
a328528642
Merge pull request #13883 from NissimHadar/addMap_d
...
Added read of map_d from MTL files
2018-09-04 09:38:07 -07:00
Simon Walton
c2ea05b026
Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling
2018-09-04 09:31:05 -07:00
sam gateau
761e8a3f95
fixing warnings
2018-09-04 09:19:24 -07:00
Zach Fox
24cf4adb44
Fix MS17902: Prevent case where My Purchases says Open instead of Uninstall
2018-09-04 09:08:42 -07:00
Liv Erickson
c081fd75f7
update serverless content
2018-09-04 09:08:35 -07:00
Andrew Meadows
49e48f5ea0
enable workload regulation by default
2018-09-04 08:49:19 -07:00
Flame Soulis
b5f1c82e61
Corrected interferace to interface
2018-09-03 18:21:04 -04:00
Ken Cooke
f5b7232f58
Cleanup
2018-09-03 14:00:30 -07:00
Ken Cooke
94e8ee99f5
AVX2 implementation of interpolate()
2018-09-03 13:06:49 -07:00
Flame Soulis
8314386426
Revised all apt statements to apt-get for consistency
2018-09-03 08:55:15 -04:00
Flame Soulis
26cb2409b9
Added additional export QT_CMAKE_PREFIX_PATH related to BUILD_LINUX.md
2018-09-03 08:53:20 -04:00
Flame Soulis
143b4a61dd
Revised server compilation statement and grammer error
2018-09-03 08:25:45 -04:00
