Zach Fox
|
e9ba223c09
|
Uncheck 'disable preview' when opening Spectator app
|
2017-06-19 13:40:50 -07:00 |
|
Zach Fox
|
d0b68b8c32
|
First steps - also make letterbox closable only when clicking on gray
|
2017-06-19 11:46:56 -07:00 |
|
Zach Fox
|
08eb07242d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-19 10:31:31 -07:00 |
|
Brad Davis
|
7b2369976a
|
Merge pull request #10736 from sethalves/fix-ubuntu-quazip-build
build quazip with c++11
|
2017-06-18 16:51:40 -07:00 |
|
Ryan Huffman
|
fefedd63e4
|
Merge pull request #10728 from thoys/cooking/bake-shortBow
bake shortbow
|
2017-06-18 16:39:33 -07:00 |
|
Seth Alves
|
ec1187991d
|
Merge pull request #10734 from vladest/fix_tablet_buttons_qt59
Fix tablet buttons qt59
|
2017-06-18 13:48:26 -07:00 |
|
Seth Alves
|
f42146c139
|
dry up quazip cmake
|
2017-06-18 13:24:24 -07:00 |
|
Vladyslav Stelmakhovskyi
|
59a77c16bd
|
Cleanup
|
2017-06-18 20:59:22 +02:00 |
|
Seth Alves
|
a1571608db
|
try some more
|
2017-06-18 11:48:11 -07:00 |
|
Seth Alves
|
242d615b50
|
sigh
|
2017-06-18 11:16:36 -07:00 |
|
Seth Alves
|
fd137e1a84
|
build quazip with c++11
|
2017-06-18 10:22:50 -07:00 |
|
Vladyslav Stelmakhovskyi
|
f34faa3ee7
|
Fix backward compatibility with Qt 5.6
|
2017-06-18 10:54:59 +02:00 |
|
Clément Brisset
|
3262e10d76
|
Merge pull request #10727 from jherico/file_cache_locking
Prevent deadlocks from different locking orders in FileCache
|
2017-06-17 15:13:47 -07:00 |
|
Vladyslav Stelmakhovskyi
|
a1475bc65f
|
Forgot if statement
|
2017-06-17 23:02:52 +02:00 |
|
Vladyslav Stelmakhovskyi
|
b8bb8026ca
|
Merge branch 'master' into fix_tablet_buttons_qt59
|
2017-06-17 22:30:00 +02:00 |
|
Vladyslav Stelmakhovskyi
|
5a0783c38c
|
Send mouse events before touch event. It seems the order is important for Qt 5.9
|
2017-06-17 22:24:27 +02:00 |
|
Brad Davis
|
1632e3b35a
|
PR feedback
|
2017-06-16 20:04:23 -07:00 |
|
Howard Stearns
|
532df863b9
|
Merge pull request #10726 from zfox23/PAL_FixGoToUser
Fix teleporting to another user from the PAL
|
2017-06-16 18:08:11 -07:00 |
|
Brad Davis
|
0af6b3b749
|
Merge pull request #10719 from ctrlaltdavid/21397
Ensure desktop dialogs' title bars are visible
|
2017-06-16 17:35:18 -07:00 |
|
Thijs Wenker
|
57692051c0
|
bake shortbow
|
2017-06-17 01:56:38 +02:00 |
|
Zach Fox
|
6230dcf93d
|
Thanks to Thoys!
|
2017-06-16 16:34:35 -07:00 |
|
Zach Fox
|
74fde8efd7
|
Revert "Fix teleporting to another user from the PAL"
This reverts commit 6b659101d5.
|
2017-06-16 15:33:47 -07:00 |
|
Brad Davis
|
a675dfe7d2
|
Prevent deadlocks from different locking orders in FileCache
|
2017-06-16 15:30:50 -07:00 |
|
Zach Fox
|
6b659101d5
|
Fix teleporting to another user from the PAL
|
2017-06-16 15:09:13 -07:00 |
|
Stephen Birarda
|
39e8510ccb
|
Merge pull request #10720 from seefo/fb5386
Fixed a bug where you could not print polaroids if you took a gif
|
2017-06-16 15:03:45 -07:00 |
|
Zach Fox
|
7a76c9cf7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-16 14:59:23 -07:00 |
|
Chris Collins
|
a0cd210b60
|
Merge pull request #10724 from Atlante45/master
Stable -> Master
|
2017-06-16 13:48:37 -07:00 |
|
Atlante45
|
69a5444993
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-06-16 13:43:41 -07:00 |
|
Zach Fox
|
54bf0c64a7
|
Merge pull request #10715 from zfox23/spectatorCamera_buttonMapping
Spectator Camera controller button mapping + QML Language Fix
|
2017-06-16 10:33:17 -07:00 |
|
Chris Collins
|
f160034bf0
|
Merge pull request #10681 from zzmp/audio/parity
Revamp audio device selection
|
2017-06-16 10:31:55 -07:00 |
|
Zach Fox
|
378d8e80cf
|
Remove random component of button mapping name
|
2017-06-16 10:08:58 -07:00 |
|
Zach Fox
|
e2c6993ae9
|
Fix bug found by Cain with his patch - thank you!
|
2017-06-16 10:08:58 -07:00 |
|
Zach Fox
|
749dede8b3
|
Start with empty string for checkbox
|
2017-06-16 10:08:58 -07:00 |
|
Zach Fox
|
3df414df36
|
Bugfixes and language changes
|
2017-06-16 10:08:58 -07:00 |
|
Zach Fox
|
65b910bcf6
|
Support Vive
|
2017-06-16 10:08:58 -07:00 |
|
Zach Fox
|
8cf9c8708d
|
Allow user to click left thumbstick to switch 'MONITOR SHOWS'
|
2017-06-16 10:08:58 -07:00 |
|
Zach Fox
|
416ebaa2e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-16 10:08:10 -07:00 |
|
seefo
|
a4d008eec9
|
Fixed a bug where you could not print polaroids if you took a gif
|
2017-06-16 08:57:27 -07:00 |
|
David Rowe
|
3cee2b3764
|
Ensure desktop dialogs' title bars are visible
|
2017-06-16 20:10:24 +12:00 |
|
Thijs Wenker
|
87a6b16d16
|
Merge pull request #10713 from huffman/feat/remove-tutorial
Remove /tutorial in favor of new repo
|
2017-06-16 01:18:40 +02:00 |
|
Stephen Birarda
|
c7e37a09fb
|
Merge pull request #10710 from seefo/fb5376
Fixed a bug where custom port wasn't used in AC when passed through CLI
|
2017-06-15 15:38:11 -07:00 |
|
Zach Fox
|
130d98fcfc
|
Merge pull request #10708 from zfox23/spectatorCamera_fixMonitorDisplay
Ensure monitor never shows frozen SpectatorCamera preview
|
2017-06-15 15:35:31 -07:00 |
|
Zach Pomerantz
|
eb4255e1ac
|
fix audio checkbox bindings
|
2017-06-15 18:21:23 -04:00 |
|
Ryan Huffman
|
154b33bddb
|
Remove /tutorial in favor of new repo
Tutorial code has been moved to a new hifi-tutorial repo
|
2017-06-15 15:17:45 -07:00 |
|
seefo
|
6d480600d8
|
Fixed a bug where custom port wasn't used in AC when passed through CLI
|
2017-06-15 14:59:36 -07:00 |
|
Chris Collins
|
a1933b535d
|
Merge pull request #10704 from sethalves/remove-chat-from-default-scripts
remove chat from default scripts
|
2017-06-15 14:44:47 -07:00 |
|
Zach Fox
|
eef4c9d747
|
Merge pull request #10706 from zfox23/spectatorCamera_cauterizedFix
Show MyAvatar's head in the SpectatorCamera view!
|
2017-06-15 13:49:13 -07:00 |
|
Zach Fox
|
d7a9354b37
|
More CR comments; rename function
|
2017-06-15 13:25:16 -07:00 |
|
Zach Fox
|
70569021a8
|
Merge pull request #10697 from zfox23/spectatorCamera_HMDOnly
Make the Spectator button only appear in HMD (also add a debug mode for devs)
|
2017-06-15 13:20:56 -07:00 |
|
Andrew Meadows
|
5e0be1a823
|
Merge pull request #10662 from ctrlaltdavid/21394
Smoothly ease hands from uncontrolled to controlled positions
|
2017-06-15 13:17:26 -07:00 |
|