Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 16:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80179 commits 6 branches 1 tag 1.1 GiB
Commit graph

33176 commits

Author SHA1 Message Date
Clement
50d9a53883 Fix variable name in assert 2019-07-15 15:03:25 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving 
Case 21663: comfort mode
 2019-07-15 14:54:31 -07:00
Shannon Romano
d37456ea31
Merge pull request #15927 from SamGondelman/error 
Possible fix for shader compilation error
 2019-07-15 09:00:54 -07:00
Shannon Romano
1bc72a86da
Merge pull request #15911 from amerhifi/bugz-968 
case Bugz-968 adding a null check to the display plugin. Possible that display plug…
 2019-07-15 08:35:29 -07:00
Shannon Romano
8ce64d95ab
Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux 
BUGZ-863: wait for objects to be added to physics before completing SafeLanding
 2019-07-15 08:34:17 -07:00
Shannon Romano
23c7e1c0f3
Merge pull request #15843 from SamGondelman/quit 
Fix ScriptEngines::loadScript invoke call
 2019-07-15 08:32:16 -07:00
SamGondelman
1789e16cc4 possible fix for shader compilation error 2019-07-12 16:22:01 -07:00
Shannon Romano
74b830dd12
Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen 
BUGZ-918: Generate RSA key-pair early in start-up
 2019-07-12 09:42:11 -07:00
Shannon Romano
3e70f4f51c
Merge pull request #15671 from SamGondelman/uber 
DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer
 2019-07-12 09:39:33 -07:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
Andrew Meadows
590876e54b remove NUM_REGIONS_TRACKED 2019-07-11 17:05:32 -07:00
SamGondelman
bda87aa13f trying to fix android 2019-07-11 16:39:23 -07:00
SamGondelman
046b25ab67 fix haze on web entities, deferred and forward 2019-07-11 14:56:17 -07:00
Andrew Meadows
0d943ca55a more warning supression 2019-07-11 14:47:31 -07:00
Andrew Meadows
f165184fb2 eliminate warnings about signed-vs-unsigned comparison 2019-07-11 14:09:37 -07:00
SamGondelman
7793e07eeb fix polyvox 2019-07-11 13:34:58 -07:00
SamGondelman
22a7a97a9a fix forward web + parabola blending 2019-07-11 12:23:04 -07:00
Andrew Meadows
ba8978862d improved names for workload::Region constants 2019-07-11 11:17:04 -07:00
SamGondelman
9539664749 add haze to skybox 2019-07-11 11:00:30 -07:00
SamGondelman
6ce809fb2a merge with master 2019-07-11 09:01:30 -07:00
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -07:00
David Rowe
2cb3425740 Merge branch 'master' into DOC-102 2019-07-11 16:38:23 +12:00
David Rowe
a45d8924fa Miscellaneous minor JSDoc fixes noticed in passing 2019-07-11 16:31:09 +12:00
Shannon Romano
54b07e9c9b
Merge pull request #15905 from SamGondelman/text 
BUGZ-967: Fix text visibility toggle
 2019-07-10 17:47:10 -07:00
Simon Walton
645a99c200 Generate RSA key-pair early in start-up 2019-07-10 17:36:25 -07:00
amer cerkic
d5d5741d42 removed extra lines 2019-07-10 17:17:53 -07:00
amer cerkic
73097113c7 adding a null check to the display plugin. Possible that display plugin was disposed off during the check if hmdmode 2019-07-10 17:13:34 -07:00
Howard Stearns
084b2edad4
Merge pull request #15908 from SimonWalton-HiFi/keygen-thread-logging 
BUGZ-918: Verbose RSA-keypair logging
 2019-07-10 15:57:30 -07:00
Simon Walton
7a64ed10f6 Verbose RSA-keypair logging 2019-07-10 15:08:51 -07:00
Sam Gondelman
a64d307bdf
make sure we don't have transparent shadow casters 2019-07-10 14:21:56 -07:00
SamGondelman
9a866a129d fix text visibility toggle 2019-07-10 10:20:27 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts 
DEV-164: Add defaultScriptsOverride option
 2019-07-10 10:16:55 -07:00
