Commit graph

32520 commits

Author SHA1 Message Date
Roxanne Skelly
aaee796aef Merge branch 'master' of https://github.com/highfidelity/hifi into domaincheckin 2019-05-24 09:38: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 4735b9f19a, reversing
changes made to bc4a88beb7.
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
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