Commit graph

48986 commits

Author SHA1 Message Date
Dante Ruiz
f7df9a64b2 remmoved tabs 2016-12-16 18:32:05 +00:00
Dante Ruiz
cb4b2473e1 remmoved tabs as whitespace 2016-12-16 18:30:15 +00:00
Dante Ruiz
a0a8ecc158 even more clean up 2016-12-16 17:28:02 +00:00
Dante Ruiz
f2d9f34993 more clean up 2016-12-16 17:25:38 +00:00
Dante Ruiz
889e9e854c clean up 2016-12-16 17:24:53 +00:00
Dante Ruiz
40a79867be removed unnessary comments 2016-12-16 17:24:09 +00:00
Dante Ruiz
571783b90d fixed home buttons issues 2016-12-16 09:19:22 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Brad Hefta-Gaub
0923a79139 Merge pull request #9187 from PhilipRosedale/rescale
Rescale yourself or entities using the grip buttons
2016-12-15 12:32:04 -08:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils
Change file permissions of source code to remove execute bits
2016-12-15 10:37:36 -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
cbb88601d9 Merge pull request #9215 from hyperlogic/tablet-ui
TabletScriptingInterface and Help button now on tablet.
2016-12-15 07:03:53 -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
Seth Alves
b11bfd405d Merge pull request #9216 from birarda/min-cores-comment
fix a confusing comment about min cores required
2016-12-15 06:55:26 -08:00
Stephen Birarda
4c1f99954b fix confusing MIN_CORES_SPEC comment 2016-12-14 17:49:08 -08:00
Stephen Birarda
6c344b0c75 Merge pull request #9211 from Atlante45/disable_steamworks
Make Steam client calls into a plugin
2016-12-14 17:35:51 -08:00
Anthony J. Thibault
d2c4417b24 Hook up Help button to the new Tablet interface 2016-12-14 17:05:47 -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
Anthony J. Thibault
d4f9d21ce8 Pass tablet QQuickItem to TabletScriptingInterface
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
Philip Rosedale
14c867fdbd Can't resize if objects in both hands, avatar resize is seek + grips 2016-12-14 13:38:37 -08:00
Andrew Meadows
c1e283fa6d Merge pull request #9201 from samcake/red
Fix local light shading tiling issue
2016-12-14 12:25:02 -08:00
Zach Fox
c53111781b Fix the bug 2016-12-14 12:17:00 -08:00
Anthony J. Thibault
db0b2ba7d3 Fleshing out TabletScriptingInterface.
Added TabletProxy and TabletButtonProxy
2016-12-14 12:08:41 -08:00
Anthony J. Thibault
d94da76b72 Added TabletScriptingInterface 2016-12-14 12:08:40 -08:00
Anthony Thibault
9928565ccf Merge pull request #9203 from fayeli/qml-tuesday
Tablet Main Screen UI Prototype
2016-12-14 12:06:57 -08:00
Faye Li Si Fi
a651e19bdd audio gradient bar length as a function of 0 to 1 2016-12-14 11:38:36 -08:00
Stephen Birarda
1829f540cf Merge pull request #9206 from Atlante45/controller-mapping
Fix Oculus Touch flags check
2016-12-14 11:17:03 -08:00
Clément Brisset
1aec8c5a65 Merge pull request #9205 from ZappoMan/avatarMixerTweaks
drop avatar data rate to 45hz & bump default per client bandwidth from mixer
2016-12-13 18:25:35 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
Zach Pomerantz
bbb7229392 skip graphics config if not in engine 2016-12-13 20:47:28 -05:00
Atlante45
07802eb284 Fix Oculus Touch flags check 2016-12-13 17:08:00 -08:00
Brad Hefta-Gaub
92632e72b6 make default avatar mixer send bandwidth 5mbps 2016-12-13 17:04:25 -08:00
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -08:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
Faye Li
53263789a0 fix relative path 2016-12-13 16:04:25 -08:00
Faye Li
5b8e80654d button glow on hover 2016-12-13 16:01:50 -08:00
Faye Li
ad905ac6dc drop shadow on tablet buttons + set text at instantiation 2016-12-13 15:32:21 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin
Kinect Plugin
2016-12-13 15:29:41 -08:00
samcake
d9cb07bf9a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 15:28:33 -08:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
David Kelly
97a5c0ef4b Merge pull request #9200 from zfox23/fix_bubble_audio_bug
Fix audio injector bug after space bubble changes
2016-12-13 14:23:01 -08:00
Zach Fox
2c97d7f9c2 Merge pull request #9199 from jazmincano/jazmin_bubble_improvements
Bubble visualization improvements
2016-12-13 13:21:11 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
Faye Li
8fcc42e537 overriding colors at tablet buttons instantiation 2016-12-13 12:34:38 -08:00
Faye Li
dc72a0fd2f tablet mic mute and unmute icons 2016-12-13 12:18:19 -08:00
Jazmin
b7b4c685e7 Fixed typo 2016-12-13 11:48:06 -08:00