Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 22:26:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61377 commits 25 branches 0 tags 1.1 GiB
Commit graph

19079 commits

Author SHA1 Message Date
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Olivier Prat
25b3549e04 Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled 2017-10-18 15:00:53 +02:00
David Rowe
fcc7a3e440 Code review 2017-10-18 21:08:10 +13:00
Seth Alves
f1abb0cd55 don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them 2017-10-17 19:01:24 -07:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
Bradley Austin Davis
9e46e288b1 Merge pull request #11604 from SamGondelman/endSphere 
Scale LaserPointer end overlay in C++
 2017-10-17 16:37:35 -07:00
SamGondelman
ba4f41b59a fix warnings 2017-10-17 12:03:59 -07:00
Sam Gondelman
2e69d2b1ad missed one scripting interface reference 2017-10-17 11:13:02 -07:00
Olivier Prat
76589316df Working debug script with multiple selection 2017-10-17 10:24:05 +02:00
Sam Gateau
74b02a3e9b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-16 20:58:11 -07:00
David Rowe
ed1c974f75 Use MyAvatar.SELF_ID instead of Uuid.SELF 2017-10-17 15:58:51 +13:00
Brad Hefta-Gaub
f7a1816a99 Merge pull request #11593 from hyperlogic/bug-fix/reduce-pressure-on-event-queue 
Reduce present traffic on main thread event queue.
 2017-10-16 18:02:11 -07:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
Zach Fox
a4b8bf0be6 Bugfixes and CR 2017-10-16 15:33:10 -07:00
Bradley Austin Davis
3f99e70af0 C++ cleanup for pointers / picking 2017-10-16 14:20:31 -07:00
SamGondelman
c6b636901a fewer undesirable couplings 2017-10-16 13:46:23 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
SamGondelman
d274d99411 merge from master 2017-10-16 12:17:37 -07:00
Andrew Meadows
e109101acc update profiling timers 2017-10-16 11:52:30 -07:00
Zach Fox
febc725520 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57 2017-10-16 09:53:15 -07:00
Olivier Prat
e42699c0ea Added multiple selections but still only first linked to outline 2017-10-16 10:57:06 +02:00
Brad Davis
2ae61cb96b Prototype packaging QML and related resources into a QRC 2017-10-14 14:40:46 -07:00
Zach Fox
bcbddb7106 Fix unix warnings 2017-10-14 14:13:19 -07:00
SamGondelman
c4e6cb28ce move contextoverlay connection to contextoverlayinterface 2017-10-13 16:23:29 -07:00
Anthony J. Thibault
67d43b4fac Use atomic<bool> and compare_exchange_strong 2017-10-13 16:03:56 -07:00
SamGondelman
5bfb0baf09 const references 2017-10-13 14:38:46 -07:00
Zach Fox
5be9f2022e Fix writing backup instructions when restoring wallet backup 2017-10-13 14:33:36 -07:00
Anthony J. Thibault
a2a6cd0c7a Reduce present traffic on main thread event queue. 
In an effort to diagnose the root cause of several deadlocks,
it seems possible that the main thread event queue can grow
to a size where it can take many seconds to drain.

This PR attempts to address this in two ways:
  * Change the connection between the DisplayPlugin::presented signal and
    the Application::onPresent slot to be a DirectConnection.  This should
    prevent the main thread from filling up with signal events.
  * Within Applicaiton::onPresent use an atomic counter to prevent the main
    thread from filling up with repeated Idle events.
 2017-10-13 14:28:23 -07:00
Brad Hefta-Gaub
60030c08fa Merge pull request #11573 from druiz17/bug-hud-module 
hud module intersects with dev stats window
 2017-10-13 11:48:06 -07:00
Dante Ruiz
d14e6b6e5a Merge pull request #11450 from ElderOrb/case7722 
7722 Add onHover Outline to Tablet "X" Button
 2017-10-13 11:38:38 -07: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