Andrew Meadows
9a6b42ec28 move getCollisionShapeURL() back to base class 2019-07-09 15:51:56 -07:00
Andrew Meadows
f44551e957 more readable code 2019-07-09 15:51:56 -07:00
Andrew Meadows
0f42dca40b add some comments about meanings of workload Regions 2019-07-09 15:51:56 -07:00
Andrew Meadows
520c62f6f6 wait for objects added to physics before stop SafeLanding 2019-07-09 15:51:56 -07:00
SamGondelman
29dbbc49ad Merge remote-tracking branch 'upstream/master' into bias 2019-07-09 15:38:13 -07:00
SamGondelman
bd2003fa01 Merge remote-tracking branch 'upstream/master' into uber 2019-07-09 13:45:14 -07:00
SamGondelman
8fd2251612 mostly working equation? 2019-07-09 13:34:33 -07:00
SamGondelman
68b2c8c2fb wip adding haze to forward rendering 2019-07-09 00:46:24 -07:00
SamGondelman
41e8a08484 Merge remote-tracking branch 'upstream/master' into uber 2019-07-08 23:00:36 -07:00
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
Jamil Akram
aa82c4e971
Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements 
Idles talks locomotion improvements
 2019-07-08 13:30:51 -07:00
Brad Hefta-Gaub
3108b69e5f
Merge pull request #15881 from SimonWalton-HiFi/cyan-sphere-debugging 
BUGZ-781: Additional debugging for dropped avatar data
 2019-07-08 09:14:13 -07:00
Sam Gateau
f2cda426d8
Merge pull request #15884 from samcake/nut 
BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier
 2019-07-06 02:18:11 +02:00
Sam Gateau
b4e86741e0 Adress typo in gpuident and add extra checks on the recommended scale value 2019-07-06 01:13:38 +02:00
Samuel Gateau
1aa067db74 address warning 2019-07-05 18:54:33 +02:00
Sam Gateau
11f036246e Implement the ppi scaling in sync with the platform tier 2019-07-05 17:52:44 +02:00
Samuel Gateau
6ef652038b EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed 2019-07-05 16:15:19 +02:00
Samuel Gateau
9d9b80dec0 remove cruft on the win side and live with a crappy ppiDesktop 2019-07-05 15:02:51 +02:00
Samuel Gateau
0c26d3ef66 clean up etc 2019-07-05 13:23:19 +02:00
Sam Gateau
4cc3800384 COmprehensive enumeration of gpu and displays from mac 2019-07-05 12:26:42 +02:00
Samuel Gateau
28fddc2fb3 full stack for windows 2019-07-04 18:13:08 +02:00
Samuel Gateau
12cc69e41c Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-07-04 01:56:06 -07:00
Samuel Gateau
8284c8d015 doing the full enumeration in windows 2019-07-04 01:55:48 -07:00
SamGondelman
ea1b117ca4 fix image y flip and text crash 2019-07-03 23:14:52 -07:00
Sam Gondelman
732a7b0a89
fix build error 2019-07-03 22:43:35 -07:00
SamGondelman
8b9fcd43b1 merge with master 2019-07-03 17:58:23 -07:00
Simon Walton
597477614c Debugging for missing Avatar Data 2019-07-03 17:51:05 -07:00
SamGondelman
72f52b069e cleanup, fix shadow qml 2019-07-03 16:21:47 -07:00
Sam Gondelman
00441f1899
Merge pull request #15875 from SamGondelman/load 
BUGZ-910: Return entity load priority operator to proper state after safe landing
 2019-07-03 14:20:03 -07:00
Sam Gondelman
0d9f639331
Merge branch 'master' into bias 2019-07-03 10:20:16 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit 
BUGZ-661: Add unlit property to text entities
 2019-07-03 18:43:26 +02:00
