Seth Alves
886772eb39
only worry about Ubuntu major versions when selecting Qt package
2019-05-22 11:27:14 -07:00
Shannon Romano
930018a924
Merge pull request #15603 from roxanneskelly/bugz223
...
BUGZ-223 - Fix crash when adding a tracked entity to the safe landing code
2019-05-21 19:38:01 -07:00
Roxanne Skelly
bad421cb59
Fix crash when adding a tracked entity to the safe landing code
...
when it's not been fully set up yet.
2019-05-21 16:58:49 -07:00
Zach Fox
39d32025a3
Merge pull request #15601 from zfox23/SUI/integratedStatusEtc
...
Simplified UI: Updates! (See Description)
2019-05-21 16:15:09 -07:00
Gayathri
009068222f
Merge pull request #15595 from amerhifi/feature/platform
...
BUGZ-296: Linux platform implementation
2019-05-21 16:01:33 -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
Zach Fox
5749392e83
New bg color; Final status indicator design; Fixed HMD icon
2019-05-21 14:10:27 -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
amerhifi
cb43a0efea
trying to bypass android error with output constraint
2019-05-21 10:59:33 -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
Zach Fox
e79518e092
Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc
2019-05-21 09:28:02 -07:00
amerhifi
56d8e0123f
resolving qt moc error with propertie missing for android
2019-05-21 09:19:56 -07:00
amerhifi
4f547040c0
removing include
2019-05-21 09:01:40 -07:00
amerhifi
5f81224976
did not work on linux, backing out change
2019-05-21 08:59:04 -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
amerhifi
47a612b195
testing gpu ident changes
2019-05-21 07:46:02 -07:00
Andrew Meadows
670effd372
handle case when QT_CMAKE_PREFIX_PATH not defined on UNIX
2019-05-21 03:52:01 -07:00
amerhifi
19a7d91aef
testing linux cpu info
2019-05-20 22:37:25 -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
Zach Fox
9deccd3ba7
Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc
2019-05-20 09:36:13 -07:00
