David Kelly
|
06b59fe13e
|
still broken, but added initial cut of GLsync stuff
|
2017-06-20 15:02:05 -07:00 |
|
David Kelly
|
b4c75c3f87
|
working, except tablet issue
|
2017-06-19 14:41:42 -07:00 |
|
David Kelly
|
c7e4649ec2
|
add override to avoid warnings in ubuntu/mac
|
2017-06-17 13:15:22 -07:00 |
|
David Kelly
|
6dd1e6e069
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
|
2017-06-16 16:24:30 -07:00 |
|
David Kelly
|
5284b8dc0c
|
fix for upside down preview, for now
|
2017-06-16 15:37:25 -07:00 |
|
David Kelly
|
0f799e52f4
|
blit entire texture. Only issue is that it is upside down
|
2017-06-16 15:30:36 -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 |
|
David Kelly
|
9b5b99c2b9
|
not as buggy. Still need ogl work, major cleanup, etc...
|
2017-06-16 08:59:57 -07:00 |
|
David Kelly
|
6d64261e94
|
working but often the spectator camera texture is not right.
|
2017-06-16 08:40:18 -07: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 |
|
David Kelly
|
f75cbfa087
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
|
2017-06-15 15:45:03 -07: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 |
|
David Kelly
|
3d922f5db6
|
works, sorta, but blinks like crazy, cursor gets f-ed up...
|
2017-06-15 14:17:43 -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 |
|
Zach Fox
|
1088d248e3
|
Howard's CR comments
|
2017-06-15 13:13:58 -07:00 |
|
Zach Fox
|
834a2a5c3b
|
Ensure monitor never shows frozen SpectatorCamera preview
|
2017-06-15 12:49:09 -07:00 |
|
Zach Pomerantz
|
3093a73ce1
|
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
|
2017-06-15 15:04:06 -04:00 |
|
Zach Fox
|
47e5fb56d3
|
Show MyAvatar's head in the SpectatorCamera view!
|
2017-06-15 11:31:20 -07:00 |
|
Brad Hefta-Gaub
|
0597c3105f
|
Merge pull request #10705 from ZappoMan/moreAudioFixes
fix no audio device from previously removed audio device
|
2017-06-15 11:04:14 -07:00 |
|
Zach Fox
|
68662bb209
|
Bugfixes
|
2017-06-15 10:20:17 -07:00 |
|
Zach Fox
|
a795822919
|
Comments and disable camera when switching
|
2017-06-15 10:09:28 -07:00 |
|
Zach Fox
|
498ed4cbe8
|
showSpectatorInDesktop true for now
|
2017-06-15 10:09:28 -07:00 |
|
Zach Fox
|
0114962e75
|
Make the Spectator button only appear in HMD (with debug mode)
|
2017-06-15 10:09:28 -07:00 |
|
Zach Fox
|
60549075dd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-15 10:09:07 -07:00 |
|
Seth Alves
|
023ca85623
|
remove chat from default scripts
|
2017-06-15 09:27:43 -07:00 |
|
ZappoMan
|
d352163d77
|
fix no audio device from previously removed audio device
|
2017-06-15 09:24:14 -07:00 |
|
Brad Hefta-Gaub
|
035a9e898f
|
Merge pull request #10684 from howard-stearns/avatar-whitelist
avatar whitelist
|
2017-06-15 08:45:16 -07:00 |
|
druiz17
|
347f020b04
|
Merge pull request #10692 from jherico/fix_tablet_crash
Fix crash on exit when tablet is open
|
2017-06-15 08:15:02 -07:00 |
|
Brad Hefta-Gaub
|
c807827a36
|
Merge pull request #10693 from seefo/master
Incomplete sandbox content updates are now removed and reperformed
|
2017-06-14 19:32:01 -07:00 |
|
Andrew Meadows
|
9c928f16b2
|
Merge pull request #10632 from Atlante45/fix/node-leak
Fix SharedNodePointer leak
|
2017-06-14 17:03:52 -07:00 |
|
Andrew Meadows
|
becb968a75
|
Merge pull request #10685 from ctrlaltdavid/21327-b
Use HMD roll angle to turn while flying or walking in HMD
|
2017-06-14 16:56:29 -07:00 |
|