SamGondelman
652ac17dac
fix deadlock on startup
2019-05-13 14:17:55 -07:00
Zach Fox
e87381f431
Merge branch 'master' of github.com:highfidelity/hifi into privateUserData
2019-05-13 14:13:34 -07:00
Zach Fox
55138ed088
CR feedback
2019-05-13 14:12:51 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state
...
(BUGZ-40) Check for possible avatar fade race condition
2019-05-13 13:41:09 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2
...
case 22190: Disable triggering away state when interface focus lost
2019-05-13 13:22:28 -07:00
Shannon Romano
8aee64c102
Merge pull request #15540 from jherico/fix/gl_crash
...
BUGZ-125: Error message instead of crash if the GL version is too low
2019-05-13 13:12:30 -07:00
Shannon Romano
46d75a61b3
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change
...
Clear any reliable connection state upon Node ID change
2019-05-13 13:11:05 -07:00
Shannon Romano
d37beec6d2
Merge pull request #15535 from Atlante45/fix/warnings
...
Fix mac build warnings
2019-05-13 13:09:59 -07:00
Shannon Romano
b1060bcb83
Merge pull request #15508 from dback2/materialTargetTooltip
...
Case 22467: Fix material target tooltip
2019-05-13 13:08:28 -07:00
Shannon Romano
12bb073d14
Merge pull request #15485 from sabrina-shanman/crash_hfm_normals
...
(case 22026) Fix crash due to invalid indices in baker::calculateNormals
2019-05-13 13:06:01 -07:00
Zach Fox
f799f96fba
simplifiedUI UIT switch
2019-05-13 13:04:12 -07:00
amerhifi
270d7feb7f
removed the duplicate function declaration
2019-05-13 12:20:22 -07:00
amerhifi
8623c3d74f
removing testing function declared in app.h
2019-05-13 12:14:48 -07:00
amerhifi
71d534c97d
merged master and resolved application conflict
2019-05-13 12:09:50 -07:00
amerhifi
8759f028f8
fixing Linux warnings
2019-05-13 11:41:30 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch
...
Case 22379: Run-time switch for deferred/forward rendering
2019-05-13 11:14:26 -07:00
Saracen
9aadea81b3
Fix to use correct texcoord2 array.
2019-05-13 19:13:24 +01:00
Zach Fox
feb5021372
UIT RadioButton
2019-05-13 11:07:39 -07:00
SamGondelman
eb8c722080
fix runtime switch
2019-05-13 09:58:55 -07:00
amerhifi
541aef5e90
fixing warnings
2019-05-13 09:56:10 -07:00
Shannon Romano
5c58cec5af
Merge pull request #15522 from SaracenOne/forward_lightmapping
...
Case 22494, BUGZ-127: Render lightmaps in the forward renderer
2019-05-13 09:13:34 -07:00
amerhifi
cbd751df89
fixing mac typo
2019-05-13 08:37:05 -07:00
Brad Hefta-Gaub
52eec19d50
Merge pull request #15543 from SamGondelman/zone
...
BUGZ-139, Case 22502: Fix zone inheritance
2019-05-13 08:12:41 -07:00
Shannon Romano
99239f6415
Merge pull request #15542 from hyperlogic/bug-fix/dependency-manager-thread-safety
...
Make DependencyManager thread-safe
2019-05-13 07:43:55 -07:00
amerhifi
9899b8c858
Merge branch 'master' into feature/platform
2019-05-13 06:52:13 -07:00
amerhifi
13c9bb078c
cleaned up pointers from the platform. Relized that having to manage them outisde of the platform will cause other issues.
2019-05-13 06:50:08 -07:00
Saracen
7987ed14b0
Fix mismatched meshpart attributes (generates dummy buffers), re-added normals generation routine, buffer size checks, detect out-of-range indices,
2019-05-11 04:30:14 +01:00
Anthony Thibault
b46378e0b6
Compile error fix
2019-05-10 15:51:42 -07:00
Anthony Thibault
fe17550a80
Code review feedback
...
In DependencyManager::set<>() destroy the clear the previous before allocating the new instance.
2019-05-10 15:41:52 -07:00
amerhifi
d019dc7d54
typo
2019-05-10 15:31:11 -07:00
SamGondelman
dfdace8cdc
fix zones for real this time
2019-05-10 15:24:02 -07:00
sabrina-shanman
736c7a9736
Change logging from 'fade-out animation' to 'fade-out transition'
2019-05-10 15:18:52 -07:00
amerhifi
81c0d195e3
added ability to extract cpu info on osx
2019-05-10 15:17:33 -07:00
milad
51cbadcad1
Removed Selection related logic
2019-05-10 14:41:55 -07:00
sabrina-shanman
6f5bf01f2b
Add sanity check and logging for possible avatar fade lambda race condition
2019-05-10 14:33:25 -07:00
Shannon Romano
5c9570cffb
Merge pull request #15539 from jherico/fix/watchdog_spam
...
BUGZ-131: Reduce spam from watchdog thread
2019-05-10 14:24:15 -07:00
Anthony Thibault
442a679108
Make DepenencyManager thread-safe again
...
Before this PR, there were no locks around the two internal QHash data structures.
Races are rare, due to the fact that the DependencyManager is initialized on the main thread on startup and the fact that a static QWeakPointer was used as an internal cache.
However, there have been reported crashes where the render thread uses DependencyManager::isSet() perhaps while the main thread is adding a late dependency.
DependencyManager::isSet() did not use the static QWeakPointer cache and was more prone to race conditions.
To avoid this and perhaps other data races, mutexes now guard both of the internal QHash data structures.
Also, as an optimization, the most frequent call to DependencyManager::isSet was removed (Profile.cpp).
2019-05-10 14:12:10 -07:00
Roxanne Skelly
7dfbbf55e9
Merge pull request #15530 from roxanneskelly/bugz85b
...
BUGZ-85 - extrapolate audio on network lag spike to reduce pop
2019-05-10 13:51:30 -07:00
amerhifi
684d71fc5b
more clean up
2019-05-10 12:27:10 -07:00
amerhifi
0e6fcf0fe6
removed unecessary using
2019-05-10 12:24:41 -07:00
amerhifi
ba69f0c962
cleaned up references and added json alias. Unfortuantely this library isn't easy to forward declare so leaving the header include
2019-05-10 12:21:40 -07:00
Simon Walton
4b51d81b42
Clear any reliable connection state upon Node ID change
2019-05-10 12:06:38 -07:00
Zach Fox
112e13383b
Dock it!
2019-05-10 12:03:29 -07:00
Brad Davis
0f8ddae9df
Reduce spam from watchdog thread
2019-05-10 12:01:07 -07:00
Shannon Romano
0d28932181
Merge pull request #15529 from Atlante45/feat/more-ice-logging
...
Add instrumentation to help track down connection issues
2019-05-10 11:57:24 -07:00
Brad Davis
db88f14e13
Error message instead of crash if the GL version is too low
2019-05-10 11:51:50 -07:00
Zach Fox
314c04ab96
Simplified UI v1
2019-05-10 10:49:25 -07:00
amerhifi
edb3206a24
adding macos platform. Misisng display and cpu info
2019-05-10 09:55:26 -07:00
Roxanne Skelly
53a1425ab1
Merge branch 'master' of https://github.com/highfidelity/hifi into bugz85b
2019-05-09 17:56:21 -07:00
Clement
07372f102c
Add logging on silent node removal
2019-05-09 17:19:10 -07:00
