Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 22:15:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62054 commits 25 branches 0 tags 1.1 GiB
Commit graph

62054 commits

This branch
This branch
All branches
Author SHA1 Message Date
luiscuenca
b817143e2e Fixes on web and QML audio sync 2017-11-29 18:16:21 -07:00
Zach Fox
39afb4ab6a Merge pull request #11882 from howard-stearns/the-lost-ECDSA 
The lost ecdsa
 2017-11-29 15:53:52 -08:00
Zach Fox
7490744fb7
Merge pull request #11882 from howard-stearns/the-lost-ECDSA 
The lost ecdsa
 2017-11-29 15:46:22 -08:00
howard-stearns
57ec73bb13 spacing 2017-11-29 14:37:20 -08:00
howard-stearns
115bc27557 back to stable, rather than staging 2017-11-29 13:39:58 -08:00
Dante Ruiz
82fb58ed96 remove debug statement 2017-11-29 10:58:10 -08:00
Dante Ruiz
eba8a6e17b Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-29 10:50:37 -08:00
Dante Ruiz
982fad5050 fix laser interaction on HUD in HMD mode 2017-11-29 10:42:35 -08:00
howard-stearns
fb038c17ee for now, point this PR at staging so that it can be tested as built by 
jenkins
 2017-11-29 09:54:34 -08:00
howard-stearns
55589312f1 new padding/initialization that matters on linux server 2017-11-29 09:53:48 -08:00
Brad Davis
101d6763cc PR feedback 2017-11-29 09:11:52 -08:00
Zach Fox
3c892920e3 Prevent seeding text from flashing 2017-11-28 17:00:15 -08:00
howard-stearns
281b4cfd88 Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA 2017-11-28 16:59:44 -08:00
Anthony Thibault
8eb8cb0994
Merge pull request #11889 from hyperlogic/bug-fix/vive-no-head-rc60 
RC60: Head tracking bug fix for vive HMD users
 2017-11-28 16:31:27 -08:00
Anthony Thibault
16ca1a9ec6
Merge pull request #11888 from hyperlogic/bug-fix/vive-no-head 
Head tracking bug fix for vive HMD users
 2017-11-28 16:30:26 -08:00
Zach Fox
5dc8715879 Bugfix 2017-11-28 16:14:17 -08:00
Zach Fox
489d11d5fd Remove logging 2017-11-28 16:01:58 -08:00
Zach Fox
3e5a2addd2 Use same logic for Recent Activity 2017-11-28 16:00:46 -08:00
Zach Fox
e769d2fbc3 Don't refresh Inventory or Recent Activity if data hasn't changed 2017-11-28 15:44:42 -08:00
Bradley Austin Davis
e4220aa44e Fixing warnings in android build 2017-11-28 14:32:30 -08:00
David Back
1904daf623
Merge pull request #11869 from dback2/mirrorissues 
prevent spectator cam from updating secondary cam aspect ratio when it's in use by mirrors
 2017-11-28 14:05:47 -08:00
David Rowe
b9ad15b19e Add missing line3d overlay property getters 2017-11-29 11:03:16 +13:00
Bradley Austin Davis
5febbc32f5 CMake header cleanup 2017-11-28 13:54:46 -08:00
Bradley Austin Davis
a30395e945 Tweaking android cmake 2017-11-28 13:46:01 -08:00
David Rowe
3956b3b953 Fix missing line3d overlay property setter overrides of base class 2017-11-29 10:41:51 +13:00
David Rowe
76c934f012 Add missing line3d overlay property setters 2017-11-29 10:41:21 +13:00
vladest
7283f0127b return back square background for scroll bars 2017-11-28 22:21:52 +01:00
Dante Ruiz
9a5f0dea95 better solution 2017-11-28 13:16:47 -08:00
Anthony J. Thibault
7d34469679 Head tracking bug fix for vive HMD users 
(cherry picked from commit 8364700b7a)
 2017-11-28 12:38:11 -08:00
Bradley Austin Davis
137118c7fd Conditionally rename the APK for Jenkins 2017-11-28 12:35:10 -08:00
vladest
94937374c5 Make selection not visible under rounded scrollbar 2017-11-28 21:33:13 +01:00
Bradley Austin Davis
72792552c8 Add BUILD_BRANCH to the parameters passed to cmake 2017-11-28 12:30:39 -08:00
Bradley Austin Davis
300e1835eb Fix scribe permissions setting 2017-11-28 12:20:52 -08:00
Anthony J. Thibault
8364700b7a Head tracking bug fix for vive HMD users 2017-11-28 12:19:16 -08:00
vladest
b2ec2aab15 Merge branch 'master' into fix_tablet_scrollbars 2017-11-28 20:41:07 +01:00
Brad Davis
251ae81536 Adding verification to downloaded files for android 2017-11-28 11:32:41 -08:00
Brad Davis
8d6d1f67f1 Support RELEASE_TYPE and RELEASE_NUM for Android 2017-11-28 11:32:36 -08:00
Bradley Austin Davis
9293391297 Reduce number of gradle files 2017-11-28 11:32:35 -08:00
Bradley Austin Davis
ddc2548c53 Add polyvox, fix task copy bugs 2017-11-28 11:32:34 -08:00
Bradley Austin Davis
d6072f2bf2 Add bullet and draco to precompiled libraries 2017-11-28 11:32:34 -08:00
Bradley Austin Davis
113844384a Update linux android Qt to 5.9.3 2017-11-28 11:32:33 -08:00
Brad Davis
e086bed021 Updating OSX to Qt 5.9.3 2017-11-28 11:32:33 -08:00
Brad Davis
8f43083ded Enable windows builds 2017-11-28 11:32:32 -08:00
Bradley Austin Davis
6bdaf638cf Support OSX build 2017-11-28 11:32:32 -08:00
Brad Davis
d769acd345 Updating Android toolchain 2017-11-28 11:32:32 -08:00
Dante Ruiz
7daad29906 Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-28 10:44:04 -08:00
Dante Ruiz
039abff861 fix viveControllerManager not registering the vive input is no hand controllers are present 2017-11-28 10:43:37 -08:00
Brad Hefta-Gaub
e6c6e5f239
Merge pull request #11883 from birarda/feat/kick-on-fingerprint 
add option to kick logged in users by fingerprint too
 2017-11-28 08:29:46 -08:00
Stephen Birarda
e2082c0bcf apply machine fingerprint permissions if username absent 2017-11-27 19:02:40 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00