Commit graph

81051 commits

Author SHA1 Message Date
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -04:00
Zach Fox
753a61ed2c More iteration with Joshua 2019-10-08 17:31:10 -04:00
Zach Fox
42bf2bf30e All windows 'done' except for final tweaks; debug mode still ON 2019-10-08 13:17:04 -04:00
Zach Fox
b0adf1ef02 Almost done with init screen 2019-10-07 20:29:18 -04:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04: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
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
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
luiscuenca
07080f0138
Clarify jdocs 2019-10-04 13:47:20 -07:00
David Rowe
6e6d438d36 Tidying 2019-10-05 09:34:31 +13:00
David Rowe
a56f82c1ba Mat4 JSDoc 2019-10-05 09:27:31 +13:00
Shannon Romano
f09aa80977
Merge pull request #16278 from huffman/fix/mac-launcher-audio-entitlement
DEV-2291: Add audio input entitlement to mac launcher
2019-10-04 12:19:20 -07:00
Shannon Romano
0b5299162b
Merge pull request #16283 from luiscuenca/fixInAirWhileSitting
DEV-2217: Fix MyAvatar::isInAir() so takes into account the new seated state
2019-10-04 11:56:02 -07:00
Shannon Romano
15394f7a6b
Merge pull request #16284 from roxanneskelly/dev653
DEV-653 - give warning not to change address for cloud domains
2019-10-04 11:54:30 -07:00
Shannon Romano
12a81c41c2
Merge pull request #16293 from roxanneskelly/dev-2044
DEV-2044 - add notification that temporary domains won't show up in domain list
2019-10-04 11:51:50 -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
RebeccaStankus
31dcbf532f Missed a Capital letter in a function name 2019-10-04 10:10:54 -07:00
Simon Walton
db14cdbd22 Tweak 'critical' status for some logging 2019-10-04 09:56:35 -07:00
RebeccaStankus
8089653784 CR Feedback changes 2019-10-04 09:43:47 -07:00
Shannon Romano
5d20baa4d0
Merge pull request #16291 from luiscuenca/fixBlinkAsync
DEV-2202: Apply same random factors to both eyes blink
2019-10-04 09:26:19 -07:00
Simon Walton
6a4406ad12 Put generic stats in sendStatsPacket() stub 2019-10-03 17:46:52 -07:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Simon Walton
d5d1c08da0 Adjust some of the logging 2019-10-03 16:50:24 -07:00
Roxanne Skelly
38afa6b5c2 Move to correct place 2019-10-03 16:47:09 -07:00
Roxanne Skelly
8940d990ec DEV-2044 - add notification that temporary domains won't show up in
domain list
2019-10-03 16:17:08 -07:00
Roxanne Skelly
607828d630
Merge pull request #16273 from roxanneskelly/dev1836
DEV-1836 - handle urls in the form 'hifi://<domain>:<port>
2019-10-03 16:01:46 -07:00
luiscuenca
f7a5895cf3
Apply same random factors to both eyes blink 2019-10-03 14:42:58 -07:00
Zach Fox
0e7dff05fb Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn 2019-10-03 12:55:02 -07:00
Simon Walton
b458098409 Add case of failure to update ICE with metaverse 2019-10-03 12:38:29 -07:00
RebeccaStankus
1dd6aebede Handle minimized window 2019-10-03 12:16:39 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
Roxanne Skelly
04f13cd17e DEV-653 - give warning not to change address for cloud domains 2019-10-03 12:05:10 -07:00
luiscuenca
e0d0ec5852
Fix isInAir so takes into account the new seated state: 2019-10-03 10:36:23 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -07:00
Zach Fox
5f1c389d1c DEV-611: Ensure that entities with the property set can be clicked in Desktop and VR modes 2019-10-03 09:45:23 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -07:00
Shannon Romano
37f18e2e5e
Merge pull request #16269 from SimonWalton-HiFi/asset-scripting-wait-for-init
DEV-1898: Make Assets.initializeCache() script i/f blocking
2019-10-03 09:31:21 -07:00
Shannon Romano
ae259ef9fd
Merge pull request #16267 from luiscuenca/addHeadLookAtToFPCamera
DEV-625: Free Look Camera in first person mode
2019-10-03 09:28:54 -07:00