Samuel Gateau
3be8b80eff Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-07-03 01:01:26 -07:00
Samuel Gateau
a1968bd9d0 Moving mac specific include at the correct place 2019-07-03 01:00:52 -07:00
SamGondelman
4973563c20 return entity load priority operator to proper state 2019-07-02 16:29:19 -07:00
SamGondelman
692c776be5 expose shadow bias and max distance wip 2019-07-02 15:18:28 -07:00
Shannon Romano
a3ec365f6c
Merge pull request #15862 from annabrewer/display-simplification 
BUGZ-838, BUGZ-850, BUGZ-853: Muted sign displays backwards in second person view, Fix lossy/duplicate color format conversions, Adjust wearables screen is flipped
 2019-07-02 11:31:53 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
Shannon Romano
df34e2f86d
Merge pull request #15864 from hyperlogic/bug-fix/dependency-manager-shutdown-issues 
Fix for DependencyManager crash on shutdown on Mac
 2019-07-02 08:24:11 -07:00
Shannon Romano
2f07d35eb7
Merge pull request #15863 from SimonWalton-HiFi/public-address-change2 
BUGZ-894: Propagate a Node's public address change, part 2
 2019-07-02 08:23:34 -07:00
Sam Gateau
2c412808e7 More information from the platform on mac 2019-07-02 14:48:25 +02:00
Ryan Huffman
d29cd796ca Add defaultScriptsOverride option 2019-07-01 23:51:34 -07:00
Anthony Thibault
6c66f5a37b Fix for DependencyManager crash on shutdown on Mac 
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.

However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early.  Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.

To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.

However, this is only a speculative fix, because this is so difficult to reproduce.
 2019-07-01 17:37:57 -07:00
Sabrina Shanman
043aee4f78
Merge pull request #15859 from AndrewMeadows/fix-safe-landing 
BUGZ-787: fix SafeLanding to load correct set of objects before enabling physics simulation
 2019-07-01 17:05:19 -07:00
Anna
f44bc52d58 implemented requested changes, fixed math error in filmic curve 2019-07-01 17:05:13 -07:00
Simon Walton
6253adf749 Hook-up remote address-change to Connection class 2019-07-01 16:36:05 -07:00
Andrew Meadows
4bbfd7cad1 more correct bounding sphere around avatar for SafeLanding query 2019-07-01 15:53:42 -07:00
Anna
95f2dfa551 added horizontal flip back to mirror mode 2019-07-01 15:31:26 -07:00
Howard Stearns
36e526d1cd cr feedback 2019-07-01 15:23:00 -07:00
Howard Stearns
ce26611e1f CR comments 2019-07-01 15:11:54 -07:00
Howard Stearns
08ebd51559 Merge branch 'master' of github.com:highfidelity/hifi 2019-07-01 14:37:42 -07:00
Howard Stearns
0db69ecc20 add network card info to platform data 2019-07-01 14:36:48 -07:00
Anna
f52376563d remove redundant getRenderTexturePipeline() override from HMD display plugin 2019-07-01 11:14:54 -07:00
Anna
e6abaf76f3 Merge branch 'master' of github.com:highfidelity/hifi into display-simplification 2019-07-01 10:56:47 -07:00
Anna
787359fdfb fixed ui flipping issue 2019-07-01 10:52:03 -07:00
Brad Hefta-Gaub
0ef9110f2b
Merge pull request #15853 from SimonWalton-HiFi/public-address-change 
BUGZ-762: Propagate a Node's public address change to Connection class
 2019-06-28 16:12:01 -07:00
Shannon Romano
07fdbeaa0a
Merge pull request #15855 from SamGondelman/forward 
BUGZ-661: Fix text entity rendering in deferred vs. forward
 2019-06-28 15:59:09 -07:00
Sam Gondelman
e2bf3d7138
remove unused constant 2019-06-28 15:11:22 -07:00
SamGondelman
a5b92a6c7b fix layered rendering of group culled sub items 2019-06-28 14:24:33 -07:00
Shannon Romano
7ff751567b
Merge pull request #15848 from jherico/fix/dev-175-source 
DEV-175: QML content URL validation, whitelist trusted sources
 2019-06-28 14:18:56 -07:00
SamGondelman
c76d267c2a separate text into two render items 2019-06-28 13:53:44 -07:00
Simon Walton
225f65f4fb Log message tweaks 
Also don't need std in std::move, somehow.
 2019-06-28 11:30:09 -07:00