SamGondelman
dacd48862f put back overlay signals for scripts 2017-10-12 16:43:33 -07:00
Zach Fox
d75c0a00bb Closer than ever 2017-10-12 16:29:05 -07:00
SamGondelman
0d164363af cleanup mousePressOffEntity signal 2017-10-12 15:29:29 -07:00
SamGondelman
a48221d915 fix context overlays 2017-10-12 14:51:15 -07:00
SamGondelman
7f3268548c direct connection to web3doverlay 2017-10-12 14:14:08 -07:00
druiz17
83d2a54b0f fixed some bugs 2017-10-12 13:48:21 -07:00
Zach Fox
6a47884fcf Cleanup and fix 2017-10-12 13:41:19 -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
Zach Fox
abe1cd1b51 Minor cleanup 2017-10-12 11:53:47 -07:00
Zach Fox
0e96fc5cab It's working! 2017-10-12 11:37:26 -07:00
SamGondelman
27b585cb0b Merge remote-tracking branch 'upstream/master' into pointerEvents 2017-10-12 11:22:23 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
vladest
f1d5df5926 Restore lost-in-merge context property 2017-10-12 18:26:50 +02:00
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
samcake
480047548d exposing the Render interface to the overlay web3d 2017-10-11 18:04:29 -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
Zach Fox
c3e66c9581 Fixes 2017-10-11 16:56:47 -07:00
Brad Hefta-Gaub
cd2a742974 Merge pull request #11576 from SamGondelman/pointerEvents 
Remove unused HFMetaEvents
 2017-10-11 16:10:43 -07:00
samcake
9abe098436 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-11 15:48:40 -07:00
Sam Gateau
38b467a6bf Merge pull request #11570 from jherico/overlays_blocking 
Remove unnecessary blocking call
 2017-10-11 15:40:53 -07:00
SamGondelman
403b18977b remove unused HFMetaEvents 2017-10-11 14:37:23 -07:00
Zach Fox
9e570fdba3 First pass at encryption/decryption. Exciting! 2017-10-11 13:08:04 -07:00
Zach Fox
f037eab26c Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-11 11:07:32 -07:00
Zach Fox
99109fe8e5 Merge pull request #11567 from zfox23/commerce_daveIntegration3 
2017-10-10 Commerce Frontend Updates
 2017-10-11 11:07:03 -07:00
Brad Davis
69f869b339 Remove unecessary blocking call 2017-10-11 11:01:06 -07:00
Zach Fox
4ebccfa65c Use put instead of get sob 2017-10-10 16:23:43 -07:00
Zach Fox
5e383e2b1c My Item certificates 2017-10-10 14:56:17 -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
0ae69b6ad9 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-10 12:38:14 -07:00
Zach Fox
1c0a564155 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3 2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7 Merge pull request #11555 from zfox23/commerce_daveIntegration2 
2017-10-09 Commerce Frontend Updates
 2017-10-10 12:34:30 -07:00
Zach Fox
be2b241629 Lots of progress; don't yet have some things 2017-10-10 12:20:48 -07:00
Clément Brisset
3b48833cc0 Merge pull request #11451 from huffman/feat/upload-user-event 
Add uploading to asset server event
 2017-10-10 11:03:33 -07:00
Zach Fox
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Ryan Huffman
9c120f1194 Update AssetMappingsScriptingInterface to not open file for activity event 2017-10-10 09:44:13 -07:00
Seth Alves
8ac1875a91 Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login 
Find nearby entities at login
 2017-10-09 17:54:44 -07:00
Seth Alves
f349ba3674 replace parent avatar-id with avatar-self-id when exporting entities 2017-10-09 15:32:45 -07:00
Zach Fox
b81a8a95ea Final fixes 2017-10-09 15:23:22 -07:00
Zach Fox
38b95b5403 Instructions HTML file and flow 2017-10-09 15:07:14 -07:00
Seth Alves
d1d2b8a4da don't export avatar-parent sessions IDs into json 2017-10-09 14:02:20 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Seth Alves
13da20e1f0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-09 12:18:09 -07:00
Seth Alves
54204833df add a getParentTree call for overlays 2017-10-09 12:17:56 -07:00
Anthony Thibault
13919907de Merge pull request #11539 from Nex-Pro/patch-1 
Fixed typo in qWarning message.
 2017-10-09 12:10:27 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Zach Fox
a7d43c63b6 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-09 11:38:13 -07:00
Andrew Meadows
bbde1bcd63 move stuff out of writelock when possible 2017-10-09 10:42:42 -07:00
Andrew Meadows
0bcecdbe66 be picky when finding nearby entities at login 2017-10-09 10:27:46 -07:00
Andrew Meadows
0f4e7fb532 workaround for bad physics polling on login 2017-10-09 10:27:46 -07:00
samcake
1f3623e8e9 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-09 09:37:25 -07:00
Brad Davis
7aeeaeb4e7 Fix rendering transform for text3d overlays 2017-10-07 19:41:43 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
samcake
988d8a1a62 TRying to debug the overlay notifications to show ?) 2017-10-06 18:17:48 -07:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -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
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Seth Alves
195d96bd43 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 11:02:35 -07:00
Nex-Pro
24974fdae3 Fixed typo in qWarning message. 2017-10-06 18:42:02 +01:00
Zach Fox
e5e6d84e07 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-06 09:47:21 -07:00
Zach Fox
051b63503c Merge pull request #11534 from zfox23/commerce_daveIntegration1 
Commerce backend changes sync, October 5 2017
 2017-10-06 09:45:45 -07:00
