Commit graph

78484 commits

Author SHA1 Message Date
Seth Alves
edaede0412 debian directory for building debian-style package 2019-05-19 10:43:56 -07:00
Howard Stearns
5fbb788492
Merge pull request #15582 from howard-stearns/put-DomainServerCheckIn-on-NodeList-thread
put DomainServerCheckIn on NodeList thread
2019-05-17 16:49:12 -07:00
Anthony Thibault
dc150b5499
Merge pull request #15583 from SamGondelman/crash
BUGZ-243: Attempt to fix material crash
2019-05-17 16:34:14 -07:00
Sam Gondelman
ca537ef16a
Merge pull request #15584 from SamGondelman/loadingSphere
BUGZ-132: Fix avatar loading spheres
2019-05-17 16:24:12 -07:00
Howard Stearns
72a9017fdf put back modified version of earlier comment 2019-05-17 15:30:54 -07:00
SamGondelman
3273f46179 fix avatar loading spheres 2019-05-17 15:29:27 -07:00
SamGondelman
0039fb2f54 attempt to fix material crash 2019-05-17 14:51:42 -07:00
Brad Hefta-Gaub
4e86948c25
Merge pull request #15580 from MiladNazeri/simplifiedUINametag
changed size of always on overlays to be smaller
2019-05-17 14:42:29 -07:00
Brad Hefta-Gaub
b5da7f00de
Merge pull request #15581 from zfox23/SUI/menuAndVRButton
Simplified UI V1: Remove some extra menus from top bar; Only show VR button if headset connected at startup
2019-05-17 14:41:04 -07:00
Brad Hefta-Gaub
0d271af1fe
Merge pull request #15579 from howard-stearns/defer-avatar-pop-check
Defer avatar PoP check
2019-05-17 14:39:16 -07:00
Howard Stearns
f1e8343b30 put DomainServerCheckIn on NodeList thread 2019-05-17 14:30:30 -07:00
Zach Fox
e40e34856b Remove some extra menus from top bar; Only show VR button if headset connected 2019-05-17 13:28:59 -07:00
milad
0d80761cf0 added larger distance for on 2019-05-17 13:23:03 -07:00
milad
06056b9531 updated location in main UI 2019-05-17 13:00:26 -07:00
milad
df098cab2f changed size of always on overlays to be smaller 2019-05-17 12:36:03 -07:00
Howard Stearns
93db5ec054 Defer avatar PoP check 2019-05-17 11:25:05 -07:00
Simon Walton
024dfbf8b7
Merge pull request #15563 from SimonWalton-HiFi/avatar-banner-emissive
Make avatar-theft banner emissive
2019-05-17 10:03:37 -07:00
jennaingersoll
14e7f185c3
Merge pull request #15578 from ctrlaltdavid/M22520
Case 22520: Tidy new Window API plugin functions' JSDoc
2019-05-17 09:59:07 -07:00
David Rowe
82fb99053d Fix JSDoc typo noticed in passing 2019-05-17 21:35:50 +12:00
David Rowe
4ce2c39d0a Revise display plugin JSDoc in the Window API 2019-05-17 21:34:36 +12:00
Shannon Romano
b09247d191
Merge pull request #15572 from hyperlogic/bug-fix/blender-run-crash-fix
Fix blender::run crash
2019-05-16 22:09:18 -04:00
Shannon Romano
4e9852f9f9
Merge pull request #15575 from amerhifi/feature/platform
case BUGZ-57: Populate macos gpu _name
2019-05-16 22:07:16 -04:00
Sam Gateau
ffbe055fa8
Merge pull request #15569 from SamGondelman/switch
BUGZ-187: Proper Render Scripting Interface with renderMethod property
2019-05-16 18:29:18 -07:00
Zach Fox
c0037c3445
Merge pull request #15576 from zfox23/finishSettings
Simplified UI v1: Implement Performance settings and VR mode top bar switch
2019-05-16 17:01:04 -07:00
SamGondelman
db813fab6a threadsafe setRenderMethod 2019-05-16 16:48:23 -07:00
amerhifi
027583cddc removing stuff from destructor since its not a vector of computers 2019-05-16 16:40:16 -07:00
amerhifi
3b448ce1fe moving to only one computer. also a bit of cleanup: 2019-05-16 16:38:59 -07:00
Anthony J. Thibault
3ae33353d9 Fixed unused variables warnings 2019-05-16 16:38:47 -07:00
amerhifi
a62f91c7b3 removed xcode goofines 2019-05-16 16:30:30 -07:00
amerhifi
93cf6c882c spacing 2019-05-16 16:26:23 -07:00
Brad Hefta-Gaub
1ac1735d55
Merge pull request #14533 from SamGondelman/oculusHome
Case 22439: Fix HMD auto switch detection
2019-05-16 16:26:04 -07:00
amerhifi
5cbb39a48e adding computer changes to the platofrm 2019-05-16 16:25:02 -07:00
Zach Fox
70a4d6e8d5 Implement Performance settings and VR mode top bar switch 2019-05-16 16:15:05 -07:00
SamGondelman
451c52fa47 merge with master 2019-05-16 16:02:52 -07:00
SamGondelman
fee20d9e46 render scripting interface + renderMethod control 2019-05-16 16:01:21 -07:00
amerhifi
c1c2efc71d getting gpu name via profiler parsing 2019-05-16 15:47:03 -07:00
Zach Fox
fd5128f40f
Merge pull request #15573 from zfox23/SUI/imagesNoGlyphs
Simplified UI v1 Improvements
2019-05-16 15:14:03 -07:00
amerhifi
d924560af0 undoing test code for gcc warnings 2019-05-16 14:36:31 -07:00
amerhifi
9e00920884 adding computer model to platform for macos 2019-05-16 14:30:11 -07:00
Zach Fox
90a5b25600 A bunch of changes here 2019-05-16 14:18:04 -07:00
Clément Brisset
d8ac589c36
Merge pull request #15570 from SimonWalton-HiFi/avatar-challenge-guard
Add guard for Client-challenging Node not connected
2019-05-16 13:57:40 -07:00
Anthony J. Thibault
98fe059d97 Fix blender::run crash
Pass a shared_ptr of the HFMModel to the Blender.  This will prevent the HFMModel
from being destroyed on the main thread if an Avatar changes their skeletonModelURL.