Shannon Romano
67901166ba
Merge pull request #15851 from ctrlaltdavid/DOC-79 
DOC-79: Entities JSDoc Update - Doc Review
 2019-06-28 10:12:05 -07:00
Anna
9b85c7f1ac Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification 2019-06-28 09:47:17 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
Simon Walton
9b894456e9 Change address for sequence-number hash also 2019-06-27 17:29:17 -07:00
Brad Davis
8bcde84d89 Disable remote QML unless whitelisted 2019-06-27 16:37:56 -07:00
Simon Walton
1265531f79 Plumb down change of destination address 2019-06-27 15:52:39 -07:00
raveenajain
3a60bc6a13 clang braces fix 2019-06-27 11:52:43 -07:00
raveenajain
d6fb7f8a6f arrays for bias calcs 2019-06-27 10:42:14 -07:00
raveenajain
309e59ca8b Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-27 09:42:03 -07:00
raveenajain
04afbde188 cascade loop, fine tune calc 2019-06-27 09:41:39 -07:00
Simon Walton
50965f1916 Handle remote public-address changes 2019-06-26 18:04:41 -07:00
Anna
6b79b275a9 fixed reinhard and filmic curves 2019-06-26 18:00:49 -07:00
Anna
24b6d64e34 removed extraneous code for hmd 2019-06-26 17:27:53 -07:00
Anna
6f5b37ec87 removed extraneous conversion to SRGB and back during deferred rendering 2019-06-26 16:36:04 -07:00
raveenajain
534794d7ff move bias init from config to run 2019-06-26 15:42:11 -07:00
Sam Gondelman
7573c1207b
remove extra alpha check in deferred sdf_text3D.slf 2019-06-26 11:21:52 -07:00
SamGondelman
fb4be671e7 fix invoke call 2019-06-26 10:54:50 -07:00
dooglifeSF
9f8d1dd51d Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-26 09:31:23 -07:00
Anna
59505ab20f fixed color banding on rift 2019-06-26 09:29:06 -07:00
Brad Hefta-Gaub
06bb09ff58
Merge pull request #15841 from SimonWalton-HiFi/accountmanager-quit-signal 
BUGZ-789: Use a queued signal to quit from AccountManager::saveLoginStatus()
 2019-06-25 17:20:41 -07:00
Shannon Romano
2af701235a
Merge pull request #15815 from annabrewer/snapshot-gamma 
BUGZ-765: Snaps Photos are Dark
 2019-06-25 15:26:00 -07:00
Simon Walton
b4e1c2264c Use a queued signal to quit from AccountManager::saveLoginStatus() 2019-06-25 14:47:58 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow 
BUGZ-664: Introduce scaling of rendering for forward renderer
 2019-06-25 14:27:17 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79 
DOC-79: Entities JSDoc Update
 2019-06-25 14:18:13 -07:00
Andrew Meadows
adce2a6fd0
Merge pull request #15838 from kencooke/render-blendshape-optim-avx2 
Fix Mac crash caused by PR#15825
 2019-06-25 13:54:39 -07:00
Ken Cooke
4c5c61231d Only use QVector resize when actually needed 2019-06-25 12:57:55 -07:00
Ken Cooke
0a34745ff9 Use QVector resize() instead of reserve() to silence Debug builds about size not being set. 
Causes unneeded default initialization, but no obvious way to avoid.
 2019-06-25 12:53:07 -07:00
Ken Cooke
b079e3283e BUGFIX: use unaligned loads 2019-06-25 11:48:41 -07:00
Sam Gateau
9470467c31 Ad the check for nsight to avoid the COmpositeHUD pass 2019-06-25 11:28:01 -07:00
Sam Gateau
4dcfa59997 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-25 11:14:09 -07:00
Bradley Austin Davis
ca797e30e4
Merge pull request #15825 from kencooke/render-blendshape-optim-avx2 
Blendshape CPU optimization
 2019-06-25 09:41:13 -07:00
Sam Gateau
962a3c2502 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-25 09:34:18 -07:00
Shannon Romano
2991bb4a98
Merge pull request #15834 from SamGondelman/perf 
BUGZ-811: Fix bugs in EntityTreeRenderer::updateChangedEntities
 2019-06-25 08:25:33 -07:00
