Commit graph

1077 commits

Author SHA1 Message Date
Olivier Prat
76589316df Working debug script with multiple selection 2017-10-17 10:24:05 +02:00
Olivier Prat
e42699c0ea Added multiple selections but still only first linked to outline 2017-10-16 10:57:06 +02:00
Bradley Austin Davis
4dcce6ef45 Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
2017-10-12 17:37:05 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities
Import av entities
2017-10-12 13:30:53 -07:00
Anthony J. Thibault
0a943fbe7b Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.

The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
Brad Davis
69f869b339 Remove unecessary blocking call 2017-10-11 11:01:06 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Seth Alves
54204833df add a getParentTree call for overlays 2017-10-09 12:17:56 -07:00
Brad Davis
7aeeaeb4e7 Fix rendering transform for text3d overlays 2017-10-07 19:41:43 -07:00
SamGondelman
e95ecc3f27 fix missing sensorToWorld matrix 2017-10-06 15:37:23 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
Zach Fox
525e0d8f61 Make SettingsScriptingInterface accessible to tablet 2017-10-05 16:51:13 -07:00
Sam Gateau
25dae2f24e Merge pull request #11499 from samcake/blue
Moving Camera update and render frame to Game Loop (Main thread)
2017-10-04 18:42:02 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
Sam Gateau
64f70f1ebb more cleanups 2017-10-02 22:00:41 -07:00
Sam Gateau
895e3d0430 more cleanups 2017-10-02 21:46:52 -07:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
samcake
da4de38e91 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-01 15:01:18 -07:00
SamGondelman
572986bfad fix modeloverlay visible change
(cherry picked from commit 0bb27a7165)
2017-10-01 13:40:00 -07:00
SamGondelman
0bb27a7165 fix modeloverlay visible change 2017-09-29 17:48:59 -07:00
samcake
225d2bbbb4 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 13:47:37 -07:00
Seth Alves
e7705175a3 Merge pull request #11481 from ZappoMan/animatedOverlays
support animation of model overlays
2017-09-29 10:26:24 -07:00
ZappoMan
9c81bc5479 CR fixes 2017-09-29 09:52:30 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
samcake
3265fe62ad Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 09:09:27 -07:00
Zach Fox
4814f277c1 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 16:07:32 -07:00
ZappoMan
be7729b276 support animation of model overlays 2017-09-28 15:14:59 -07:00
Andrew Meadows
60fe9ec5e9 Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928
fix interface crash in Debug build
2017-09-28 12:41:12 -07:00
Zach Fox
b5dc6b791b Fix commerce setting handle 2017-09-28 10:42:45 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
samcake
40ca98214b Moving all of the camera and avatar eval to game loop 2017-09-27 17:58:43 -07:00
samcake
29da0c663f Merge branch 'master' of https://github.com/highfidelity/hifi into flash 2017-09-27 16:21:55 -07:00
samcake
3bd6e35e30 Fixing the broken on hud overlay's render transform 2017-09-27 15:19:21 -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
Andrew Meadows
26ea7034d8 prevent zero scale for Line3DOverlay 2017-09-27 14:30:50 -07:00
Andrew Meadows
b602c18475 prevent zero dimensions for Volume3DOverlay 2017-09-27 14:30:50 -07:00
Sam Gateau
9317ad38aa Merge pull request #11462 from highfidelity/game-render-interface
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00
samcake
f16c552978 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 17:18:05 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency
Fix long tablet lag on first load
2017-09-26 16:18:31 -07:00
samcake
328dd9c108 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue 2017-09-26 16:12:27 -07:00
samcake
badb45c921 fixing the web surface now getting scaled when the table t is grabbed is fixed 2017-09-26 15:20:45 -07:00
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -07:00
Seth Alves
7397a123c5 Merge pull request #11345 from SamGondelman/textAA
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00