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
62080 commits 71 branches 56 tags 1.2 GiB
Commit graph

62080 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539 
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
 2017-11-27 16:02:01 -08:00
Brad Hefta-Gaub
6d6ac0a5a9
Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash 
avoid a crash during domain change while wearing something
 2017-11-27 13:01:48 -08:00
Alexander Ivash
02684e3fed remove not used files 2017-11-27 22:49:11 +03:00
Alexander Ivash
da06b2656f 7991 Change Instances of Edit Mode to Create Mode 2017-11-27 22:47:42 +03:00
howard-stearns
1575119327 PR feedback 2017-11-27 10:46:57 -08:00
howard-stearns
2e919682a0 Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet 2017-11-27 10:02:53 -08:00
Brad Hefta-Gaub
068b93fc30
Merge pull request #11838 from druiz17/fix-grabbing 
fixing setting incorrect parent when grabbing entities
 2017-11-27 08:27:42 -08:00
Menithal
693da50a68 21539: Fixed None Checkmark being on Desktop mode 2017-11-27 07:59:04 +02:00
Menithal
5d52b9936b 21539: Updated Logic to match request 2017-11-27 07:42:18 +02:00
Menithal
ba1cd74ffe 21539: Moved Desktop HMD to None 2017-11-26 21:58:16 +02:00
vladest
6136a4cea6 Rounded background 2017-11-25 10:03:56 +01:00
vladest
73a557a8a4 Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views 2017-11-24 15:58:27 +01:00
vladest
bc33730c4e Merge branch 'master' into fix_tablet_scrollbars 2017-11-24 15:30:30 +01:00
vladest
b69b580a68 Use ScrollBar from QQC2 which is supports both mouse and touch events 2017-11-23 23:08:43 +01:00
Seth Alves
56e299c205
Merge pull request #11875 from samcake/orange 
Fix the spot light direction
 2017-11-23 11:11:31 -08:00
vladest
c03772d345 Merge branch 'master' into fix_tablet_scrollbars 2017-11-23 15:07:50 +01:00
vladest
22d57f1103 Fix click events from mouse 2017-11-23 14:56:15 +01:00
Sam Gateau
9a31a3dc95 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-22 23:29:55 -08:00
Sam Gateau
9c53ab719a Merge branch 'orange' of https://github.com/samcake/hifi into orange 2017-11-22 23:29:25 -08:00
howard-stearns
a6b437a79f get rid of "error" warning because the key wasn't broken into 64 char 
lines
 2017-11-22 16:55:57 -08:00
Seth Alves
9ccc416e80 avoid a crash during domain change 2017-11-22 16:34:56 -08:00
howard-stearns
abf41300dd refactor 2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6 fix up dynamic ownership challenge 2017-11-22 15:58:30 -08:00
Clément Brisset
e20555bf38
Merge pull request #11870 from Atlante45/feat/update-default-perms 
Add tmpRezCertified to default perms
 2017-11-22 14:57:22 -08:00