Commit graph

78613 commits

Author SHA1 Message Date
SamGondelman
dc3b2d97e3 fix the actual problem 2019-05-24 09:36:37 -07:00
SamGondelman
b92e26722c rebake default skybox 2019-05-21 15:58:46 -07:00
SamGondelman
a672b79cd8 add version to default skybox 2019-05-21 15:35:43 -07:00
SamGondelman
4eeff52746 add version to texmeta.json files, fallback to original file if version has changed for skyboxes 2019-05-21 15:30:28 -07:00
Shannon Romano
fa7a998cca
Merge pull request #15600 from roxanneskelly/bugz223
BUGZ-223 - Physics was not starting in TheSpot-dev
2019-05-21 15:15:16 -07:00
Brad Hefta-Gaub
f8797e0d34
Merge pull request #15591 from ctrlaltdavid/M22493
Case 22493: Script JSDoc
2019-05-21 15:13:05 -07:00
Sam Gateau
98e426ac9f
Merge pull request #15590 from SamGondelman/settings
BUGZ-284: Add shadows, AA, and AO to RenderScriptingInterface
2019-05-21 15:08:02 -07:00
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
Roxanne Skelly
10db88c07b Fix ubuntu warning 2019-05-21 12:32:01 -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
Roxanne Skelly
dddb171b52 BUGZ-223 - Physics was not starting in TheSpot-dev
This was caused by two issues involving the SafeLanding system:
* Race condition on domain load
The domain is hard-reset twice during typical start, first after
login completes, and second, when ice/domain renegotiation occurs
Entities added during the first reset caused an add to the safe landing
system which, because those adds were queued, possibly happened after
the second hard reset.

Second, Safe landing checks whether physics is ready on entities before
letting physics start.  Physics is ready when the entities have a
physics shape associated with them if they're static meshes.  The
physics shape is only generated if the entity is in Region 1 or 2.
Safe landing, however, was not checking the region of the entity
and was therefore waiting on entities that were not in region 1 or 2
2019-05-21 11:23:04 -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
SamGondelman
43874fbfb3 fix AA toggle 2019-05-20 17:21:10 -07:00
David Rowe
5227b35c6b Revise changes 2019-05-21 10:32:12 +12:00
David Rowe
ca7ddece8b Add missing Script JSDoc 2019-05-21 10:32:12 +12:00
David Rowe
0a0a25139c Deprecate items that shouldn't be in the Script API 2019-05-21 10:32:12 +12:00
David Rowe
d196e35701 Polish existing Script JSDoc 2019-05-21 10:32:12 +12:00
David Rowe
0e478de1a2 Stub out missing Script JSDoc 2019-05-21 10:32:12 +12: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
SamGondelman
2e666836c7 add more options to render scripting interface 2019-05-20 13:42:53 -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