Commit graph

78597 commits

Author SHA1 Message Date
Shannon Romano
b1edfdcaef
Merge pull request #15596 from AndrewMeadows/fix-crash-bugz178
BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model (redux)
2019-05-21 12:50:26 -07:00
Shannon Romano
11f4252a30
Merge pull request #15599 from sabrina-shanman/bug_hfm_normal-map
(BUGZ-167) Always calculate tangents
2019-05-21 12:06:06 -07:00
Anthony Thibault
0e87ab6e55
Merge pull request #15598 from SamGondelman/skeletonModelURL
BUGZ-283: Fix MyAvatar.skeletonModelURL
2019-05-21 12:05:30 -07:00
Sam Gateau
54c14340ef
Merge pull request #15597 from amerhifi/master
Case BUGZ-277 :  Android build error (on windows host) stat properties missing (please review suggestion)
2019-05-21 11:11:29 -07:00
sabrina-shanman
4b15ee9c3a Always calculate tangents 2019-05-21 10:47:10 -07:00
SamGondelman
264051ed6d fix myavatar setSkeletonModelURL 2019-05-21 10:40:58 -07:00
Shannon Romano
8d36b90b8b
Merge pull request #15594 from huffman/feat/appconfig
DEV-54: Add support for application config
2019-05-21 10:01:19 -07:00
amerhifi
b3285050ed moving the properties out of the define since the values are going to be the same either way 2019-05-21 09:43:09 -07:00
amerhifi
56d8e0123f resolving qt moc error with propertie missing for android 2019-05-21 09:19:56 -07:00
Shannon Romano
b878e40606
Merge pull request #15593 from AndrewMeadows/linux-uses-qt-5.10
obey QT_CMAKE_PREFIX_PATH for non DEV_BUILD on UNIX
2019-05-21 08:04:49 -07:00
Andrew Meadows
045b0f7cf8 check for unloaded model 2019-05-21 07:49:21 -07:00
Andrew Meadows
670effd372 handle case when QT_CMAKE_PREFIX_PATH not defined on UNIX 2019-05-21 03:52:01 -07:00
Ryan Huffman
d9f164ba3b Add support for application config 2019-05-20 22:00:26 -07:00
Andrew Meadows
8dcc617acc obey QT_CMAKE_PREFIX_PATH for non DEV_BUILD on UNIX 2019-05-20 20:20:20 -07:00
Brad Hefta-Gaub
c1de3ecfd8
Merge pull request #15587 from howard-stearns/reduce-time-in-which-you-see-yourself-going-away
reduce time in which you see yourself going away
2019-05-20 15:17:03 -07:00
Anthony Thibault
952df9f77d
Merge pull request #15510 from AndrewMeadows/22007-hifiQtBuildv2
Case 22007: vcpkg update for Qt
2019-05-20 15:08:14 -07:00
Andrew Meadows
172b7b8d17
Merge pull request #15589 from jherico/fix/bugz-250
BUGZ-250: Don't crash on trying to add items to non-existent menus
2019-05-20 14:35:52 -07:00
Andrew Meadows
e8b0084fdb
Merge pull request #15588 from sabrina-shanman/bug_myavatar_res-state
(BUGZ-262) Add debug tool for transitions
2019-05-20 14:31:05 -07:00
Brad Davis
5d37a076d5 Don't crash on trying to add items to non-existent menus 2019-05-20 13:05:57 -07:00
Howard Stearns
07e9c3d648 reduce time in which you see yourself going away 2019-05-20 12:48:06 -07:00
sabrina-shanman
03a8e77ade Move RenderItemStatusIcon to Item.h 2019-05-20 12:07:41 -07:00
Andrew Meadows
f2f11b9509 only build qt.conf for DEV macos and unix builds 2019-05-20 15:00:07 -04:00
sabrina-shanman
5aff4d9f69 Update comment on render item status 2019-05-20 11:58:55 -07:00
sabrina-shanman
fa7621896a Add debug icon which shows on render items with transitions 2019-05-20 11:58:01 -07:00
Shannon Romano
8b7a30f45b
Merge pull request #15586 from sethalves/interface-deb-package-vcpkg
debian-style package for interface
2019-05-20 10:43:42 -07:00
Andrew Meadows
9b78edd062 more correct qt.conf for Linux and MacOS dev environment 2019-05-20 11:50:09 -04:00
Seth Alves
edaede0412 debian directory for building debian-style package 2019-05-19 10:43:56 -07:00
Andrew Meadows
528a64c618 hack QT_CMAKE_PREFIX_PATH for Jenkins macos builds 2019-05-18 06:45:25 -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