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 |
|
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 |
|
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 |
|
luiscuenca
|
e0d0ec5852
|
Fix isInAir so takes into account the new seated state:
|
2019-10-03 10:36:23 -07:00 |
|
dooglifeSF
|
ebd0b06475
|
animation revisions after checking them in a standup group
|
2019-10-02 17:18:36 -07:00 |
|
luiscuenca
|
75f0b4ea54
|
Fix First Person Camera issues
|
2019-10-02 14:17:57 -07:00 |
|
luiscuenca
|
059bcc10cc
|
merge master
|
2019-10-02 13:24:32 -07:00 |
|
luiscuenca
|
521aa50356
|
Set time and angle recentering parameters
|
2019-10-02 11:43:06 -07:00 |
|
Sam Gateau
|
9b9f91ab85
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-02 10:22:43 -07:00 |
|
Sam Gateau
|
dcfc3cddd2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
|
2019-10-01 19:50:33 -07:00 |
|
amer cerkic
|
c0a852d68c
|
updated audio wording and removed audio defaul spamming.
|
2019-10-01 16:55:37 -07:00 |
|
dooglifeSF
|
86e67afe34
|
Merge branch 'master' into sit_variants_and_fidgets
|
2019-10-01 16:52:17 -07:00 |
|
dooglifeSF
|
0ab4075c3b
|
sit idles and idle fidgets with json edits
|
2019-10-01 16:51:10 -07:00 |
|
luiscuenca
|
09f0222285
|
Restore previous control keys for free camera
|
2019-10-01 14:18:46 -07:00 |
|
luiscuenca
|
18af7c5d84
|
Add recenter timer and temp API
|
2019-10-01 13:44:27 -07:00 |
|
Shannon Romano
|
38574cd66b
|
Merge pull request #16245 from luiscuenca/implementPointAt
DEV-442: Implement directional blending node for point reaction
|
2019-10-01 11:46:30 -07:00 |
|
Sam Gateau
|
1d19671e88
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-01 11:27:16 -07:00 |
|
Maia Hansen
|
220123ff3b
|
Merge pull request #16254 from kencooke/macos-appnap-disabler
BUGZ-1117: On Mac OS, disable App Nap to prevent audio glitches
|
2019-10-01 10:53:03 -07:00 |
|
luiscuenca
|
d4a74f798c
|
aimToBlendValues to static function
|
2019-10-01 10:15:16 -07:00 |
|
Anthony Thibault
|
c2690eb39d
|
Merge pull request #16268 from luiscuenca/limitRotationWhileSeated
DEV-2125: Rotation while seated do not trigger re-centering
|
2019-10-01 09:33:02 -07:00 |
|
luiscuenca
|
7c55cee1f0
|
Limit rotation while seated to not trigger recentering
|
2019-09-30 17:37:14 -07:00 |
|
luiscuenca
|
0fac1e134f
|
Allow avatar look at when in first person camera
|
2019-09-30 16:43:02 -07:00 |
|
Shannon Romano
|
e8f1eecc5b
|
Merge pull request #16258 from samcake/yellow
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
|
2019-09-30 16:36:24 -07:00 |
|
Ken Cooke
|
de5da65757
|
Use NSActivityUserInitiated instead of NSActivityBackground
|
2019-09-30 15:48:01 -07:00 |
|