Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 21:54:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49047 commits 75 branches 59 tags 1.2 GiB
Commit graph

49047 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faye Li Si Fi
52b54dbf0c Merge remote-tracking branch 'refs/remotes/highfidelity/master' 2016-12-08 15:10:57 -08:00
samcake
d851278acd FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4 2016-12-08 15:04:57 -08:00
Stephen Birarda
556ccb90f7 make a SignUpBody loaded by LoginDialog 2016-12-08 14:35:41 -08:00
samcake
8df1ffd38f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-08 14:17:29 -08:00
Atlante45
5f2c77928a Restore "Updated the Qt audio plugins"" 
This reverts commit f7e8d47426.
 2016-12-08 14:14:48 -08:00
Clément Brisset
06331494af Revert "Revert "Select Audio DLL at runtime"" 2016-12-08 14:14:03 -08:00
Clément Brisset
e539840439 Merge pull request #9165 from highfidelity/stable 
Merge Stable back into Master
 2016-12-08 14:12:14 -08:00
Brad Hefta-Gaub
6edd3a9338 Merge pull request #9168 from jherico/cpu_opt_aabb 
Optimized method for transforming axis aligned bounding boxes
 2016-12-08 13:45:16 -08:00
Faye Li Si Fi
1644c2eeb4 added unit test 2016-12-08 11:17:38 -08:00
Zach Pomerantz
5969c1eb06 ensure all accesses of audio pool num are guarded 2016-12-08 14:12:16 -05:00
Zach Pomerantz
eafbeb6d44 Revert "avoid pessimizing audio slave lock contention" 
This reverts commit 3508e71753.
 2016-12-08 14:10:00 -05:00
Bradley Austin Davis
3fcd45a236 Optimized method for transforming axis aligned bounding boxes 2016-12-08 10:59:14 -08:00
Faye Li Si Fi
9289dd36d4 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-08 10:50:00 -08:00
Zach Pomerantz
3508e71753 avoid pessimizing audio slave lock contention 2016-12-08 01:53:25 +00:00
Zach Pomerantz
6e0ad5a7ed initialize audio threads 2016-12-08 01:52:58 +00:00
Atlante45
7b0b777051 Honor reorient and quit request from OVR 2016-12-07 17:29:54 -08:00
Stephen Birarda
801a384607 a simple signup dialog copied from login dialog 2016-12-07 16:14:20 -08:00
Faye Li Si Fi
1fde68c86e better code style 2016-12-07 16:10:03 -08:00
Zach Pomerantz
f5b4fac46d set default audio threads to 1 2016-12-07 18:47:33 -05:00
Zach Pomerantz
ce9346f524 fix thread cleanup of audio pool 2016-12-07 18:43:02 -05:00
Faye Li Si Fi
b6798adb5c yay 2016-12-07 15:40:37 -08:00
Faye Li Si Fi
0556661d13 getting rid of uneccessary flag, fix formatting, and getting it to work yay 2016-12-07 15:40:21 -08:00
samcake
3ae06847c4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-07 14:55:26 -08:00
Chris Collins
2601dd3da7 Merge pull request #9160 from highfidelity/RC-29 
Beta Release 29 - Includes up to Developer Release 5770
 2016-12-07 12:51:19 -08:00
Faye Li Si Fi
0fcb8803b6 attempt to expose last edited property to script 2016-12-07 12:27:31 -08:00
Faye Li Si Fi
fc393262c9 Merge remote-tracking branch 'refs/remotes/highfidelity/master' 2016-12-07 12:24:37 -08:00
Chris Collins
f7e8d47426 Revert "Updated the Qt audio plugins" 
This reverts commit b888ce890c.
 2016-12-07 12:21:13 -08:00
Zach Pomerantz
d2ed3caf02 respect audio thread pool size setting 2016-12-07 13:40:22 -05:00
Ken Cooke
e4b5c14ea3 PR feedback 2016-12-07 10:15:55 -08:00
Bradley Austin Davis
87dd8a46f8 Preserve and restore the GL context when resizing QML surfaces 2016-12-07 09:19:50 -08:00
Chris Collins
bc9f2b4007 Merge pull request #9163 from jherico/gl_context_preservation 
Preserve and restore the GL context when resizing QML surfaces
 2016-12-07 09:08:36 -08:00
Ken Cooke
0f10975a59 Robust WAV parser. 
Skips extraneous chunks, handles WAVE_FORMAT_EXTENSIBLE, supports arbitrary sample rates.
 2016-12-07 08:44:10 -08:00
Bradley Austin Davis
5c3480e2a2 Preserve and restore the GL context when resizing QML surfaces 2016-12-07 05:02:45 -08:00
Zach Pomerantz
c4e435a166 simplify locks in AudioMixerSlavePool 2016-12-07 01:17:34 +00:00
Howard Stearns
2eb8d9d0c4 Merge pull request #9153 from davidkelly/dk/machineFingerprint 
Machine fingerprint
 2016-12-06 16:34:45 -08:00
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
Zach Pomerantz
28960681d9 limit audio pool to sane thread count 2016-12-06 23:57:38 +00:00
Zach Pomerantz
259775e163 clarify lock requirement in audio slave pool 2016-12-06 23:56:11 +00:00
Zach Pomerantz
2fc904b990 fix typos 2016-12-06 23:54:13 +00:00
Zach Pomerantz
557ab43f0f add a timeout for errant audio slave threads 2016-12-06 23:53:16 +00:00
Zach Pomerantz
132e9bd644 add timings to AudioMixer 2016-12-06 23:51:06 +00:00
David Kelly
562cd12bca More CR feedback 
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things.  So, no more namespace, back to a class with
2 static functions, one public one private
 2016-12-06 15:17:47 -08:00
Zach Pomerantz
2a6e46aa0c rm static buffer from AudioMixerSlave 2016-12-06 20:15:39 +00:00
Chris Collins
e7ca61480e Merge pull request #9159 from howard-stearns/mic-icon-swap-2 
new mic toolbar button art
 2016-12-06 11:23:07 -08:00
David Kelly
dc47c5fc0c CR feedback 
lame mistake - it is always the error branches that get you.
 2016-12-06 11:12:50 -08:00
howard-stearns
3ba5e1ed4a new mic toolbar button art 2016-12-06 10:52:40 -08:00
Seth Alves
a04b486dfc Merge pull request #9123 from druiz17/touchBug 
fixed context menu showing up in the correct location with oculus touch
 2016-12-06 10:34:00 -08:00
Brad Hefta-Gaub
b97012fc97 Merge pull request #9137 from jherico/msvc2015 
Fixes for building on MSVC 2015 / Qt 5.8
 2016-12-06 10:25:16 -08:00
Brad Hefta-Gaub
9e0ee9c894 Merge pull request #9158 from jherico/xbox_deadzone 
Add dead zone to yaw controls
 2016-12-06 10:24:13 -08:00
Ken Cooke
9831d874b5 Remove debugging code 2016-12-06 10:22:58 -08:00