Commit graph

32536 commits

Author SHA1 Message Date
Sam Gateau
a168109588 trying to clean up the asm for linux and macos 2019-05-28 12:27:26 -07:00
Sam Gateau
2d1b06a1ba adding string.h (instead of stdio.h) for memset and memcpy on linux 2019-05-28 01:00:51 -07:00
Sam Gateau
e3fe20ae6a adding stdio.h for memset and memcpy on linux 2019-05-28 00:53:03 -07:00
Sam Gateau
a729369655 REmoving the keys list from the OCOmputer info, not needed 2019-05-28 00:32:02 -07:00
Sam Gateau
6f74098032 Fixing the getCPUIDEX 2019-05-28 00:26:30 -07:00
Sam Gateau
99f8b61727 Trying to unify the getCPUID function in CPUIdent 2019-05-28 00:14:50 -07:00
Sam Gateau
42d1b340cd Trying to unify the getCPUID function in CPUIdent 2019-05-28 00:00:45 -07:00
Sam Gateau
7c477740d3 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-05-27 12:48:20 -07:00
Sam Gateau
bd3881ef14
Merge pull request #15634 from SamGondelman/skyboxColor
BUGZ-380: Revert skybox color behavior
2019-05-26 10:43:54 -07:00
Shannon Romano
12996b2d7d
Merge pull request #15637 from kencooke/audio-init-racecond-crashfix
BUGZ-158: Crash when switching audio devices on Mac
2019-05-25 16:26:56 -07:00
Sam Gateau
5001a04326 Updating the platform lib, implementing the first version of the profiler and exposing all these through the PlatformInfoScriptingInterface 2019-05-25 15:53:54 -07:00
Ken Cooke
501ceaa6aa Add lock-free wait for initialization to the audio output callback.
Eliminates race condition without making assumptions about the internal audio threading model.
2019-05-25 10:47:26 -07:00
SamGondelman
61280214ca revert skybox color behavior 2019-05-24 15:52:50 -07:00
Amer
9b26f70e2f
Merge pull request #15633 from amerhifi/master
BUGZ 220: Docked Widget Whitelisting
2019-05-24 15:52:18 -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
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
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
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