Shannon Romano
|
2aa622b855
|
Merge pull request #15014 from sethalves/fix-grab-earthquake
case 21411: don't allow others' grabs to move locked or ungrabbable things
|
2019-02-26 09:03:44 -08:00 |
|
nimisha20
|
ba3895efdd
|
Update AccountServicesScriptingInterface.h
Minor copy-edit
|
2019-02-25 22:56:36 -08:00 |
|
nimisha20
|
736a050e68
|
Update AccountServicesScriptingInterface.h
|
2019-02-25 22:55:56 -08:00 |
|
nimisha20
|
4825ecdbf3
|
Update AccountServicesScriptingInterface.h
|
2019-02-25 22:44:16 -08:00 |
|
Wayne Chen
|
650b34c463
|
adding clock
|
2019-02-25 18:00:56 -08:00 |
|
SamGondelman
|
94a82b8304
|
Merge remote-tracking branch 'upstream/master' into web
|
2019-02-25 17:23:58 -08:00 |
|
Shannon Romano
|
badd0b8bd3
|
Merge pull request #14968 from davidkelly/dk/20726
Guard against accidentally calling wrong api/v1/places endpoint
|
2019-02-25 17:16:33 -08:00 |
|
SamGondelman
|
6e4ec15c9d
|
there we go
|
2019-02-25 17:14:51 -08:00 |
|
Simon Walton
|
a8dd7b7e1f
|
Fix gcc error about defining templates outside their namespace
Also warning about hiding virtual function.
|
2019-02-25 17:14:22 -08:00 |
|
Shannon Romano
|
7fe3bb387e
|
Merge pull request #15012 from SamGondelman/nametag
Case 21397: Trying to fix overlay rotation
|
2019-02-25 16:52:01 -08:00 |
|
Shannon Romano
|
bf3b4e6a57
|
Merge pull request #15015 from SamGondelman/flying
Case 21418: Allow flying in HMD if you would otherwise fall forever
|
2019-02-25 16:48:57 -08:00 |
|
amantley
|
51e4ddd888
|
Merge pull request #15017 from amantley/ikOnByDefault
bug fix: Ik is on by default in desktop mode
|
2019-02-25 19:36:25 -05:00 |
|
SamGondelman
|
f482ae3b63
|
Merge remote-tracking branch 'upstream/master' into untexture
|
2019-02-25 16:26:14 -08:00 |
|
Simon Walton
|
d6f755955d
|
Add _avatarPriorityChanged to EntityItemProperties::markAllChanged()
|
2019-02-25 16:24:12 -08:00 |
|
Simon Walton
|
e5091e7f59
|
Fixes for EntityItem contains test, add MixerAvatar class and use in sort
|
2019-02-25 15:44:52 -08:00 |
|
SamGondelman
|
f235d04601
|
trying to fix web crashes
|
2019-02-25 15:40:17 -08:00 |
|
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 |
|
Thijs Wenker
|
79d0a0a0a8
|
avatar doctor project status
|
2019-02-25 19:28:38 +01: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
|
50035a1983
|
Delete old nodes with identical socket
|
2019-02-25 09:48:21 -08:00 |
|
Clement
|
d3b3dfd76d
|
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:55 -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 |
|
nimisha20
|
e20f13f0ae
|
Update AccountServicesScriptingInterface.h
Adding ctrlaltdavid's changes
|
2019-02-25 09:28:56 -08:00 |
|
nimisha20
|
2bcee4e454
|
Update AccountServicesScriptingInterface.cpp
Changes according to ctrlaltdavid's comments.
|
2019-02-25 08:54:47 -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 |
|
David Rowe
|
4e9d162172
|
AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
|
2019-02-24 13:23:20 +13: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 |
|
Simon Walton
|
16bc667b95
|
Looks like serialization order must be same a flag enum order!?
Also resuscitate EntityItem debug dumps.
|
2019-02-22 18:17:30 -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 |
|