Commit graph

79756 commits

Author SHA1 Message Date
Simon Walton
f567777f24 Don't read HMAC for 'nonverified' packets 2019-07-18 12:57:13 -07:00
MiladNazeri
d1199f9e1d
Merge pull request #15943 from MiladNazeri/avatarAppDisplayNameFix
[Bugz-1039] :: changed sessionDisplayName logic
2019-07-17 15:42:30 -07:00
Shannon Romano
ae729dcc87
Merge pull request #15940 from jherico/fix/bugz-753
BUGZ-753: bad skyboxes on Intel GPUs
2019-07-17 14:38:04 -07:00
Shannon Romano
18d4571849
Merge pull request #15942 from roxanneskelly/dev262
DEV-262 - Improve logging on failure to load resource
2019-07-17 14:36:56 -07:00
milad
a3b8ded56a changed sessionDisplayName logic 2019-07-17 14:17:58 -07:00
Roxanne Skelly
4f9d62696c DEV-262 - Improve logging on failure to load resource 2019-07-17 12:58:17 -07:00
MiladNazeri
25fc4fbb8f
Merge pull request #15937 from MiladNazeri/sessionDisplayNameChange
[BUGZ-537] :: removed session display name from nametag
2019-07-16 18:06:05 -07:00
Shannon Romano
d49fabf370
Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill
BUGZ-781: Remove loading-orb upon killing of avatar
2019-07-16 15:31:37 -07:00
Zach Fox
a4f4961dfd
Merge pull request #15941 from zfox23/graphicsSettingsMargin
Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings
2019-07-16 15:26:43 -07:00
Shannon Romano
53a67dcfa9
Merge pull request #15872 from SamGondelman/bias
DEV-202: Expose shadow bias and max distance to Zone Entity
2019-07-16 15:22:37 -07:00
Zach Fox
1cd136f178 Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings 2019-07-16 15:15:08 -07:00
Shannon Romano
7d393e8cd4
Merge pull request #15938 from hyperlogic/bug-fix/anim-warning-fixes
Warning fixes for MacOSX
2019-07-16 14:40:10 -07:00
Jamil Akram
d2000d810d
Merge pull request #15929 from dooglifeSF/teleport_fix
add teleport.fbx back to avatar/animations
2019-07-16 14:37:24 -07:00
Brad Davis
11f47ddeed BUGZ-753: bad skyboxes on intel GPUs 2019-07-16 13:42:39 -07:00
milad
77ec048947 added change to the statusIndicator for the same thing 2019-07-16 12:23:32 -07:00
Anthony Thibault
a31c834009 macos include fix. On macos with a case sensitive harddrive this include fails.
Change it to the more standard form.
2019-07-16 10:49:37 -07:00
Anthony Thibault
6425c68836 fix for self assignment warning 2019-07-16 10:48:51 -07:00
milad
53ec19dd57 removed session display name from nametag 2019-07-16 10:27:56 -07:00
Shannon Romano
bee8ba489a
Merge pull request #15935 from sethalves/fix-comfort-mode
BUGZ-1017: fix bug that caused comfort-mode to be active at all times in HMD
2019-07-16 09:57:56 -07:00
Ryan Huffman
117577cd29
Merge pull request #15933 from danteruiz/fix-interactive-deadlock
BUGZ-1014: Crash when opening Create
2019-07-16 09:05:50 -07:00
Seth Alves
22a913bee2 fix bug that caused comfort-mode to be active at all times in HMD 2019-07-15 21:10:42 -07:00
dante ruiz
e896a53113 fix interactive crash 2019-07-15 17:18:38 -07:00
Shannon Romano
020c7a5f44
Merge pull request #15931 from Atlante45/fix/dev-builds
Fix debug builds not compiling
2019-07-15 16:28:40 -07:00
Zach Fox
aed94a3a66
Merge pull request #15923 from PrestonB1123/fixShortcuts
BUGZ-991: Added conditionals to shortcuts to remove overlap
2019-07-15 15:23:58 -07:00
Clement
50d9a53883 Fix variable name in assert 2019-07-15 15:03:25 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving
Case 21663: comfort mode
2019-07-15 14:54:31 -07:00
Simon Walton
e259aa55c2 Remove loading-orb upon killing avatar, in case destructor isn't called 2019-07-15 14:14:24 -07:00
dooglifeSF
413a089402 add teleport.fbx back to avatar/animations
compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer
2019-07-15 13:24:21 -07:00
Shannon Romano
a64bc7f638
Merge pull request #15761 from danteruiz/fix-interactive-window-crash
BUGZ-400: Crash in Application::notify
2019-07-15 11:35:15 -07:00
Shannon Romano
d37456ea31
Merge pull request #15927 from SamGondelman/error
Possible fix for shader compilation error
2019-07-15 09:00:54 -07:00
Shannon Romano
7ea8675e83
Merge pull request #15919 from howard-stearns/mac-sleep-monitor
Mac sleep monitor
2019-07-15 08:39:19 -07:00
Shannon Romano
09729fb430
Merge pull request #15918 from zfox23/newGraphicsSettings
New Settings -> Graphics... dialog for Classic UI users
2019-07-15 08:38:01 -07:00
Shannon Romano
8ad1202bcb
Merge pull request #15916 from luiscuenca/WLAsyncThunder
BUGZ-989: Get recent builds asynchronously while the windows launcher is showing the splash screen
2019-07-15 08:36:33 -07:00
Shannon Romano
1bc72a86da
Merge pull request #15911 from amerhifi/bugz-968
case Bugz-968 adding a null check to the display plugin. Possible that display plug…
2019-07-15 08:35:29 -07:00
Shannon Romano
8ce64d95ab
Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux
BUGZ-863: wait for objects to be added to physics before completing SafeLanding
2019-07-15 08:34:17 -07:00
Shannon Romano
23c7e1c0f3
Merge pull request #15843 from SamGondelman/quit
Fix ScriptEngines::loadScript invoke call
2019-07-15 08:32:16 -07:00
hifi-gustavo
de53b9b11d
Merge pull request #15925 from Atlante45/feat/qt-5.12.3-upgrade
Use absolute path in ci script
2019-07-12 17:21:13 -07:00
SamGondelman
1789e16cc4 possible fix for shader compilation error 2019-07-12 16:22:01 -07:00
Clement
6ddccafa6b Use absolute path 2019-07-12 15:29:05 -07:00
hifi-gustavo
f019edc19c
Merge pull request #15924 from Atlante45/feat/qt-5.12.3-upgrade
Move debian packaging files to hifi repo
2019-07-12 14:16:24 -07:00
Clement
b93ec08f5a Modify path to resources 2019-07-12 14:05:02 -07:00
Clement
54a2619b70 Move ci scripts to hifi repo 2019-07-12 14:03:09 -07:00
dante ruiz
d78661a47f redo requested work 2019-07-12 13:34:08 -07:00
PrestonB1123
526b210fcd remembered that macs exist 2019-07-12 12:39:58 -07:00
PrestonB1123
aaf10cec39 added conditionals to shortcuts to remove overlap 2019-07-12 12:37:40 -07:00
Zach Fox
5828f46c6b Incorrect ID fixed - thanks Milad 2019-07-12 12:27:55 -07:00
Zach Fox
e0392642f7 Don't enable supersampling from graphics settings 2019-07-12 11:18:34 -07:00
amerhifi
ba6307e8e4 revert of extra space 2019-07-12 10:55:44 -07:00
amerhifi
f78c1cb5d0 reverting display plugin reset change 2019-07-12 10:54:08 -07:00
Howard Stearns
7ce6dd71d5 fix comment 2019-07-12 10:48:05 -07:00