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

81074 commits

This branch
This branch
All branches
Author SHA1 Message Date
amerhifi
fbc68e7f69 removed clang format issue, removed old attempt at getting defaults to startup correctly 2019-09-23 15:07:04 -07:00
RebeccaStankus
e41632e3ec Removing connections to use inspect mode on mouse events 2019-09-23 14:42:13 -07:00
Shannon Romano
48c55d05c7
Merge pull request #16210 from Atlante45/feat/account-settings 
DEV-544: Add account settings to the AccountManager
 2019-09-23 13:00:23 -07:00
luiscuenca
10f76da3ec
Reset look at values when goToLocation or sitting 2019-09-23 11:53:47 -07:00
amer cerkic
e3db7a43a6 set default value for non set devices, typically only for first time runs 2019-09-23 11:00:51 -07:00
Sam Gateau
483a716839 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-23 10:19:45 -07:00
Shannon Romano
68c37e561a
Merge pull request #16233 from Atlante45/fix/flush-timer 
Put flush timer on right thread without parenting
 2019-09-23 09:37:05 -07:00
Sam Gateau
fd3e3aba7b Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-23 09:32:10 -07:00
Shannon Romano
23d8274d4b
Merge pull request #16229 from danteruiz/allow-qt-prefix 
BUGZ-1551: Do not download Qt if Qt_CMAKE_PREFIX_PATH is set as an environment variable
 2019-09-23 09:21:56 -07:00
Shannon Romano
db0feb4f52
Merge pull request #16231 from danteruiz/fix-2.0 
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
 2019-09-23 09:20:42 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
dante ruiz
b478a22ed2 fix edge case 2019-09-20 15:25:10 -07:00
Matt Hardcastle
f0f9fa0a80 [INFRA-196] Add mac notarization script 
The `notarize` script signs and submits a bundle to Apple's notarization
service. This command is meant for use as the part of release process
and its us is documented on the internal wiki.

    https://highfidelity.atlassian.net/wiki/spaces/hifiOps/pages/532710623/Sign+and+notarize+a+build+on+macOS

Jira: https://highfidelity.atlassian.net/browse/INFRA-196
 2019-09-20 15:00:38 -07:00
Clement
1924dad51b CR changes 2019-09-20 13:30:08 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera 
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
 2019-09-20 13:03:03 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue 
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
 2019-09-20 12:39:01 -07:00
Shannon Romano
22dffa5ce8
Merge pull request #16217 from Atlante45/fix/flush-timer 
BUGZ-489: Make sure the flush timer is not spawned too early
 2019-09-20 12:35:39 -07:00
amer cerkic
64f14dd6ba fixing selection issues 2019-09-20 11:32:57 -07:00
Sabrina Shanman
460eaf523a
Merge pull request #16202 from AndrewMeadows/trace-stats-for-workload 
DEV-594: add trace stats for workload region sizes
 2019-09-20 10:37:45 -07:00
luiscuenca
f979c4e1ab
Add more info to jdocs 2019-09-20 09:51:51 -07:00
danteruiz
da655c837e Do not download Qt if Qt_CMAKE_PREFIX_PATH as an environment variable 2019-09-19 22:35:59 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
Sam Gateau
ee5de175eb Better monitoring of the resource loading in flights 2019-09-19 16:56:55 -07:00
amerhifi
7fbce46e30 fixing android build, I removed a function thinking it was unused. also added android ifdef guards for name since default does to exist on that device. Simplified getting a default device 2019-09-19 15:57:38 -07:00
amerhifi
8d7c28fe83 fixed audio switching issues. removed risky access to properties. adressing comments 2019-09-19 14:19:43 -07:00
Clement
282aa70db3 Sync settings on logout/shutdown 2019-09-19 13:45:34 -07:00
Zach Fox
97ef2c030e
Merge pull request #16223 from zfox23/simplifiedGoToIteration 
Whoops! New placeholder text color
 2019-09-19 16:40:48 -04:00
Zach Fox
10352f1cb2 New placeholder text color 2019-09-19 13:38:37 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
Sam Gateau
6fe2b7a3d1
Merge pull request #16218 from AndrewMeadows/fix-avatar-entities-in-void 
BUGZ-1457: scripted edits of avatar entites should succeed when in the void
 2019-09-19 13:15:39 -07:00
Zach Fox
a472e723e2
Merge pull request #16222 from zfox23/simplifiedGoToIteration 
BUGZ-1529: Iteration on JumpTo Field visuals/interaction states
 2019-09-19 16:13:21 -04:00
Brad Hefta-Gaub
058c74f7d2
Merge pull request #16219 from zfox23/vrRotationSimplified 
DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR
 2019-09-19 12:18:35 -07:00
Shannon Romano
eda7314f1c
Merge pull request #16220 from zfox23/removeAudioInjectorLogging 
DEV-613: Remove unnecessary audio injector logging
 2019-09-19 12:09:42 -07:00
Zach Fox
80414a6f1c DEV-613: Remove unnecessary audio injector logging 2019-09-19 11:17:39 -07:00
Zach Fox
5077089518 BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap 2019-09-19 11:15:53 -07:00
sabrina-shanman
99386565b0 Fix build warnings/errors 2019-09-19 11:15:38 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
amerhifi
9cc3b7a5c7 addressing pr comments 2019-09-19 10:08:30 -07:00
Zach Fox
5e96ce8822 DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR 2019-09-19 09:48:11 -07:00
sabrina-shanman
56896e0866 Re-name error message to mention deformers, not blendshapes 2019-09-19 09:26:28 -07:00
Sam Gateau
6154611b05 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:10:38 -07:00
Shannon Romano
a5fdf5bb40
Merge pull request #16214 from hyperlogic/bug-fix/additive-blend-scale-fix 
Fix additive blending on avatars with non identity scale.
 2019-09-19 09:04:28 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
Andrew Meadows
ab419ddd23 beware null sessionID 2019-09-19 08:25:01 -07:00
Sam Gateau
a87db2636c SOme stuff workbetter 2019-09-18 18:25:42 -07:00
luiscuenca
fc223e4cb6
Reverse the up/down arrow keys if in selfie mode 2019-09-18 17:15:25 -07:00
amer cerkic
be2fff13d2 fixed wrong device in if block 2019-09-18 17:10:12 -07:00