Atlante45
|
3110dd72bf
|
More ktx work
|
2017-06-16 14:31:56 -07:00 |
|
Atlante45
|
35a0c41cf5
|
Move Ktx processing to thread pool.
|
2017-06-16 14:31:56 -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 |
|
NeetBhagat
|
2909aa9ac8
|
Resolve comments of @zappoman.
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
|
2017-06-17 01:00:32 +05:30 |
|
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 |
|
Brad Davis
|
fece438602
|
Cleanup and refactoring
|
2017-06-15 18:58:56 -07:00 |
|
Clément Brisset
|
f450e70f1e
|
Merge pull request #10717 from birarda/feat/replicants
fix race for isUpstream and node hole punch
|
2017-06-15 17:39:12 -07:00 |
|
Stephen Birarda
|
c332244f4f
|
fix race for isUpstream and node hole punch
|
2017-06-15 17:34:20 -07:00 |
|
Clément Brisset
|
062713de8a
|
Merge pull request #10716 from birarda/feat/replicants
fix for table additions when there is no initial row
|
2017-06-15 17:22:06 -07:00 |
|
Stephen Birarda
|
36b4990114
|
fix for table additions when there is no initial row
|
2017-06-15 17:19:05 -07:00 |
|
Dante Ruiz
|
07102cc98d
|
improving the ui
|
2017-06-16 00:25:27 +01: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 |
|
Clément Brisset
|
cf4bc34572
|
Merge pull request #10712 from birarda/feat/replicants
merge upstream/master into upstream/replicants
|
2017-06-15 15:47:12 -07:00 |
|
Stephen Birarda
|
e6ef153148
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants
|
2017-06-15 15:43:13 -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 |
|
Clément Brisset
|
8c0bb4140e
|
Merge pull request #10709 from birarda/feat/downstream-in-nodelist
send downstream nodes in domain list, fix identity packet bug
|
2017-06-15 15:32:26 -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 |
|
Stephen Birarda
|
d7724b90af
|
address code review comments
|
2017-06-15 15:01:03 -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 |
|
Stephen Birarda
|
0565cfa2b7
|
fix for array additions in DS settings
|
2017-06-15 14:59:12 -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 |
|
Stephen Birarda
|
ea6a38148c
|
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
|
2017-06-15 14:30:08 -07:00 |
|
Ryan Huffman
|
36381aa584
|
Merge pull request #10707 from birarda/feat/replication-to-broadcast
nomenclature changes from replication to broadcast
|
2017-06-15 14:27:31 -07:00 |
|
Ryan Huffman
|
330a27b3a0
|
Fix removing all downstream nodes in settings not killing nodes
|
2017-06-15 14:27:01 -07:00 |
|
Stephen Birarda
|
8f154321a4
|
never process null avatar ID in avatar manager
|
2017-06-15 14:25:10 -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 |
|
Stephen Birarda
|
6cf4ff1daf
|
remove debug and fix peek of session ID
|
2017-06-15 13:44:44 -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 |
|
Stephen Birarda
|
94abfc2d6b
|
nomenclature changes from replication to broadcast
|
2017-06-15 11:47:13 -07: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 |
|