raveenajain
bb5896c174 const fix 2019-06-24 17:24:37 -07:00
Sam Gateau
cb1bf57bd1 Address pr review comments 2019-06-24 16:54:06 -07:00
raveenajain
f68bb957ff clamp and initialize values 2019-06-24 16:42:38 -07:00
Shannon Romano
f5169093e0
Merge pull request #15828 from roxanneskelly/bugz812 
BUGZ-812 - Log system info on domain connect or connect refusal
 2019-06-24 16:05:55 -07:00
Anna
792cef1a91 fixed bad merge 2019-06-24 15:57:09 -07:00
Sam Gateau
b0ebcc745d Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-24 15:36:28 -07:00
Anna
658898c2e0 Merge branch 'master' of github.com:highfidelity/hifi into snapshot-gamma 2019-06-24 15:31:55 -07:00
Roxanne Skelly
c5883a8d67 CR fixes 2019-06-24 14:58:06 -07:00
SamGondelman
c605c2917f trying to fix entity tree renderer performance 2019-06-24 14:32:56 -07:00
Roxanne Skelly
3c0c1413db fix apple build 2019-06-24 14:12:25 -07:00
Brad Davis
aefa43bd11 Prevent duplicates from accumulating in EntityTree::_needsParentFixup 2019-06-24 13:02:28 -07:00
Ken Cooke
541d45012a Move BlendshapePacking_avx2.cpp to shared 2019-06-24 12:54:58 -07:00
Roxanne Skelly
e39ccff873 BUGZ-812 - Log system info on domain connect or connect refusal 2019-06-24 11:59:57 -07:00
Ken Cooke
75aea88f20 CR feedback 2019-06-24 11:51:03 -07:00
raveenajain
f0660ba381 modify shadow config via single bias 2019-06-24 11:03:10 -07:00
Ken Cooke
87e0f5b2bb Runtime dispatch for AVX2 2019-06-23 10:40:15 -07:00
Ken Cooke
8653118b6c Full SIMD implementation of packBlendshapeOffsets() using AVX2. 
6x speedup over the existing (partial SIMD) version.
60x speedup over the original (pure GLM) version.
 2019-06-23 10:32:57 -07:00
Ken Cooke
cceff21cd0 Pull packBlendshapeOffsets() into separate function 2019-06-23 08:57:56 -07:00
Ken Cooke
87c680382f Strip-mining optimization to improve cache utilization. 
For each mesh: init, accumulate, and pack using a recycled offset buffer.
 2019-06-23 08:42:38 -07:00
Ken Cooke
9e309b095d Fix bug that was packing zero offsets that were never used 2019-06-23 08:00:13 -07:00
Anna
8c3ddc049c works on desktop, android mobile, rift and quest 2019-06-21 20:08:09 -07:00
David Rowe
4c8f281383 Typos etc. 2019-06-22 14:16:17 +12:00
Sam Gateau
a278e6c52c REmoving unecessary job introduced dureing development 2019-06-21 17:24:21 -07:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
David Rowe
eb227c6b9a Document Entities entity methods 2019-06-22 11:59:07 +12:00
Sam Gateau
e0d0124caa
Merge pull request #15817 from SamGondelman/cube 
BUGZ-734: Possible fix for black shape issue
 2019-06-21 16:13:36 -07:00
Shannon Romano
13615eb9ff
Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread 
(BUGZ-619) Fix potential crash when ending script on main thread
 2019-06-21 15:08:42 -07:00
MiladNazeri
11a0c671e5
Merge pull request #15795 from zfox23/SUI/fixLasers 
BUGZ-657; BUGZ-713: Add a copy of the most default JS files because lots of system scripts depend on them being in the default scripts location
 2019-06-21 15:01:24 -07:00
Shannon Romano
33c99da71e
Merge pull request #15816 from roxanneskelly/bugz761 
BUGZ-761 Add locks to OctreeEditPacketSender to protect various members
 2019-06-21 14:39:41 -07:00
