Brad Hefta-Gaub
8497ad1e29
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-15 16:42:41 -08:00
Brad Hefta-Gaub
ed19b4b592
remove compression at the per avatar data buffer for now, since it gave no benefit
2016-12-15 14:13:38 -08:00
Howard Stearns
ba8b585368
Merge pull request #9202 from howard-stearns/pal-proto
...
People Action List prototype
2016-12-15 13:56:12 -08:00
samcake
7a29dbe7d4
Merge pull request #9207 from zzmp/feat/render-forward-empty
...
Forward render task (empty and only used with RENDER_FORWARD set)
2016-12-15 09:57:18 -08:00
Seth Alves
4494edae33
Merge pull request #9210 from zfox23/FB_2591
...
FB 2591: Taking simultaneous GIF snapshots crashes Interface
2016-12-15 07:01:58 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
howard-stearns
ae4064f445
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-14 17:04:52 -08:00
Atlante45
588fdd6efa
Add steamworks to interface externals
2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072
CR - CLI text
2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03
Make Steamworks a plugin
2016-12-14 15:37:49 -08:00
Zach Fox
c53111781b
Fix the bug
2016-12-14 12:17:00 -08:00
Brad Hefta-Gaub
2290179281
add compression and minimal data flags to AvatarData
2016-12-14 11:47:45 -08:00
Brad Hefta-Gaub
a7750501c6
first cut at adding view frustum support to avatar mixer
2016-12-13 18:58:11 -08:00
Zach Pomerantz
bbb7229392
skip graphics config if not in engine
2016-12-13 20:47:28 -05:00
howard-stearns
4503855ae8
don't keep selection while things are disappearing
2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa
fix broken search for myself
2016-12-13 16:52:18 -08:00
Brad Hefta-Gaub
e3bc49c302
drop avatar data rate to 45hz
2016-12-13 16:51:59 -08:00
howard-stearns
773bbc4ef1
update canKick whenever we get new data, instead of just at first use.
2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19
missing the ban button
2016-12-13 16:23:43 -08:00
Zach Pomerantz
bc59be12ef
create flagged forward render task
2016-12-13 19:19:30 -05:00
howard-stearns
03d3e0b550
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 16:03:00 -08:00
Brad Hefta-Gaub
a2ba03284e
Merge pull request #9186 from ZappoMan/kinectPlugin
...
Kinect Plugin
2016-12-13 15:29:41 -08:00
howard-stearns
b0a69468d2
Don't show admin columns if you can't kick.
2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a
no debug printing
2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521
checkpoint
2016-12-13 15:05:08 -08:00
howard-stearns
86010af828
checkpoint
2016-12-13 13:01:45 -08:00
howard-stearns
6fc27ac8d6
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 09:39:51 -08:00
Howard Stearns
7c92ad5ced
checkpoint
2016-12-13 09:15:28 -08:00
Stephen Birarda
b4f43e01b1
Merge pull request #9189 from huffman/feat/help-touch
...
Add support for oculus touch in help menu
2016-12-12 16:48:00 -08:00
Ryan Huffman
7c441ac3ee
Remove advanced controls from oculus help image
2016-12-12 16:45:52 -08:00
howard-stearns
712543a39a
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55
pal prototype
2016-12-12 16:37:16 -08:00
samcake
9155f11b3d
Merge pull request #9190 from jherico/test_mode
...
Add test mode to interface
2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef
Add test mode to interface
2016-12-12 14:51:11 -08:00
Ryan Huffman
3e5d67f28b
Update oculus help image to swap menu buttons
2016-12-12 14:23:29 -08:00
Ryan Huffman
47c2af975b
Remove extraneous logging from help.html
2016-12-12 14:22:59 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Ryan Huffman
9f166d82ce
Add support for oculus touch in help menu
2016-12-12 13:44:09 -08:00
Clément Brisset
84bf93b0fc
Merge pull request #9154 from highfidelity/revert-9144-revert-9129-audio-dll
...
Restores "Select Audio DLL at runtime"
2016-12-12 13:38:34 -08:00
Stephen Birarda
dddb4c5412
Merge pull request #9175 from birarda/signup-from-interface
...
add account sign up to Interface
2016-12-12 13:21:21 -08:00
Stephen Birarda
5111256a9e
resize the sign up dialog when showing errors
2016-12-12 13:04:14 -08:00
Stephen Birarda
a0663bdf31
fix resizing of LoginDialog and friends
2016-12-12 11:32:19 -08:00
Brad Hefta-Gaub
b57c1fe198
remove debug spam
2016-12-12 08:48:24 -08:00
Stephen Birarda
e4810a5643
Merge pull request #9179 from Atlante45/controller-mapping
...
Update Xbox controller mapping to have the menu on Start
2016-12-09 17:13:45 -08:00
Stephen Birarda
691ce4312e
fix resizing for keyboard changes in body loaded qml
2016-12-09 16:49:53 -08:00
Atlante45
5def039bd4
Swap start/back xbox controller mapping to conform to Oculus standard
2016-12-09 16:41:42 -08:00
Stephen Birarda
f0f10d837c
fix indents, fix resize for keyboard changes
2016-12-09 16:04:42 -08:00
Chris Collins
c912d77a95
Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit
...
Honor reorient and quit request from OVR
2016-12-09 16:03:41 -08:00
Brad Hefta-Gaub
b6838c6ec4
more debugging
2016-12-08 23:32:03 -08:00
Brad Hefta-Gaub
4959a88581
first cut at kinect input plugin
2016-12-08 22:13:56 -08:00