amantley
|
12dbaa0ea0
|
changed the condition so that you can turn off ik in hmd mode if you want to for debug purposes
|
2019-02-25 14:56:17 -08:00 |
|
amer cerkic
|
0775392759
|
adding market place back to the default scripts
|
2019-02-25 14:05:54 -08:00 |
|
Andrew Meadows
|
6e13203fec
|
avoid nullptr deref
|
2019-02-25 13:52:46 -08:00 |
|
SamGondelman
|
b2e0067c08
|
Merge remote-tracking branch 'upstream/master' into nametag
|
2019-02-25 13:12:48 -08:00 |
|
amantley
|
363c0cc26f
|
moved the update of last ik to outside the if changed statement
|
2019-02-25 13:03:28 -08:00 |
|
Brad Davis
|
5831db3089
|
Build quest demo apk on Jenkins
|
2019-02-25 13:02:37 -08:00 |
|
amantley
|
cff0fd470a
|
re-enabled ik off by default on Desktop
|
2019-02-25 12:23:03 -08:00 |
|
SamGondelman
|
e102ad073e
|
allow flying in HMD if you would otherwise fall forever
|
2019-02-25 11:49:38 -08:00 |
|
Sam Gateau
|
0691f02198
|
Merge pull request #15010 from samcake/quest-demo
Case 21408: Quest demo - Fixing the gamma correction
|
2019-02-25 11:36:29 -08:00 |
|
Seth Alves
|
db821487d9
|
don't allow others' grabs to move locked or ungrabbable things
|
2019-02-25 11:27:10 -08:00 |
|
amer cerkic
|
dfad1d3f88
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2019-02-25 10:29:46 -08:00 |
|
Shannon Romano
|
dc6bdfae8a
|
Merge pull request #14995 from SamGondelman/parentCrash
Case 21391: Fix parent loop crash
|
2019-02-25 10:01:37 -08:00 |
|
SamGondelman
|
8058ad884e
|
trying to fix overlay rotation
|
2019-02-25 09:53:33 -08:00 |
|
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 |
|