Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 19:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55868 commits 25 branches 0 tags 1.1 GiB
Commit graph

23074 commits

Author SHA1 Message Date
Burt Sloane
fbc28c0e2f pedantic PR 2017-06-15 16:16:29 -07:00
Burt Sloane
a73281b827 fix PR issues 2017-06-15 16:10:08 -07:00
Burt Sloane
43488fe5b8 Merge branch 'midi' of https://github.com/burtsloane/hifi into midi 2017-06-15 15:57:08 -07:00
Burt Sloane
af5e812f00 neutralized for non-windows compile 2017-06-15 15:56:49 -07:00
burtsloane
2358d51ef1 Delete USBEventListener.cpp 2017-06-15 15:22:51 -07:00
burtsloane
19e35e1cd0 Delete USBEventListener.h 2017-06-15 15:22:40 -07:00
Burt Sloane
7022c4009f midi in and out 2017-06-15 15:18:06 -07:00
Chris Collins
4b6c13bc1f Merge pull request #10646 from ZappoMan/debugAudioProblems 
Fix for no-audio on clean install
 2017-06-10 11:32:42 -10:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes 
Add additional primitive shapes
 2017-06-09 19:02:54 -07:00
Brad Hefta-Gaub
6006fa0fe1 Merge pull request #10638 from samcake/hobbes 
Adjust the preview to avoid seeing the masked pixels in HMD mode
 2017-06-09 15:38:33 -07:00
ZappoMan
6fe20f90a3 add better debugging for audio problems 
use OS default device if settings have no values
 2017-06-09 13:36:12 -07:00
Liv
7785473ccb moving else 2017-06-09 12:59:08 -07:00
Stephen Birarda
3582e5110e Merge pull request #10644 from seefo/fb5005 
Resolved FB5005
 2017-06-09 11:55:45 -07:00
Liv
8c488d95d1 Stylish updates 2017-06-09 11:46:38 -07:00
seefo
06a5d0970c Fixed issue with invalid time being sent when logging 2017-06-09 10:58:07 -07:00
Liv
1808505d8b Coding standard fixes 2017-06-09 10:54:57 -07:00
Anthony Thibault
e3c342aa77 Merge pull request #10595 from hyperlogic/feature/spine-spline 
Spline IK target support
 2017-06-08 18:09:55 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
Seth Alves
73a88236a0 Merge pull request #10586 from ctrlaltdavid/21202 
Relax hands to default position/rotation when controller tracking is lost
 2017-06-08 16:38:08 -07:00
Anthony J. Thibault
8334dff610 compute rotation from derivative of spline 
This should fix bad rotation values for the spine during bowing/touching toes.
 2017-06-08 15:00:12 -07:00
seefo
fce3badd1d Resolved FB#5005 2017-06-08 11:57:44 -07:00
Liv
34bd2b8a2b style fix 2017-06-08 09:01:01 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
samcake
1b45276de2 Adjust the preview to avoid seeing the masked pixels in HMD mode 2017-06-07 15:55:38 -07:00
Liv
c3bf915fd4 Changing loop to avoid unused warnings 2017-06-07 15:04:39 -07:00
Anthony J. Thibault
606c6415ae Merge branch 'master' into feature/spine-spline 2017-06-07 10:53:46 -07:00
Seth Alves
b1c7c251ac Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-07 10:09:46 -07:00
Brad Hefta-Gaub
e5ac3eeea7 Merge pull request #10548 from NeetBhagat/21255 
On Oculus Rift on/off, switch automatically to/from desktop mode
 2017-06-06 18:05:56 -07:00
Bradley Austin Davis
b4bbf98fe3 Suppress TBB warnings 2017-06-06 15:02:16 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Brad Davis
171d3212fe Merge pull request #10623 from jherico/qml_engine_singleton 
Migrate to single QML engine
 2017-06-06 15:00:43 -07:00
Stephen Birarda
0ccd0d3fd6 Merge pull request #10621 from highfidelity/stable 
Merge Stable back into Master
 2017-06-06 10:39:03 -07:00
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
NeetBhagat
ae9a928740 Merge branch 'master' into 21255 
# Conflicts:
#	interface/src/Application.cpp
 2017-06-06 19:06:50 +05:30
David Rowe
5cb1918b80 Simplify code 2017-06-06 13:26:16 +12:00
Liv
5579c409e7 Style fix 2017-06-05 18:03:10 -07:00
Liv
42cb2332d5 Remove unimplemented comment on circle 2017-06-05 17:46:13 -07:00
Liv
393aa84a55 Renaming conical to isConical 2017-06-05 17:45:52 -07:00
Liv
e4963e076a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 17:38:28 -07:00
David Rowe
ad848706ec Merge branch 'master' into 21202 2017-06-06 11:18:31 +12:00
Seth Alves
9fcc1e15b8 remove some cruft 2017-06-05 15:52:47 -07:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors 
Fix generateBasisVectors() helper
 2017-06-05 14:47:18 -07:00
Brad Hefta-Gaub
51e00b9de9 Merge pull request #10614 from samcake/brown 
Introduce a stencil mask pass in the rendering to optimize HMD
 2017-06-05 14:14:11 -07:00
Liv
6cecac36d5 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 12:23:23 -07:00
Andrew Meadows
793ed1313d change variable name for more readable code 2017-06-05 10:30:52 -07:00
Chris Collins
6cc6cd3bf6 Merge pull request #10604 from highfidelity/RC-42 
Beta Release 42 - Includes up to Developer Release 6626
 2017-06-05 09:13:19 -07:00
Andrew Meadows
6970576bb8 use helper constants in helper code 2017-06-05 08:54:05 -07:00
Andrew Meadows
205e5d7309 add unit tests and fix final bugs 2017-06-05 08:54:05 -07:00
Andrew Meadows
506f522802 use correct format for float literals 2017-06-05 08:54:05 -07:00