Sabrina Shanman
|
c38462bf6d
|
Merge pull request #16345 from highfidelity/master
Merge master into instancing
|
2019-10-14 14:54:22 -07:00 |
|
Sabrina Shanman
|
b8df1c180f
|
Merge pull request #16343 from jherico/fix/DEV-2375
DEV-2375: ensure web entities stop playing audio
|
2019-10-14 13:04:57 -07:00 |
|
Brad Davis
|
6c35387b8d
|
also fix DEV-2083
|
2019-10-14 10:56:23 -07:00 |
|
Brad Davis
|
95b5c8a905
|
DEV-2375: ensure web entities stop playing audio
|
2019-10-14 10:46:32 -07:00 |
|
Zach Fox
|
c8b975b2f1
|
Merge pull request #16342 from zfox23/newInvalidatedLanguage
DEV-2334: New 'Item Invalidated' language in Inventory
|
2019-10-14 13:28:33 -04:00 |
|
Zach Fox
|
b45156b44c
|
Merge pull request #16337 from RebeccaStankus/locationText
Added blank placeholder text on focus to text field
|
2019-10-14 12:35:29 -04:00 |
|
Zach Fox
|
7bd550e37b
|
DEV-2334: New 'Item Invalidated' language in Inventory
|
2019-10-14 09:30:44 -07:00 |
|
Maia Hansen
|
db75d03f76
|
Merge pull request #16332 from highfidelity/Fix-stand-talk-pops
Fix stand talk pops
|
2019-10-11 15:51:00 -07:00 |
|
Rebecca Stankus
|
21503137d4
|
Added blank placeholder text on focus to text field
|
2019-10-11 14:42:39 -07:00 |
|
Sam Gateau
|
93e266cde5
|
Merge pull request #16333 from highfidelity/revert-16307-colossal-cave
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 13:13:55 -07:00 |
|
Brad Hefta-Gaub
|
51669e1ac3
|
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 11:06:10 -07:00 |
|
dooglifeSF
|
96510429ba
|
Fix stand talking pops
|
2019-10-11 10:44:50 -07:00 |
|
dooglifeSF
|
df11977b39
|
remove all transitions from seated except idle via isNotSeated
|
2019-10-11 09:54:10 -07:00 |
|
Ken Cooke
|
8325ee2c8e
|
Merge pull request #16327 from kencooke/audio-device-sleep-wake
DEV-1901: No audio in Interface when restoring from sleep
|
2019-10-10 15:12:07 -07:00 |
|
Ken Cooke
|
ec67b67966
|
On waking from sleep/hibernate, restart the audio devices
|
2019-10-10 14:10:47 -07:00 |
|
Maia Hansen
|
07b916f0b7
|
Merge pull request #16307 from AndrewMeadows/colossal-cave
DEV-1811: apply deletion rules to linked entities
|
2019-10-10 13:24:43 -07:00 |
|
Zach Fox
|
240f904b85
|
DEV-2386: Remove 'Run Client Script Test'
|
2019-10-10 11:11:27 -07:00 |
|
Sam Gateau
|
c0e4509095
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-10 09:04:38 -07:00 |
|
Sam Gateau
|
3e8d6671f7
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-10 09:04:22 -07:00 |
|
Brad Hefta-Gaub
|
1316f9b046
|
Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers
Drivekey anim triggers
|
2019-10-09 18:25:10 -07:00 |
|
Sabrina Shanman
|
63fa9afa13
|
Merge pull request #16323 from highfidelity/master
Merge master into instancing
|
2019-10-09 16:59:54 -07:00 |
|
Maia Hansen
|
6b5f90f641
|
Merge pull request #16315 from jherico/qt_5.13
Qt 5.13 changes
|
2019-10-09 15:04:07 -07:00 |
|
Sam Gateau
|
9df2186696
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-09 10:03:09 -07:00 |
|
Shannon Romano
|
b3d974504a
|
Merge pull request #16316 from luiscuenca/fixForwardEyeLookAt
DEV-2285: Fix eye look at forward vector
|
2019-10-09 09:13:02 -07:00 |
|
dooglifeSF
|
8a262a3d1a
|
Merge branch 'master' into drivekey_anim_triggers
|
2019-10-09 07:37:38 -07:00 |
|
Sam Gateau
|
abaf0262a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
|
2019-10-08 18:55:51 -07:00 |
|
Sam Gateau
|
1f3993c308
|
getting the transform right for the rigid bodies
|
2019-10-08 18:13:24 -07:00 |
|
Brad Davis
|
960cab9994
|
Qt 5.13 warnings & fixes
|
2019-10-08 15:40:13 -07:00 |
|
luiscuenca
|
68e287628c
|
Fix eye look at forward vector
|
2019-10-08 14:39:27 -07:00 |
|
jennaingersoll
|
0b1a4878fe
|
Merge pull request #16308 from ctrlaltdavid/DOC-189
DOC-189: SpeechRecognizer JSDoc
|
2019-10-08 12:53:04 -07:00 |
|
Shannon Romano
|
0bf7fd0233
|
Merge pull request #16310 from luiscuenca/fixStrafeWhileFlying
DEV-2261: DEV-2320: Fix strafe while flying, and ramp up diagonal movement
|
2019-10-08 11:45:26 -07:00 |
|
Zach Fox
|
960440e802
|
DEV-2352: Modify Release Notes URL
|
2019-10-08 14:28:01 -04:00 |
|
luiscuenca
|
5576132df7
|
Fix strafe while flying, and ramp up diagonal movement
|
2019-10-08 10:13:58 -07:00 |
|
David Rowe
|
1106d8fdfa
|
Doc review
|
2019-10-08 21:15:16 +13:00 |
|
David Rowe
|
f224832d27
|
Merge branch 'master' into DOC-111
|
2019-10-08 20:44:13 +13:00 |
|
David Rowe
|
570abba3ce
|
SpeechRecognizer JSDoc
|
2019-10-08 13:04:52 +13:00 |
|
Andrew Meadows
|
052a0c3ebe
|
remove cruft, add comments, change variable name
|
2019-10-07 16:23:30 -07:00 |
|
Sabrina Shanman
|
2fcb526a5c
|
Merge pull request #16305 from highfidelity/master
Merge master into instancing
|
2019-10-07 15:44:42 -07:00 |
|
Sam Gateau
|
521ce3936b
|
I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...
|
2019-10-07 15:19:23 -07:00 |
|
Andrew Meadows
|
8ab70225d9
|
apply delete rules down linked hierarchy
|
2019-10-07 14:38:36 -07:00 |
|
Andrew Meadows
|
470a45c012
|
EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities
|
2019-10-07 14:38:36 -07:00 |
|
Andrew Meadows
|
3155ffe07e
|
remove useless unreachable code
|
2019-10-07 14:38:36 -07:00 |
|
Sam Gateau
|
42bc91b389
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-07 09:42:14 -07:00 |
|
Shannon Romano
|
3db915c432
|
Merge pull request #16275 from dooglifeSF/sit_variants_and_fidgets
Sit variants and fidgets
|
2019-10-07 09:14:38 -07:00 |
|
dooglifeSF
|
387f0a3f10
|
add isInput* and isNotInput vars for use in json, and edit json to use them
|
2019-10-04 15:28:35 -07:00 |
|
Shannon Romano
|
f797f714bd
|
Merge pull request #16298 from luiscuenca/addisSeatedAPImethod
DEV-2011: Add MyAvatar::isSeated API method
|
2019-10-04 15:06:46 -07:00 |
|
luiscuenca
|
07080f0138
|
Clarify jdocs
|
2019-10-04 13:47:20 -07:00 |
|
luiscuenca
|
3a9c829c95
|
Add MyAvatar::isSeated API method
|
2019-10-04 11:07:49 -07:00 |
|
dooglifeSF
|
37afabe866
|
Merge branch 'master' into sit_variants_and_fidgets
|
2019-10-04 10:29:15 -07:00 |
|
Sam Gateau
|
c7ca431296
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-04 10:00:41 -07:00 |
|