David Rowe
e3f971a304 Update Entities examples to have a delay after creation before editing 2019-06-22 09:23:07 +12:00
sabrina-shanman
4fafa2135a Fix potential crash when ending script on main thread 2019-06-21 14:20:15 -07:00
Zach Fox
8044b33d65 This also works 2019-06-21 13:44:31 -07:00
Anna
17163a1ce8 undid some VS auto format changes 2019-06-21 13:41:41 -07:00
Zach Fox
022a47d3ec Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-21 13:41:31 -07:00
David Rowe
0bee5edc47 Fix documentation of Material's albedo and emissive property values 2019-06-22 08:41:30 +12:00
Zach Fox
5067fd4cd2 OK this is definitely working 2019-06-21 13:41:11 -07:00
SamGondelman
8409119ad0 possible fix for black shape issue 2019-06-21 12:58:49 -07:00
Anna
70fbe840a5 added getCompositeFBColorSpace back into updateCompositeFramebuffer 2019-06-21 12:00:20 -07:00
Roxanne Skelly
001eae784a Add locks to OctreeEditPacketSender to protect various members 2019-06-21 11:42:27 -07:00
Sam Gateau
35d7211aca Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-21 11:38:33 -07:00
Anna
3d36c5714f added comments and cleaned up 2019-06-21 11:34:10 -07:00
Anna
250d18d7df restructured gamma correction so snapshots look correct 2019-06-21 11:11:44 -07:00
Sam Gateau
a856fdb3ca getting rid of the resolution Scale on the display plugin 2019-06-21 10:36:25 -07:00
Zach Fox
21454f6256 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-21 09:44:54 -07:00
amer cerkic
67e42148ef Merge branch 'master' of https://github.com/highfidelity/hifi 2019-06-21 09:43:33 -07:00
Sam Gateau
69bb9ac0b6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-20 22:23:15 -07:00
David Rowe
3c53cb2e90 Add missing grabDelegetToParent property to JSDoc 2019-06-21 15:21:16 +12:00
David Rowe
52860adc1c Add callEntityMethod() and similar examples 2019-06-21 14:27:51 +12:00
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
Anthony Thibault
64a77d07e0
Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix 
Disable handTouch.js to prevent finger twitching
 2019-06-20 17:03:39 -07:00
David Rowe
a858314898 Remainder of Entities signals' JSDoc 2019-06-21 11:25:10 +12:00
Anthony J. Thibault
3a6d8dc383 Disable handTouch.js to prevent finger twitching 
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.

Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.

Also, three new items were added to the Developer > Show Animation Stats panel.

* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.

https://highfidelity.atlassian.net/browse/BUGZ-154
 2019-06-20 15:52:36 -07:00
Andy Howell
447f0ca55c
Merge pull request #15807 from AndrewMeadows/fix-crash-bugz512-redux 
BUGZ-512: fix MacOS crash in FakeAudioInputStream on domain-change and shutdown
 2019-06-20 15:42:33 -07:00
amer cerkic
30e295d1a0 push to talk causes fun, removing tttt 2019-06-20 15:12:20 -07:00
amer cerkic
1218f7e014 moved audioclient stop to dtor 2019-06-20 15:10:21 -07:00
Andy Howell
4cc6eae478
Merge pull request #15809 from samcake/nut 
BUGZ-776 : Detect AMD gpu on more than one possible token
 2019-06-20 15:08:41 -07:00
Shannon Romano
7645fcfaa1
Merge pull request #15805 from SamGondelman/shared 
BUGZ-777: Clean up SharedObject code
 2019-06-20 14:35:58 -07:00
Sam Gateau
bde50aa21c Detect AMD gpu on more than one possible token... 2019-06-20 14:24:04 -07:00
Zach Fox
d49205be74 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-20 09:45:49 -07:00
Andrew Meadows
1ea0dba083 use weak_ptr for fade-out-finished lambda 2019-06-20 09:29:48 -07:00
Andrew Meadows
87d7a0a72f recover the Good Parts from first attempt to fix bugz-512 2019-06-20 09:29:48 -07:00
Sam Gateau
a66bd04810
Merge pull request #15803 from SamGondelman/setPipeline 
BUGZ-703: Possible fix for do_setPipeline crash and other Mac fixes
 2019-06-20 09:27:16 -07:00
