Amer
9b26f70e2f
Merge pull request #15633 from amerhifi/master
...
BUGZ 220: Docked Widget Whitelisting
2019-05-24 15:52:18 -07:00
Roxanne Skelly
82f8687e9f
ubuntu builds are picky (fix initializer order issue)
2019-05-24 15:47:30 -07:00
Roxanne Skelly
41be22a7bb
ubuntu build fix and CR fix
2019-05-24 15:22:33 -07:00
Roxanne Skelly
c6de86a80c
Log packet processing time for domain server list request packets
2019-05-24 14:52:55 -07:00
amerhifi
5a3585ea5b
adressing pr comments
2019-05-24 14:36:42 -07:00
amerhifi
6f04e039fe
adding whitelisting for dockedWidgets
2019-05-24 14:12:24 -07:00
Sam Gateau
a5d17883d0
Merge pull request #15602 from SamGondelman/tests
...
BUGZ-21, Case 22219: Fix skyboxes/ambient maps on AMD
2019-05-24 11:29:04 -07:00
amerhifi
ee3e2f0dd7
merge master
2019-05-24 11:00:30 -07:00
amerhifi
bd88a68a0f
testing context passing to dockWidget via whitelisting.
2019-05-24 10:58:13 -07:00
Roxanne Skelly
aaee796aef
Merge branch 'master' of https://github.com/highfidelity/hifi into domaincheckin
2019-05-24 09:38:37 -07:00
SamGondelman
dc3b2d97e3
fix the actual problem
2019-05-24 09:36:37 -07:00
Brad Hefta-Gaub
5765957fe1
Merge pull request #15618 from luiscuenca/addCredentials
...
Pass tokens as params for automatic login
2019-05-24 09:13:53 -07:00
Roxanne Skelly
cc3ce96227
fix ubuntu build issue
2019-05-23 15:24:41 -07:00
Shannon Romano
cc2e5af34d
Merge pull request #15619 from kencooke/audio-mac-callback-crashfix
...
BUGZ-158: Crash when switching audio devices on Mac
2019-05-23 15:20:08 -07:00
Roxanne Skelly
7fdbbe5b77
CR: Use functional type conversion instead of c-style casting
2019-05-23 14:45:49 -07:00
Roxanne Skelly
1c6cf3df0d
Move DomainList timestamps to the extended header
...
And. Lag notifications now use signed values
2019-05-23 14:19:36 -07:00
Roxanne Skelly
9c39d06416
Don't set permissions / is authenticated when DomainServerList checkin
...
should be ignored.
2019-05-23 11:42:51 -07:00
Roxanne Skelly
4f1eeecc2f
Revert "Merge pull request #15620 from highfidelity/revert-15612-domaincheckin"
...
This reverts commit 4735b9f19abc4a88beb7
2019-05-23 11:00:43 -07:00
Howard Stearns
a71e902a49
Revert "BUGZ-322 - add domain checkin lag logging"
2019-05-23 10:27:05 -07:00
Ken Cooke
135dc7f2b1
assert() on over-filling the audio callback buffer
2019-05-23 08:54:47 -07:00
Ken Cooke
ba3282e12b
Fix rounding error in allOrNothing mode
2019-05-23 08:03:59 -07:00
Ken Cooke
0d0a9fbd09
Never return more than maxSamples from the audio ringbuffer
2019-05-23 07:54:08 -07:00
luiscuenca
6d824ff22d
Fix logout
2019-05-22 20:27:42 -07:00
luiscuenca
206e353264
Pass tokens as params for automatic login
2019-05-22 16:18:30 -07:00
Clement
55f1929de2
Fix nodelist reset on logout/username change
2019-05-22 16:09:20 -07:00
Shannon Romano
5944af5cca
Merge pull request #15612 from roxanneskelly/domaincheckin
...
BUGZ-322 - add domain checkin lag logging
2019-05-22 15:49:24 -07:00
Roxanne Skelly
4ca77ba3ac
BUGZ-322 - add domain checkin lag logging
2019-05-22 13:51:43 -07:00
sabrina-shanman
3849450c66
Fix crash calculating tangents without texcoords
2019-05-22 11:57:20 -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
SamGondelman
b92e26722c
rebake default skybox
2019-05-21 15:58:46 -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
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
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
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
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
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
amerhifi
19a7d91aef
testing linux cpu info
2019-05-20 22:37:25 -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
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
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
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
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
Howard Stearns
f1e8343b30
put DomainServerCheckIn on NodeList thread
2019-05-17 14:30:30 -07:00
David Rowe
82fb99053d
Fix JSDoc typo noticed in passing
2019-05-17 21:35:50 +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
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
amerhifi
5cbb39a48e
adding computer changes to the platofrm
2019-05-16 16:25:02 -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
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
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
amer cerkic
6595f86985
Merge branch 'master' into feature/platform
2019-05-16 10:03:51 -07:00
amerhifi
52afa64215
undoing testing stuff also removing circular reference
2019-05-15 16:33:05 -07:00
Shannon Romano
f360789b33
Merge pull request #15566 from samcake/coco
...
BUGZ-141: Fix the LOD target value not in sync with the RefreshRate setting
2019-05-15 15:58:57 -07:00
amerhifi
9c786f3c5a
testing change
2019-05-15 15:48:08 -07:00
Shannon Romano
9b1e92145b
Merge pull request #14366 from SaracenOne/gltf_improvements
...
Case 22169: GLTF Importer Improvements
2019-05-15 15:47:21 -07:00
Sam Gateau
04c139c172
Merge branch 'master' of github.com:highfidelity/hifi into coco
2019-05-15 15:01:46 -07:00
amerhifi
633c0dfbac
testing gcc warnings
2019-05-15 14:57:33 -07:00
Brad Hefta-Gaub
4e8d3470d6
Merge pull request #15512 from amerhifi/feature/platform
...
case lily-29: Feature/platform. Creating a single point api to get system info
2019-05-15 14:04:43 -07:00
amerhifi
1da5298086
bypassing the static keys for now so that the pr can get build and go in
2019-05-15 13:13:43 -07:00
jennaingersoll
559a39be56
Merge pull request #15513 from ctrlaltdavid/M22147
...
Case 22147: Desktop, Paths, PlatformInfo, Window, and location JSDoc
2019-05-15 12:17:12 -07:00
amerhifi
ff742ecd97
removed qtglobal from keys. cleanup
2019-05-15 12:13:30 -07:00
amerhifi
803631a821
adding pragma once to see if it will help with gcc warnings. Its complaining that every file that includes the platformkeys is not using the variables
2019-05-15 11:58:41 -07:00
amerhifi
a779fb54ff
testing a change to hopefully fix gcc warnings
2019-05-15 11:53:40 -07:00
Shannon Romano
b3b3c2f721
Merge pull request #14945 from kencooke/audio-stats-loss-underflow
...
Case 19748: Audio loss statistic occasionally displays a huge number
2019-05-15 11:06:53 -07:00
amerhifi
c43d3de213
added linux and android stubs to help with the linux and android warnings
2019-05-15 10:18:59 -07:00
amerhifi
19a848d481
adding android until the stub is checked in
2019-05-15 08:53:05 -07:00
amerhifi
5e62e6b719
Sam for the win. Qtglobal missing
2019-05-14 19:29:17 -07:00
Sam Gateau
c163c92a6f
Merge branch 'master' of github.com:highfidelity/hifi into coco
2019-05-14 18:22:20 -07:00
Sam Gateau
2f380b3669
Detailing the info from the refresh rate
2019-05-14 17:58:32 -07:00
Roxanne Skelly
112b92d905
Merge pull request #15560 from roxanneskelly/bugz87
...
BUGZ-87 - loading/physics stuck when entering domain
2019-05-14 17:40:04 -07:00