Also the _blendshapeOffset hash in Model has been eliminated, it was not necessary and
was also a source of data races.

The body of Blender::run has been updated slightly to reduce the number of allocation necessary for temporary QVectors.
2019-05-16 13:12:16 -07:00
Simon Walton
e3e2bbc056 Add guard for challenging Node disappearing 2019-05-16 12:36:54 -07:00
Sam Gateau
6b3707873b
Merge pull request #15562 from jherico/bugz-133
BUGZ-133: Expose additional functionality to QML/Scripts
2019-05-16 12:03:22 -07:00
Zach Fox
ccaabbd9ae Merge branch 'master' of github.com:highfidelity/hifi into SUI/imagesNoGlyphs 2019-05-16 10:57:44 -07:00
Brad Davis
6a0b479041 Fix warning and build failures 2019-05-16 10:53:29 -07:00
amer cerkic
6595f86985 Merge branch 'master' into feature/platform 2019-05-16 10:03:51 -07:00
Sam Gateau
cf5869f199
Merge pull request #15568 from samcake/coco
BUGZ-145: Fix Window innerWidth and innerHeight after support for Docked window
2019-05-16 10:02:20 -07:00
Brad Davis
9bcc23f0c4 PR comments 2019-05-16 09:40:22 -07:00
Sam Gateau
edbd354760 Instead of returning the main window dimension (modulo the height of the menu bar) let s return the size of the actual 3d viewport widget 2019-05-15 17:57:53 -07:00