Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 00:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49203 commits 76 branches 59 tags 1.2 GiB
Commit graph

49203 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Rowe
4c236b293e First pass at controller interaction with 3D Web overlay 2016-12-09 01:47:40 +13:00
David Rowe
5313a682ad Fix compiler warning 2016-12-08 19:48:51 +13:00
David Rowe
7eacdb69b5 Auto-resize Clara.io models if larger than 10m as likely in cm or mm 2016-12-08 19:17:26 +13:00
David Rowe
639d7a5d97 Add further user feedback on Clara download progress 2016-12-08 18:36:50 +13: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
David Rowe
c4c2a95e83 Add "back" button to marketplaces footer 2016-12-08 10:58:37 +13: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
David Rowe
1de2c14fee Remove e-mail message hyperlink if displaying on tablet 2016-12-07 12:52:53 +13:00
Zach Pomerantz
132e9bd644 add timings to AudioMixer 2016-12-06 23:51:06 +00:00
David Rowe
e821ec5593 Inject navigation footer into Clara account createion page 2016-12-07 12:38:16 +13:00
David Rowe
01226b03ef Improve text and robustness of marketplaces footer 2016-12-07 12:20:43 +13: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
David Rowe
186d3f18ef Improve temporary download directory robustness 2016-12-07 11:55:17 +13:00
David Rowe
eafd51ba9e Merge branch 'master' into 21089 2016-12-07 11:27:15 +13:00
David Rowe
641e47e0c5 Fix build warnings 2016-12-07 10:39:37 +13:00
David Rowe
460d332c6f Delete redundant code 2016-12-07 10:06:32 +13:00
David Rowe
8e30674069 Tidying 2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13: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