Ryan Huffman
9c06afc4c8 Merge pull request #11326 from cain-kilgore/21537 
WL 21537 - Improve log naming
 2017-10-06 08:51:42 -07:00
Seth Alves
8d00731620 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 07:20:34 -07:00
Zach Fox
525e0d8f61 Make SettingsScriptingInterface accessible to tablet 2017-10-05 16:51:13 -07:00
Andrew Meadows
a3bafa3c44 Merge pull request #11506 from SamGondelman/sharks 
Fix and improve laser pointer locking
 2017-10-05 14:10:06 -07:00
SamGondelman
6b02cbb911 move locking inside laserpointer and raypick 2017-10-05 13:17:57 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -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
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Clément Brisset
74fd69ac2d Merge pull request #11523 from Atlante45/new-master 
RC56 into Master
 2017-10-04 15:17:52 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
samcake
d773b40a63 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-04 13:25:14 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
Andrew Meadows
e3ea013d5f Merge pull request #11518 from SamGondelman/avatarRay 
Fix calling AvatarManager.findRayIntersection() from script
 2017-10-04 12:04:30 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
Zach Fox
1ed10ecf59 Fix passphrase crash 2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Zach Fox
23245e2fb9 Modify context overlay filter 2017-10-04 10:39:23 -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
SamGondelman
0614fd9b4f fix AvatarManger::findRayIntersection from script thread 2017-10-03 15:31:49 -07:00
Seth Alves
ea4068f1f9 Merge pull request #11478 from vladest/fix_menu_linux 
Added workaround to enable menu bar under Linux
 2017-10-03 13:10:34 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Zach Fox
e64b0861a1 Change passphrase working 2017-10-03 10:53:10 -07:00
Andrew Meadows
cd4be1473f put more of Application::update() under time measurement 2017-10-03 10:34:12 -07:00
Andrew Meadows
773c48bbc9 use floating point for game loop stats values 2017-10-03 10:32:19 -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
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
Andrew Meadows
21cd986645 tally PerformanceTimer records when it is active 2017-10-02 20:57:20 -07:00
samcake
bb99f68d40 Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead 2017-10-02 17:04:00 -07:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
Andrew Meadows
c3167444a9 decouple 'general timing' from 'game loop' details 2017-10-02 16:31:20 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
SamGondelman
97b09d680c fix and improve laser pointer locking 2017-10-02 13:17:53 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
Andrew Meadows
0fc6bf1e89 Merge pull request #11471 from Atlante45/feat/auto-bake 
Asset Browser tweaks
 2017-10-02 11:29:36 -07:00
Zach Fox
2b03e08c96 Fix errant status when requesting it for the first time 2017-10-02 10:20:24 -07:00
Sam Gateau
68046ae4e3 Merge pull request #11491 from jherico/dev/disable_watchdog 
Disable watchdog with environment variable
 2017-10-02 10:19:32 -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
vladest
e360c1363e Merge branch 'master' into tablet_extended_sounds 2017-10-02 18:03:49 +02:00
Sam Gateau
ec10d38983 more cleaning 2017-10-01 22:28:04 -07:00
Sam Gateau
6c510bc18f fine tuning the changes to respect clean up 2017-10-01 20:05:48 -07:00
samcake
0cbf19bcf1 Removing comments 2017-10-01 17:47:35 -07:00
samcake
aa10c29609 Cleaning up the changed code 2017-10-01 17:16:10 -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
Sam Gateau
44cc6deac2 moving render specific code from Application.cpp to Application_render.cpp 2017-10-01 12:55:44 -07:00
SamGondelman
0bb27a7165 fix modeloverlay visible change 2017-09-29 17:48:59 -07:00
samcake
577378f539 Adding stuff that seems to break? 2017-09-29 17:45:10 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
samcake
225d2bbbb4 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 13:47:37 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
SamGondelman
3ae41b9b75 cleanup client and stats string 2017-09-29 11:34:35 -07:00