Commit graph

81135 commits

Author SHA1 Message Date
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
Maia Hansen
466d3b841e
Merge pull request #16296 from sethalves/update-osx-webrtc-m78
DEV-2117: new version of webrtc library for osx
2019-10-08 17:08:17 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals
Added flag to ensure mouse event signals are not connected twice
2019-10-08 15:58:24 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
2019-10-08 15:35:22 -07:00
RebeccaStankus
458d3bfb48 Renamed variable and made it private 2019-10-08 13:47:06 -07:00
jennaingersoll
0b1a4878fe
Merge pull request #16308 from ctrlaltdavid/DOC-189
DOC-189: SpeechRecognizer JSDoc
2019-10-08 12:53:04 -07:00
Zach Fox
398caf57ab
Merge pull request #16312 from zfox23/preventDupeControllerScripts
DEV-2350: Prevent duplicate default scripts from running
2019-10-08 15:33:54 -04:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Zach Fox
9feab869ad DEV-2350: Prevent duplicate default scripts from running 2019-10-08 14:48:19 -04: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
Shannon Romano
72c60b92c2
Merge pull request #16311 from zfox23/changeSteamLink
DEV-2352: Modify Release Notes URL
2019-10-08 11:38:31 -07:00
Zach Fox
960440e802 DEV-2352: Modify Release Notes URL 2019-10-08 14:28:01 -04:00
Simon Walton
f63360a87a Change read back to peek - guess it was that way for a reason 2019-10-08 11:01:42 -07:00
luiscuenca
5576132df7
Fix strafe while flying, and ramp up diagonal movement 2019-10-08 10:13:58 -07:00
Shannon Romano
7aa28f29d2
Merge pull request #16224 from ctrlaltdavid/DOC-111
DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying
2019-10-08 10:01:21 -07:00
Sam Gateau
76bb720e12 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-08 09:48:10 -07:00
Sam Gateau
6db302990c
Merge pull request #16297 from jherico/frame-capture
DEV-632: New format for captured GPU frames
2019-10-08 09:43:44 -07:00
Shannon Romano
e1de615cbe
Merge pull request #16261 from ctrlaltdavid/BUGZ-491
BUGZ-491: Fix tablet.loadWebScreenOnTop()
2019-10-08 09:05:33 -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
Sam Gateau
936ac6f120 REmoving more repetitions of the meshParts 2019-10-07 18:03:33 -07:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
Sam Gateau
eaa4d9d596 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-07 17:21:11 -07:00
Sam Gateau
dd53ace114 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-07 17:21:02 -07:00
Shannon Romano
32ebaed7d3
Merge pull request #16303 from ctrlaltdavid/DOC-188
DOC-188: Steam JSDoc
2019-10-07 17:05:20 -07:00
David Rowe
570abba3ce SpeechRecognizer JSDoc 2019-10-08 13:04:52 +13:00
jennaingersoll
8d8449d8d7
Merge pull request #16166 from ctrlaltdavid/DOC-159
DOC-159: File JSDoc
2019-10-07 16:37:11 -07:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155
DOC-155: EntityViewer JSDoc
2019-10-07 15:45:42 -07:00
Sabrina Shanman
2fcb526a5c
Merge pull request #16305 from highfidelity/master
Merge master into instancing
2019-10-07 15:44:42 -07:00
David Rowe
ffb73d5dbf Steam JSDoc 2019-10-08 11:22:19 +13: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
Shannon Romano
5bbe271c7a
Merge pull request #16299 from ctrlaltdavid/DOC-187
DOC-187: Mat4 JSDoc
2019-10-07 09:11:32 -07:00
Simon Walton
f020ab83c8
Merge pull request #16295 from SimonWalton-HiFi/ess-send-stats
DEV-2309: Report ESS stats to domain server
2019-10-06 01:48:27 -07:00
Brad Davis
b2bcf54b5b Removing frame converter 2019-10-04 19:52:55 -07:00
Brad Davis
d69a83a2f2 fix warnings 2019-10-04 18:20:10 -07:00
Sam Gateau
09a8d69555 landing on the new code base 2019-10-04 18:02:45 -07:00
Zach Fox
5e7bb4be91
Merge pull request #16221 from zfox23/handleHrefBetter
DEV-611: Ensure that entities with the link property set can be clicked in Desktop and VR modes
2019-10-04 17:36:56 -07:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes
Fix for Mat4.getForward, getRight and getUp
2019-10-04 17:00:43 -07:00
David Rowe
70577b8f34 Remove "not working" warnings in anticipation of fix 2019-10-05 12:13:57 +13:00
Simon Walton
67d80cdd15 Add per-Node & ESS-specific stats 2019-10-04 15:38:05 -07:00
jennaingersoll
aab66a2675
Merge pull request #16266 from ctrlaltdavid/DOC-107
DOC-107: Fix description of entity acceleraton property and deprecate
2019-10-04 15:17:21 -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
Shannon Romano
85c79e7931
Merge pull request #16246 from ctrlaltdavid/BUGZ-711
BUGZ-711: Clarify frustum property values used by Entities.findEntitiesInFrustum()
2019-10-04 15:05:52 -07:00
Brad Davis
243120b95c Even better frame capture 2019-10-04 14:57:39 -07:00
Anthony J. Thibault
521f64f152 normalize axes returned by Mat4.getForward getUp and getRight 2019-10-04 14:10:28 -07:00
Shannon Romano
24dc4b19ae
Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging
DEV-2292: Alerting requirements for domain-server failure cases
2019-10-04 14:01:56 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp
It should match the results from the same methods on the Quat class.
2019-10-04 13:59:38 -07:00