Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79963 commits 71 branches 56 tags 1.2 GiB
Commit graph

79963 commits

This branch
This branch
All branches
Author SHA1 Message Date
sabrina-shanman
e043d181cd Disable picks in controllerDispatcher when not in HMD 2019-07-16 17:46:54 -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
SamGondelman
965feb6f7a condense direction light shaders using slp defines 2019-07-16 11:24:19 -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
David Rowe
8be59633f4 Reticle JSDoc 2019-07-16 12:49:54 +12: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
Matt Hardcastle
afb5f81ca0 Add signing to macOS Interface and HQ Launcher 
This change adds signing to the macOS version of Interface and HQ
Launcher. By default, signing is not enabled; to enable signing you must
add the `XCODE_DEVELOPMENT_TEAM` environment variable and rerun CMake.

Jira: https://highfidelity.atlassian.net/browse/DEVOPS-52
 2019-07-15 10:54:44 -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
David Rowe
8a82ea55c7 HMD API vision squeeze properties JSDoc 2019-07-13 10:39:40 +12: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
Matt
34908e54ef
Merge pull request #15873 from Atlante45/feat/qt-5.12.3-upgrade 
BUGZ-820: Remove QT_CMAKE_PREFIX_PATH prod hack
 2019-07-12 10:24:06 -07:00
Shannon Romano
74b830dd12
Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen 
BUGZ-918: Generate RSA key-pair early in start-up
 2019-07-12 09:42:11 -07:00