Zach Fox
1afa2d3775
Spectator camera icon
2017-07-06 16:24:50 -07:00
Zach Fox
39bdc20b4f
On checkbox language change
2017-07-05 16:13:36 -07:00
Zach Fox
f6583a1b87
Use correct text color for checkboxes
2017-07-05 14:46:59 -07:00
Zach Fox
0af53bb4a5
Instructions and cool static :)
2017-07-05 14:46:59 -07:00
Zach Fox
aea5779ed6
When a display texture isn't set, show preview instructions
2017-07-05 14:46:58 -07:00
Zach Fox
44cb48b17d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-05 09:59:57 -07:00
David Kelly
373bd0cc8a
aspect ratio preserved upon blitting, minor qml tweak, warnings fixed
2017-07-03 14:23:23 -07:00
David Kelly
5f015ec77f
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:25 -07:00
Zach Fox
9411c2e732
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-03 10:24:02 -07:00
Dante Ruiz
063984f573
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
2017-07-03 16:44:47 +01:00
David Kelly
073eae39b2
timer now resumes when visible again
2017-06-30 18:44:32 -07:00
Brad Davis
31d2c9980e
Merge pull request #10797 from ctrlaltdavid/21396
...
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
David Kelly
09d959bdeb
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-30 14:16:01 -07:00
Zach Fox
e66b4f1761
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-30 10:12:24 -07:00
Seth Alves
c4667aa1a7
Merge pull request #10839 from vladest/file_dialog_crash_qt59
...
File dialog crash qt59
2017-06-29 10:34:26 -07:00
Dante Ruiz
a7e4dc1473
clean up code
2017-06-28 23:51:00 +01:00
howard-stearns
3293b4c898
Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm
2017-06-28 13:53:32 -07:00
Dante Ruiz
a2df2f8472
added user activity status
2017-06-28 19:52:19 +01:00
David Kelly
b73102d063
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-28 08:57:04 -07:00
Andrew Meadows
1e23fa7baa
Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle
...
Eliminated toe wiggle while pucks are enabled.
2017-06-28 08:30:27 -07:00
Vladyslav Stelmakhovskyi
51b44d9021
Implement same for HMD mode
2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi
d3282a4ed0
Cleanup
2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi
0d4328fa51
Merge branch 'master' into file_dialog_crash_qt59
2017-06-28 15:54:53 +02:00
Zach Fox
5d8d2fd83e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-27 16:47:44 -07:00
howard-stearns
07e43eab09
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-27 16:44:39 -07:00
Vladyslav Stelmakhovskyi
241231c00c
file lists works, but not initial yet
2017-06-27 22:14:58 +02:00
Anthony J. Thibault
8602d57a57
Eliminated to wiggle while pucks are enabled.
...
* Added new anim node AnimDefaultPose
* AnimNodeLoader was changed to support the addition of the AnimDefaultPose node
* Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose".
* Rig uses this to fade in default pose for the toes when the hip/feet puck are active.
This effectively deadens the toe animations, without effecting the hand animations.
* Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.
2017-06-26 14:09:10 -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
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12: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
Ryan Huffman
b56cfa56c7
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
2017-06-23 14:23:20 -07:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
Brad Davis
d50c448151
Fix heap corruption coming out of running scripts dialog
2017-06-22 19:15:58 -07:00
Anthony J. Thibault
79d9bbe6c5
Merge branch 'master' into feature/pole-vector
2017-06-22 13:37:55 -07:00
Zach Fox
a1dfbc91da
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-22 10:27:52 -07:00
Zach Fox
a4a4ba817f
Fixup merge - whoops
2017-06-22 10:27:28 -07:00
Vladyslav Stelmakhovskyi
30714d5d25
Make background with default color. Fix few warnings
2017-06-22 16:47:40 +02:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
David Rowe
3bdf267900
Implement fingers control
2017-06-22 23:32:06 +12: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
Zach Fox
af3c249ae5
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-21 17:16:10 -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
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
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
Zach Fox
8dab93e299
Merge pull request #10762 from zzmp/audio/input-select-active-level
...
Add a VU meter to the active mic selection
2017-06-20 18:38:49 -07:00
Dante Ruiz
17832b6022
edited some button behavior
2017-06-21 01:38:05 +01:00