Andrew Meadows
b23badf374
Merge pull request #15804 from samcake/wall 
DEV-146, BUGZ-747: Add one call in PlatformInfo::getPlatform() returning the complete description of the platform
 2019-06-20 09:07:19 -07:00
dooglifeSF
12b7cb0262 merge dooglifeSF master into branch Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-20 09:01:59 -07:00
David Rowe
0945bdaac7 Remainder of Entities methods' JSDoc 2019-06-20 15:11:01 +12:00
Shannon Romano
77d91fce33
Merge pull request #15802 from annabrewer/unreachable-code 
Small warning fix
 2019-06-19 18:06:34 -07:00
Shannon Romano
80b118560d
Merge pull request #15801 from SimonWalton-HiFi/recording-playback-null-url 
A null recording clip should be considered an error
 2019-06-19 17:58:46 -07:00
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
Sam Gateau
b2631e89e9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 17:11:20 -07:00
SamGondelman
50df5e0bc5 small cleanup to shared object etc. 2019-06-19 16:56:45 -07:00
Sam Gateau
8f04eaae1d Merge branch 'master' of github.com:highfidelity/hifi into wall 2019-06-19 16:53:04 -07:00
Sam Gateau
53094ef70c One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls 2019-06-19 16:52:33 -07:00
SamGondelman
fb8cc27fef Merge remote-tracking branch 'upstream/master' into shared 2019-06-19 16:52:04 -07:00
SamGondelman
f2e3218ec0 possible fix for do_setPipeline crash and other mac fixes 2019-06-19 16:34:38 -07:00
Shannon Romano
c7a5d35436
Merge pull request #15799 from roxanneskelly/bugz516a 
BUGZ-516 - add OS type to connect message for logging
 2019-06-19 16:08:13 -07:00
Anna
c215831df8 fixed potential unreachable code warnings 2019-06-19 15:41:53 -07:00
Bradley Austin Davis
e848aca193
Merge pull request #15800 from jherico/fix/gl_context_create_2_0 
BUGZ-402: Don't request an OpenGL 2.0 context via the dock widget
 2019-06-19 15:20:50 -07:00
Simon Walton
7701710aa5 Consider a NetworkClipLoader resource with null URL to be failed 2019-06-19 15:02:16 -07:00
Shannon Romano
12357e5ced
Merge pull request #15797 from annabrewer/gamma-correction-correction 
BUGZ-271: Android gamma correction is too high
 2019-06-19 14:39:09 -07:00
Brad Davis
abb71ba604 Don't request an OpenGL 2.0 context via the dock widget 2019-06-19 14:10:53 -07:00
Roxanne Skelly
2ed5e8aefb add OS type to connect message 2019-06-19 13:53:38 -07:00
Anna
00820b9a9b Merge branch 'master' of github.com:highfidelity/hifi into gamma-correction-correction 2019-06-19 13:49:55 -07:00
Zach Fox
8fdfdbaae4 Another attempt, still not working 2019-06-19 13:31:21 -07:00
SamGondelman
ee8cdd6ae6 Merge remote-tracking branch 'origin/master' 2019-06-19 13:09:13 -07:00
Howard Stearns
ff1d828aaa
Merge pull request #15794 from SimonWalton-HiFi/limit-stats-dump-rate 
Limit the stats-dump rate on packet error
 2019-06-19 11:14:48 -07:00
Anna
45ac07de3b fixed pick profiling 2019-06-19 10:54:28 -07:00
Anna
a19efce173 implemented samuel's requested changes 2019-06-19 10:34:55 -07:00
Simon Walton
b95515933f
Merge pull request #15708 from SimonWalton-HiFi/stun-on-iface-change 
Force new IP port on local address change
 2019-06-19 10:12:36 -07:00
dooglifeSF
4be42a4b9b Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-19 09:57:04 -07:00
Sam Gateau
fdf06ea819 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 09:41:45 -07:00
Brad Hefta-Gaub
41c0dc0059
Merge pull request #15796 from SamGondelman/mac 
BUGZ-730: Fix deferred rendering on macbook air
 2019-06-19 08:31:30 -07:00
