Commit graph

76548 commits

Author SHA1 Message Date
John Conklin II
6af2b25767
Merge pull request #14980 from AndrewMeadows/dont-clear-space
Case 21309: don't corrupt workload system
2019-02-25 09:52:15 -08:00
Clement
d27d624c3f Don't send a KillAvatar packet on kick
The DS already takes cares of removing nodes no longer allowed when
the permissions are updated and KillAvatar was never meant to be used
from the DS.
2019-02-25 09:47:35 -08:00
Sam Gateau
b563f21037 Fix comments 2019-02-25 09:32:27 -08:00
Sam Gateau
df6d8f3be0 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 21:31:28 -08:00
Sam Gateau
4ee2b43229 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 20:49:51 -08:00
Sam Gateau
26ad42b965 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 19:07:56 -08:00
Sam Gateau
f4a79a1e92 Mege with master the culling scale 2019-02-24 15:08:23 -08:00
Sam Gateau
ff5e9ee5d3
Merge pull request #14999 from amerhifi/quest-demo
case 21395: Adjust culling matrix
2019-02-24 14:51:13 -08:00
Sam Gateau
d6b2dba352 Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo 2019-02-23 09:57:23 -08:00
Sam Gateau
4f0911bd29
Merge pull request #15003 from SamGondelman/nametag
Case 21397: Fix nametag rotation
2019-02-23 09:00:12 -08:00
Clement
d040803391 Delete old nodes with identical socket 2019-02-22 18:38:31 -08:00
Sam Gateau
dab0df1113 Trying to fix the damn gamma 2019-02-22 18:03:23 -08:00
SamGondelman
37720e9daa fix nametag rotation 2019-02-22 16:53:03 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot
Case 21354: Add "modelScale" property to fix pal
2019-02-22 16:36:17 -08:00
Sam Gateau
860b3a35e4
Merge pull request #14992 from hyperlogic/quest-demo-with-avatar-ik-optimizations
Quest demo with avatar ik optimizations
2019-02-22 16:32:24 -08:00
Sam Gondelman
30b6b7f21b
let's try that again 2019-02-22 16:30:36 -08:00
amer cerkic
5c1e5e0c46 cleanup 2019-02-22 16:30:17 -08:00
Anthony Thibault
1213084fc6
Merge pull request #14984 from kencooke/master
Case 21384: Avatar mouth blendshapes are not working correctly (master)
2019-02-22 16:29:07 -08:00
amer cerkic
5bf994626c scaling culling projection matrix by 1.5 to help reduce teh ugly effect of stuff getting cut off too early 2019-02-22 16:28:36 -08:00
Sam Gateau
f0c6acdbf6
Merge pull request #14998 from danteruiz/quest-demo
Start quest in quest-dev domain
2019-02-22 15:44:06 -08:00
NissimHadar
7cf79c1108 Now WITH installation of nitpick. 2019-02-22 15:06:42 -08:00
Dante Ruiz
eedd54d0b1 Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo 2019-02-22 15:02:01 -08:00
Dante Ruiz
a87e49bb23 start in quest dev 2019-02-22 15:01:30 -08:00
SamGondelman
081e62a647 fix parent loop crash 2019-02-22 14:26:15 -08:00
SamGondelman
dbc3ae3793 hmmm not working 2019-02-22 14:18:59 -08:00
amer cerkic
de821b5acc Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-22 13:42:20 -08:00
SamGondelman
a31b09b204 handle models with no materials 2019-02-22 13:17:13 -08:00
Shannon Romano
a63f3e76c8
Merge pull request #14972 from SamGondelman/billboard
Case 21341: Fix billboard mode in secondary camera
2019-02-22 13:01:09 -08:00
SamGondelman
6d6cd42adb fix bound scaling 2019-02-22 12:00:00 -08:00
amantley
9b73c83ebc removed merge markers
(cherry picked from commit 4286142daac70269de155c99c9bbdb1f951eaff6)
2019-02-22 11:55:14 -08:00
Sam Gateau
a49ec95638
Merge pull request #14988 from danteruiz/quest-demo
Case 21199: Fix borken shaders for forward rendering (quest)
2019-02-22 11:46:03 -08:00
NissimHadar
a6ad53e79e TEST 2019-02-22 11:30:26 -08:00
amantley
87d98e5b85 These are the squashed commits for the ik optimization for the Quest
Implmented using a new AnimSplineIK node in the anim graph

(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
2019-02-22 11:21:36 -08:00
Dante Ruiz
109eb62886 requested changes 2019-02-22 11:09:40 -08:00
danteruiz
aa8563f3fe fix quest ui elements 2019-02-22 10:40:32 -08:00
Brad Hefta-Gaub
2a1f4bb963
Merge pull request #14985 from luiscuenca/fixPickOnNullAvatar
Fix crash on AvatarManager::findRayIntersectionVector when Avatar becomes null
2019-02-22 10:14:21 -08:00
amer cerkic
38272c3162 Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-22 09:56:07 -08:00
Sam Gateau
1d5a4116b9
Merge pull request #14986 from amerhifi/quest-demo
case 21374 : Away mode on Quest when device is paused
2019-02-22 09:54:57 -08:00
amer cerkic
72d3664b31 Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-22 09:50:41 -08:00
amer cerkic
9c833f7e64 clean up 2019-02-22 09:21:51 -08:00
amer cerkic
f04fdb2187 added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user 2019-02-22 09:11:24 -08:00
luiscuenca
3072ca43de Detailed picking if avatar is not null 2019-02-22 09:24:38 -07:00
Ken Cooke
c1786edc24 Emulate the old behavior of _lastInputLoudness 2019-02-21 18:45:17 -08:00
Andrew Meadows
be2d4272da remove the other unnecessary _space->clear() 2019-02-21 18:11:16 -08:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK
AnimSplineIK node added to inverse kinematics
2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp
Cpp implementation of the Flow script
2019-02-21 17:10:05 -08:00
Bradley Austin Davis
65aca3afaf
Merge pull request #14979 from samcake/quest-demo
Case 21356:Fine tune the LOD manager max render target and world detail default for Quest / Tier Low
2019-02-21 16:45:19 -08:00
Sam Gateau
ab34deb55d
Merge pull request #14981 from jherico/quest/defaultdomain
Automatically go to quest-dev domain on startup
2019-02-21 16:44:26 -08:00
Brad Davis
ae6a73c710 Automatically go to quest-dev domain on startup 2019-02-21 16:42:47 -08:00
Sam Gateau
ddc42585d8 Cleanup syntax 2019-02-21 16:41:50 -08:00