Commit graph

24478 commits

Author SHA1 Message Date
samcake
6639287418 Merging with master 2017-10-02 17:03:09 -07:00
Sam Gateau
fb5fd346ff Merge pull request #11492 from SamGondelman/tPose
Fix getting stuck in T-Pose on avatar switch
2017-09-29 13:37:31 -07:00
Andrew Meadows
8134e2b7f9 fix const violation 2017-09-29 11:34:36 -07:00
Andrew Meadows
32910e6f40 use [this] for lambda capture list 2017-09-29 11:34:35 -07:00
Andrew Meadows
f5f1a64c92 use const ref on pointer, and use dynamic_cast 2017-09-29 11:34:35 -07:00
Andrew Meadows
b16d666026 remove dupe addToNeedsParentFixupList() call 2017-09-29 11:34:35 -07:00
Andrew Meadows
0c934e863b clarify some comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
5dcd6bc496 namechange: apparentAngle --> angularDiameter 2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173 fix Differential scan logic for LOD culling 2017-09-29 11:34:35 -07:00
SamGondelman
f2de03bc38 small fixes and LOD cull children instead of parent 2017-09-29 11:34:35 -07:00
Andrew Meadows
b1b7764056 use 20 degrees of OVERSEND 2017-09-29 11:34:35 -07:00
SamGondelman
c39ac93fc8 fix isVerySimilar 2017-09-29 11:34:35 -07:00
Andrew Meadows
355a59edb1 fix missing entities in differential traversal 2017-09-29 11:34:35 -07:00
Andrew Meadows
d55d45f6aa check radius in ViewFrustum::isVerySimilar() 2017-09-29 11:34:35 -07:00
Andrew Meadows
a55661e1ff remove ViewFrustum::calculateProjection() 2017-09-29 11:34:35 -07:00
Andrew Meadows
a22e577100 zero out OVERSEND hack 2017-09-29 11:34:35 -07:00
Andrew Meadows
d061627a1d reasonable values for iitial OctreeQueryNode view
make sure newViewFrustum is fully initialized before using it
2017-09-29 11:34:34 -07:00
Andrew Meadows
0597970bb4 faster, more correct ViewFrustum::isVerySimilar()
remove OVERSEND hack
add ViewFrustum::calculateProjection() method used by OctreeQueryNode
2017-09-29 11:34:34 -07:00
SamGondelman
defed80be7 edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes 2017-09-29 11:34:34 -07:00
SamGondelman
7938e301e7 full scene traversal and json filters 2017-09-29 11:34:34 -07:00
SamGondelman
0ad5f47bfd trying to fix entity editing bugs, needs testing 2017-09-29 11:34:34 -07:00
SamGondelman
6c066605cd add state to entity tree send thread 2017-09-29 11:34:34 -07:00
Andrew Meadows
b6818c4369 first-pass sending entities from _sendQueue 2017-09-29 11:34:34 -07:00
Andrew Meadows
1562fb153e cherrypick traverseTreeAndBuildNextPacketPayload() 2017-09-29 11:34:34 -07:00
Andrew Meadows
cf2e500ec4 remove unnecessary const qualifiers 2017-09-29 11:34:33 -07:00
SamGondelman
bb5368eb55 use correct rootSizeScale 2017-09-29 11:34:33 -07:00
Andrew Meadows
0b0de96894 use memcpy instead of copying one byte at a time 2017-09-29 11:34:33 -07:00
Andrew Meadows
7597088c7c simpler logic flow 2017-09-29 11:34:33 -07:00
Andrew Meadows
3e50d01734 more correct handling of LOD 2017-09-29 11:34:33 -07:00
Andrew Meadows
8b7c43f3b1 add LOD culling in DiffTraversal 2017-09-29 11:34:33 -07:00
Andrew Meadows
0758b60afc abstract DiffTraversal out of EntityTreeSendThread 2017-09-29 11:34:33 -07:00
Andrew Meadows
8d535f9c5a remove bump to changeFromRemote for server case (revert) 2017-09-29 11:34:33 -07:00
Andrew Meadows
3665a3fbee libraries/entities/src/EntityTreeElement.cpp 2017-09-29 11:34:33 -07:00
Andrew Meadows
dd1febba2f add missing bump to element changed content 2017-09-29 11:34:33 -07:00
Andrew Meadows
481df49386 on server: note time of entity edit by remote 2017-09-29 11:34:33 -07:00
Andrew Meadows
2b31a746e3 add content timestamp for EntityTreeElement 2017-09-29 11:34:32 -07:00
Andrew Meadows
ca470d67b4 fix indentation 2017-09-29 11:34:32 -07:00
Andrew Meadows
7edd99ca0b add basics for send queue and tree traversal 2017-09-29 11:34:32 -07:00
Andrew Meadows
82ed19386f make Octree::readBitstreamToTree() virtual 2017-09-29 11:34:32 -07:00
Andrew Meadows
56bc48b31a don't use octcode data in entity update packets 2017-09-29 11:34:32 -07:00
Andrew Meadows
55e9ced5c3 cleanup MovingEntitiesOperator 2017-09-29 11:34:32 -07:00
Andrew Meadows
4fa60f5108 cleanup AddEntityOperator 2017-09-29 11:34:32 -07:00
SamGondelman
fcfac9efc0 no tpose when switching avatars 2017-09-29 11:14:29 -07:00
Seth Alves
72cacc4cef server only deletes and entity if it's still the child of an avatar, not if it has ever been 2017-09-28 19:56:15 -07:00
Zach Fox
0f66fb41fd Fix entity add after incomplete rezCertified implementation 2017-09-28 16:07:15 -07:00
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
Sam Gateau
f25e4203fd Merge pull request #11469 from SamGondelman/tPose
Don't constantly reload animGraph if URL didn't change
2017-09-27 14:46:05 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463)
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07:00