samcake
ff132fa712
Gathering the diffusion passes in the SUrfaceGEometryPAss job
2016-07-19 02:11:22 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
samcake
a3f6ed6a89
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-15 09:22:34 -07:00
Brad Davis
882139ebcf
Allow scripts to override the navigation focus state set by QML dialogs
2016-07-14 12:10:46 -07:00
samcake
3ab56062d4
Address some warnings and syntax issues
2016-07-14 12:06:02 -07:00
Stephen Birarda
6b6513d5f9
immediately fade out ignored avatars
2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6
add a scripting interface to ignore users
2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
487aacde3c
Merge pull request #8216 from huffman/feat/improved-domain-loading
...
Update max request limit and number of processing threads
2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub
f8910d475e
Merge pull request #8225 from ZappoMan/codecPlugins
...
Audio codec plugins
2016-07-13 14:47:03 -07:00
samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -07:00
Ryan Huffman
fcd59ea94f
Update target number of processing threads to be based on system
2016-07-12 17:44:23 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
samcake
5d4b55eeea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-12 09:19:28 -07:00
samcake
ba7590712a
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
2016-07-11 18:33:57 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
Brad Hefta-Gaub
f3f72f3c93
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-11 13:15:27 -07:00
Stephen Birarda
11aafc0f48
use endsWith for scriptURL check
2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6
handle running of non .svo.json JSON files from mp CDN
2016-07-08 15:47:56 -07:00
Ryan Huffman
489d2e4ca5
Update max request limit and number of processing threads
2016-07-08 15:33:11 -07:00
Stephen Birarda
5bce924eda
keep signature for askToLoadScript
2016-07-08 14:34:42 -07:00
Stephen Birarda
216e47b29a
hide the long URL prefix of scripts from marketplace
2016-07-08 09:43:11 -07:00
Brad Hefta-Gaub
9333c7dcca
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-06 13:26:19 -07:00
SamGondelman
04184ee1fb
added snapshot notification in desktop mode
2016-07-05 17:21:57 -07:00
Brad Davis
d6250d4c5a
Fix export entities by region
2016-07-05 10:37:53 -07:00
SamGondelman
218b26b521
removed snapshot share dialog, ctrl s shouldn't leave you moving
2016-07-01 10:58:55 -07:00
SamGondelman
69ffd63ba7
fix snapshot sharing window
2016-06-30 15:42:48 -07:00
Brad Hefta-Gaub
ec0ca1d173
Merge pull request #8146 from huffman/fix/launch-version
...
Add version to launch user activity
2016-06-28 17:13:10 -07:00
Howard Stearns
da61100b6d
Merge pull request #8150 from highfidelity/vive-ui
...
merge vive-ui to master
2016-06-28 13:31:55 -07:00
Ryan Huffman
b36a39b2bc
Add version to launch user activity
2016-06-28 09:59:59 -07:00
Andrew Meadows
58e05b2e90
Merge pull request #8143 from AlexanderOtavka/remove-cam-slots
...
namechange Camera::_rotation --> Camera::_orientation
2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2
Merge pull request #8121 from SamGondelman/miniMirrorFix
...
Mini mirror/multi-monitor bug fixes
2016-06-27 22:04:39 -07:00
Zander Otavka
235ee4bd46
Refactor Camera scripting interface a little
...
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used. get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
2016-06-27 13:06:12 -07:00
Triplelexx
aae3555b63
update TouchscreenDevice
...
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
2016-06-27 21:01:06 +01:00
Brad Davis
f90a351400
Don't reposition windows prior to selecting the initial display plugin
2016-06-24 16:31:24 -07:00
Triplelexx
6542604d13
resolve conflicts with TouchscreenDevice
...
updated to master
2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
d7bffc3eab
first cut at negotiating codecs
2016-06-23 17:14:41 -07:00
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51:15 -07:00
Brad Hefta-Gaub
be37921845
first cut at codec plugins
2016-06-23 10:42:02 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
Ryan Huffman
2621add8e3
Fix nearby_avatars not tracking
2016-06-22 09:17:28 -07:00
SamGondelman
78a1845afe
fixed resizing of qml overlays when device pixel ratio changes
2016-06-21 18:13:11 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
160a5de271
CR feedback
2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
Ryan Huffman
6d753e317b
Fix more osx warning
2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048
Fix osx warning
2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3
Fix osx warning
2016-06-20 16:44:07 -07:00
Ryan Huffman
ab057010d6
Add changed display mode tracking
2016-06-20 16:09:34 -07:00
