Stephen Birarda
|
916f57772b
|
default the UAL off for all targets, enable manually for Interface
|
2017-07-06 10:21:07 -07:00 |
|
David Kelly
|
01155ba4e3
|
this handles redirecting ktx_cache, data8, prepared
|
2017-06-27 08:47:54 -07:00 |
|
David Kelly
|
564d935065
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/cacheSwitch
|
2017-06-26 13:32:02 -07:00 |
|
Ryan Huffman
|
209a4f33b5
|
Merge pull request #10784 from huffman/feat/pal-replicated
Disable silence + ban buttons for replicated users
|
2017-06-26 12:50:23 -07:00 |
|
Brad Hefta-Gaub
|
a32f7b2395
|
Merge pull request #10743 from humbletim/21383
CR 21383: Integrate attachments into doppleganger mirror
|
2017-06-26 09:54:04 -07:00 |
|
Brad Hefta-Gaub
|
6314a8d273
|
Merge pull request #10782 from vladest/fix_browse_black
Make background with default color. Fix few warnings
|
2017-06-26 09:50:09 -07:00 |
|
Seth Alves
|
2f2a13ec27
|
Merge pull request #10799 from jherico/object_parent_warnings
Fix warnings about creating QObjects with parents in different thread
|
2017-06-26 09:39:29 -07:00 |
|
Seth Alves
|
9ae390853c
|
Merge pull request #10814 from jherico/linux_fix_static_plugins
Fix static plugin initialization on Linux
|
2017-06-25 08:17:16 -07:00 |
|
anshuman64
|
8d5bdd2d84
|
Merge pull request #10730 from hyperlogic/feature/pole-vector
Pole vector support for elbow and knee joints
|
2017-06-24 23:08:22 -07:00 |
|
Bradley Austin Davis
|
960017ddd7
|
Fix static plugin initialization on Linux
|
2017-06-24 22:22:47 -07:00 |
|
Brad Davis
|
9c99b9d4c5
|
Merge pull request #10783 from sethalves/fix-linux-asan
Fix linux asan
|
2017-06-23 22:43:24 -07:00 |
|
Seth Alves
|
43ba5f3772
|
Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward
Fix for eye direction when no look at targets are present.
|
2017-06-23 14:32:21 -07:00 |
|
Ryan Huffman
|
b56cfa56c7
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
|
2017-06-23 14:23:20 -07:00 |
|
Brad Davis
|
f1fe4ed7cc
|
Merge pull request #10804 from jherico/fix_deps_3
Remove dependency between codec plugins and UI
|
2017-06-23 12:51:35 -07:00 |
|
Brad Hefta-Gaub
|
dc649e84df
|
Merge pull request #10792 from jherico/qml_crashes
Trying to fix QtQml/QtScript crashes
|
2017-06-23 12:41:43 -07:00 |
|
Brad Davis
|
fe7d4b1d23
|
Remove dependency between codec plugins and UI
|
2017-06-23 12:25:18 -07:00 |
|
David Kelly
|
bda50af780
|
this uses qt's test location for AppData/Local, but leaves Roaming alone
|
2017-06-23 11:06:48 -07:00 |
|
Anthony J. Thibault
|
8f89ef0931
|
Fix for eye direction when no look at targets are present.
|
2017-06-23 10:52:23 -07:00 |
|
Brad Davis
|
416852c0cd
|
Fix warnings about creating QObjects with parents in different thread
|
2017-06-23 10:19:16 -07:00 |
|
Seth Alves
|
5e2aeb96d3
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
|
2017-06-23 10:18:33 -07:00 |
|
David Kelly
|
04160f2ca1
|
switch to change ktx_cache directory (only)
|
2017-06-23 09:19:41 -07:00 |
|
David Kelly
|
63279f4525
|
Merge pull request #10790 from davidkelly/dk/scriptsSwitch
Command line switch to override default scripts location
|
2017-06-23 08:53:40 -07:00 |
|
Seth Alves
|
5af07dfb62
|
more memory-debugger
|
2017-06-23 08:16:48 -07:00 |
|
druiz17
|
91ce9235ea
|
Merge pull request #10747 from zzmp/audio/select-log
Log audio selections
|
2017-06-23 07:54:03 -07:00 |
|
Zach Pomerantz
|
a82cc0ec09
|
retab
|
2017-06-23 09:35:48 -04:00 |
|
Brad Davis
|
d50c448151
|
Fix heap corruption coming out of running scripts dialog
|
2017-06-22 19:15:58 -07:00 |
|
Brad Davis
|
4439de240a
|
Trying to fix QtQml/QtScript crashes
|
2017-06-22 16:39:57 -07:00 |
|
David Kelly
|
06d1ac8bf7
|
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
|
2017-06-22 14:14:54 -07:00 |
|
David Kelly
|
ff5b37c785
|
new --scripts switch overrides default scripts location
|
2017-06-22 14:09:05 -07:00 |
|
Seth Alves
|
d290f03edb
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
|
2017-06-22 13:53:23 -07:00 |
|
Andrew Meadows
|
62e862fef0
|
Merge pull request #10733 from Menithal/21384
21384: Added Support to Disabling flight from client side
|
2017-06-22 13:38:01 -07:00 |
|
Anthony J. Thibault
|
79d9bbe6c5
|
Merge branch 'master' into feature/pole-vector
|
2017-06-22 13:37:55 -07:00 |
|
Seth Alves
|
517bf0af0f
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
|
2017-06-22 10:07:44 -07:00 |
|
Seth Alves
|
7ff576ef18
|
add memory-debugging macro to some cmake files
|
2017-06-22 10:07:39 -07:00 |
|
Vladyslav Stelmakhovskyi
|
30714d5d25
|
Make background with default color. Fix few warnings
|
2017-06-22 16:47:40 +02:00 |
|
David Kelly
|
34edd95926
|
Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch
new switches to override avatarURL
|
2017-06-22 07:11:29 -07:00 |
|
David Kelly
|
5da01f0074
|
updated comments
|
2017-06-22 07:09:24 -07:00 |
|
Seth Alves
|
c70365d04a
|
Merge pull request #10729 from druiz17/hand-pucks
Hand pucks and Calibration UI
|
2017-06-21 18:10:15 -07:00 |
|
Howard Stearns
|
ea5b074f6e
|
Merge pull request #10758 from howard-stearns/event-installer-interface-options
Event installer interface options
|
2017-06-21 16:46:06 -07:00 |
|
David Kelly
|
92cbb86e8b
|
remove debugging
|
2017-06-21 16:09:08 -07:00 |
|
David Kelly
|
94a33fea94
|
new switches to override avatarURL
|
2017-06-21 16:03:05 -07:00 |
|
Anthony J. Thibault
|
2dcca2125b
|
Merge branch 'master' into feature/pole-vector
|
2017-06-21 15:50:03 -07:00 |
|
Dante Ruiz
|
c4699e00ca
|
added hand offsets
|
2017-06-21 23:10:08 +01:00 |
|
Chris Collins
|
f3ae1d8078
|
Merge pull request #10750 from Atlante45/master
Stable -> Master
|
2017-06-21 13:34:28 -07:00 |
|
Brad Hefta-Gaub
|
88a4f5c576
|
Merge pull request #10766 from humbletim/sort-running-scripts
Sort Running Scripts... list alphabetically
|
2017-06-21 13:08:47 -07:00 |
|
Anthony Thibault
|
a12109ed26
|
Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes
Bug Fixes for Eyeless Avatars
|
2017-06-21 10:59:55 -07:00 |
|
Brad Hefta-Gaub
|
f7d42c782d
|
Merge pull request #10764 from thoys/feat/ac-location-jsapi
Expose location scripting interface to Agent (AC script)
|
2017-06-21 10:22:48 -07:00 |
|
Ryan Huffman
|
0e7ddfd29f
|
Disable silence/ban buttons in PAL if avatar is replicated
|
2017-06-21 09:49:16 -07:00 |
|
Dante Ruiz
|
729065749f
|
fixed merge conficts
|
2017-06-21 16:59:53 +01:00 |
|
Thijs Wenker
|
47643e1efe
|
Expose location API to Agent scripts (side-effect, agents now can teleport)
|
2017-06-21 06:31:36 +02:00 |
|