Anna
803fe1e178 added comments 2019-06-18 19:33:31 -07:00
Anna
a1a3eccad9 fixed gamma on rift, removed extraneous code from quest, clarified variable names 2019-06-18 19:23:40 -07:00
Sam Gateau
1ae06f01b0 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 17:41:56 -07:00
SamGondelman
3ff81607ab fix deferred rendering on macbook air 2019-06-18 17:17:21 -07:00
Sam Gateau
251faf2171 Trying to clean up the solution... 2019-06-18 17:08:08 -07:00
Anna
301791c07e fixed gamma on quest 2019-06-18 16:56:14 -07:00
Simon Walton
7d80852544 Reduce reporting period to 1 s 2019-06-18 16:06:47 -07:00
Simon Walton
06b00e93ae Limit the stats-dump on packet error 2019-06-18 15:43:14 -07:00
Seth Alves
0a2f37f9a0 Q_OBJECT and template classes don't mix 2019-06-18 15:36:32 -07:00
Anna
0d543b0f3e Merge branch 'gamma-correction-correction' of github.com:annabrewer/hifi into quest-optimization 2019-06-18 15:26:31 -07:00
Anna
4cf8023d0e fixed gamma on windows 2019-06-18 15:19:02 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
raveenajain
55ebfc0789 Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-18 14:08:50 -07:00
Ken Cooke
5c837406ac
Merge pull request #15788 from kencooke/audio-simd-UBSan-warnings 
Fix UBSan warnings due to SIMD intrinsics
 2019-06-18 13:38:57 -07:00
SamGondelman
c129f84e73 Merge remote-tracking branch 'origin/master' 2019-06-18 11:48:38 -07:00
Sam Gateau
f30eb919c7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 11:24:04 -07:00
Anthony Thibault
10dae7e4d9
Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement 
Improvement to Developer > Avatar > Draw Animation
 2019-06-18 10:50:46 -07:00
Ken Cooke
ce7571dcc1 Replace NEXTPOW2() macros with constexpr (supported since VS2015) 2019-06-18 10:29:23 -07:00
raveenajain
44caf67527 init change, bias triggered via script 2019-06-18 10:02:22 -07:00
Ken Cooke
fa4dfffd8e Update reverb SIMD to avoid benign UBSan warnings due to unaligned load/store 2019-06-18 09:53:54 -07:00
dooglifeSF
ae2c381aaa Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-18 09:42:18 -07:00
dooglifeSF
55524ec815 Set debug text lit time to 20 (again) and move 2 break statements out of comment to fix exception in debug 2019-06-18 09:39:06 -07:00
Ken Cooke
11b599f8f9 Update SIMD resampler to avoid benign UBSan warnings due to unaligned load/store 2019-06-18 09:34:55 -07:00
Anna
1d3867d777 works on quest but not desktop 2019-06-17 18:34:26 -07:00
Anna
72da2bc7e5 init commit 2019-06-17 18:12:52 -07:00
Anthony J. Thibault
c75dc29c03 more assert macro trickery 2019-06-17 16:11:19 -07:00
Anthony J. Thibault
e6e40e7b48 added include<assert.h> 2019-06-17 16:09:24 -07:00
Anthony J. Thibault
d57ea8ac4a Fix for signed/unsigned compare warning 2019-06-17 15:42:20 -07:00
Anthony J. Thibault
4b5d5062b1 Improvement to Developer > Avatar > Draw Animation 
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.

Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
 2019-06-17 14:50:19 -07:00
Seth Alves
e7b852ca38 don't try to create collision shape before compound shape resource is finished loading 2019-06-17 13:18:03 -07:00
David Rowe
23785b5406 Regularize links to individual entity types 2019-06-15 14:06:49 +12:00
Sam Gateau
84a43c0e00 Merge branch 'yellow' of github.com:samcake/hifi into yellow 2019-06-14 17:54:50 -07:00
Sam Gateau
e5a772a9b8 Introducing the HUD layer rendering pass into it s own task and file 2019-06-14 17:54:15 -07:00