Commit graph

80009 commits

Author SHA1 Message Date
Shannon Romano
849a25f576
Merge pull request #15966 from jherico/fix/bugz-987
BUGZ-987: fix depth testing of HUD layer 3D objects
2019-07-23 15:00:54 -07:00
Shannon Romano
b799abdac1
Merge pull request #15967 from sabrina-shanman/picks_too-many_grab-enabled
(BUGZ-955) Disable unnecessary picking (conservative subset)
2019-07-23 14:57:19 -07:00
Anna
a6c569dd78 fixed index out of bounds checking when getting cpu, gpu or display in PlatformInstance.cpp 2019-07-23 14:45:12 -07:00
Clement
7f9ad4ac25 Don't store unused cpuident data arrays 2019-07-23 14:23:12 -07:00
luiscuenca
e7e864121f
Merge branch 'master' into avatarSitAPI 2019-07-23 14:22:42 -07:00
Clement
8dd18fbe62 Make sure the send thread terminates before delete 2019-07-23 14:21:07 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar 2019-07-23 14:20:54 -07:00
dante ruiz
08bfe00ac4 making requested changes 2019-07-23 14:09:46 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
Initial version of Avatar Reaction API
2019-07-23 13:13:31 -07:00
sabrina-shanman
d48c8d897c Clarify that a Grabber member function toggles both picks and pointers 2019-07-23 12:58:07 -07:00
sabrina-shanman
abac1787a6 Fix using invalid pick API functions on HMD ray pointer 2019-07-23 12:58:07 -07:00
sabrina-shanman
79d09f68fd Disable grab.js picks when in HMD 2019-07-23 12:58:07 -07:00
Brad Davis
449f3d00f9 BUGZ-987: fix depth testing of HUD layer 3D objects 2019-07-23 12:09:12 -07:00
Shannon Romano
9f2d997dbf
Merge pull request #15948 from SimonWalton-HiFi/dissectors-nonverified-packets
Packet dissectors: Don't read HMAC for 'nonverified' packets
2019-07-23 12:07:56 -07:00
Shannon Romano
0031b238c6
Merge pull request #15957 from AndrewMeadows/mac-readable-stats
BUGZ-937: more readable debug stats on MacOS
2019-07-23 12:05:01 -07:00
jennaingersoll
1e84b3f4a2
Merge pull request #15951 from ctrlaltdavid/DOC-122
DOC-122: LocationBookmarks JSDoc
2019-07-23 12:00:03 -07:00
Dante Ruiz
0f6a4ed13d
Merge pull request #15961 from danteruiz/revert-signing
Revert "Merge pull request #15944 from danteruiz/add-signing"
2019-07-23 11:30:02 -07:00
Anthony J. Thibault
687588cde7 Hooked up first-pass reaction animations. 2019-07-23 09:47:37 -07:00
dante ruiz
ce2849b570 Revert "Merge pull request #15944 from danteruiz/add-signing"
This reverts commit 47b7e9a5dc, reversing
changes made to 6d0ba98bfc.
2019-07-23 09:38:32 -07:00
Ryan Huffman
8b2c935f92
Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate
Make Create app use Ctrl key to duplicate entities instead of Alt
2019-07-23 08:52:22 -07:00
David Rowe
4b1d243551 Fix link to coding standards 2019-07-23 21:18:45 +12:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102
DOC-102: Overlays JSDoc Update
2019-07-22 16:24:53 -07:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121
DOC-121: AvatarBookmarks JSDoc
2019-07-22 15:43:57 -07:00
Shannon Romano
8e708b29de
Merge pull request #15934 from ctrlaltdavid/DOC-62
DOC-62: Reticle JSDoc
2019-07-22 15:32:48 -07:00
Shannon Romano
47b7e9a5dc
Merge pull request #15944 from danteruiz/add-signing
DEV-117: the signing of MAC HQ launcher AND the interface exe
2019-07-22 15:30:26 -07:00
David Rowe
1e8a205275 Fix typo 2019-07-23 10:30:10 +12:00
Shannon Romano
6d0ba98bfc
Merge pull request #15953 from ctrlaltdavid/DOC-123
DOC-123: AvatarInputs JSDoc
2019-07-22 15:21:50 -07:00
Shannon Romano
a0d0963ae9
Merge pull request #15954 from SimonWalton-HiFi/avatar-theft-restore
BUGZ-1022: Restore avatar theft functionality to Lilypad
2019-07-22 15:15:09 -07:00
Shannon Romano
d719952022
Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor
BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input
2019-07-22 15:06:35 -07:00
Clement
79cdd960a9 Remove deprecated build instruction 2019-07-22 12:53:55 -07:00
Andrew Meadows
95187f97c8 use bold monospace font for debug stats 2019-07-22 12:38:24 -07:00
David Rowe
a36bcbb2ed Doc review 2019-07-23 07:36:11 +12:00
David Rowe
ddffb8ab9a Doc review 2019-07-23 07:25:34 +12:00
Atlante45
63bd80c65e Force build with x64 toolchain 2019-07-22 11:29:34 -07:00
jennaingersoll
abe1ce288c
Merge pull request #15926 from ctrlaltdavid/DOC-115
DOC-115: Comfort mode JSDoc
2019-07-22 10:46:11 -07:00
Simon Walton
8fb28bf4e8 Whitespace changes per code review 2019-07-22 10:36:57 -07:00
dante ruiz
1d1b1a93d9 revert 2019-07-22 10:06:24 -07:00
dante ruiz
78d877a0b6 finish versioning 2019-07-22 10:01:48 -07:00
dante ruiz
1eae39b78c starting cleanup work 2019-07-19 18:07:55 -07:00
Simon Walton
63c3452cf2 Restore avatar theft functionality; banner-click to appropriate menu 2019-07-19 16:35:07 -07:00
David Rowe
6d7b6f3e0a AvatarInputs JSDoc 2019-07-20 10:19:22 +12:00
David Rowe
3a3bfd1463 Doc review 2019-07-20 09:39:34 +12:00
David Rowe
0a32386f45 Merge branch 'master' into DOC-102 2019-07-20 09:13:52 +12:00
Zach Fox
d62dde1ab8
Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection
Fix BUGZ-1062: Set the correct Settings value for bubble tools
2019-07-19 11:51:59 -07:00
Zach Fox
510c922912 Fix BUGZ-1062: Set the correct Settings value for bubble tools 2019-07-19 11:34:14 -07:00
Shannon Romano
4f7b865cfe
Merge pull request #15945 from huffman/fix/create-window-not-reopening
BUGZ-998: Fix create window being destroyed when closed
2019-07-19 11:07:02 -07:00
Shannon Romano
c919980e8b
Merge pull request #15928 from AndrewMeadows/fix-safe-landing-003
BUGZ-942: fix SafeLanding to not accidentally "neglect to track" incoming entity packet when connecting to new domain
2019-07-19 09:53:15 -07:00
David Rowe
9165a04641 Typo and improvement 2019-07-19 11:41:12 +12:00
David Rowe
c2b67f28d0 LocationBookmarks JSDoc 2019-07-19 11:35:06 +12:00
David Rowe
cf9e563458 Miscellaneous JSDoc fixes noticed in passing 2019-07-19 08:37:10 +12:00