Andrzej Kapolka
0386dec2a6
Provide option to align wrists with forearms.
2014-04-23 12:09:54 -07:00
Andrzej Kapolka
c471a55f1f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-23 09:40:51 -07:00
Philip Rosedale
ee929f2551
Merge pull request #2712 from matsukaze/master
...
Job #19574 . Add new audio oscilloscope.
2014-04-22 20:22:57 -07:00
matsukaze
ff7a1bd60f
Job #19574 . Add audio oscilloscope.'
2014-04-22 06:53:59 -04:00
Thijs Wenker
23068b0356
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e
- few Adjustments in Application class for Script editor
...
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
2014-04-21 05:25:28 +02:00
Atlante45
05545b684d
Made glowing when speaking an option
2014-04-18 17:47:21 -07:00
Andrzej Kapolka
30248747d6
Provide a means of visualizing the joint constraints.
2014-04-18 14:26:34 -07:00
Thijs Wenker
d2d3937e08
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-18 20:58:36 +02:00
ZappoMan
fa787adce2
added wet/dry mix, and alternate distance attenuation features
2014-04-18 08:55:32 -07:00
Thijs Wenker
b2e969d1c5
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-17 13:03:44 +02:00
ZappoMan
4c6471caa4
fix typo
2014-04-16 16:43:01 -07:00
ZappoMan
836913f1f0
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-16 15:21:15 -07:00
Thijs Wenker
154176402e
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-16 23:41:58 +02:00
Thijs Wenker
0b644b5738
ctrl+shift+s to open the script editor
2014-04-16 22:58:44 +02:00
AndrewMeadows
7dc8f2ae3c
Merge pull request #2657 from ey6es/master
...
Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624 .
2014-04-16 12:59:47 -07:00
Thijs Wenker
8e6130091d
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-16 11:28:46 +02:00
Stojce Slavkovski
c67e42be5e
Moved function into .cpp
2014-04-16 07:46:15 +02:00
ZappoMan
bdf39186de
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-15 21:04:15 -07:00
ZappoMan
a46d3fd254
first cut at local audio spatialization working
2014-04-15 19:57:37 -07:00
ZappoMan
74828a3215
removed non-functional low pass filter
2014-04-15 12:54:59 -07:00
Stojce Slavkovski
1a3e6595c5
Allow users to set the destination of Snapshots
2014-04-15 19:36:02 +02:00
ZappoMan
7448e0ab16
move to sub menu
2014-04-14 20:28:20 -07:00
Thijs Wenker
1634e574d7
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-15 00:40:48 +02:00
Thijs Wenker
af47510b05
Initial script editor widget / icons made by MaximillianMerlin ty
2014-04-15 00:30:01 +02:00
ZappoMan
8a6da915ae
fix predelay in the diffusion case
2014-04-14 13:25:01 -07:00
ZappoMan
0d308e7cb9
more cleanup add support for enable/disable rendering of paths
2014-04-14 11:58:49 -07:00
Ryan Huffman
aaddecd024
Merge remote-tracking branch 'upstream/master' into 19554
...
Conflicts:
interface/resources/resources.qrc
interface/ui/chatWindow.ui
2014-04-14 11:20:49 -07:00
Andrzej Kapolka
880736c30e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-14 10:24:58 -07:00
Stephen Birarda
5904d19603
Merge pull request #2637 from birarda/authentication
...
add optional DTLS option for domain-server to node communication
2014-04-14 10:24:17 -07:00
ZappoMan
7a993939bf
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
ZappoMan
ddd2b0843c
more work on new diffusion model
2014-04-13 20:43:40 -07:00
Andrzej Kapolka
39135d3d5f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-11 16:37:49 -07:00
Andrzej Kapolka
fe7a359545
Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624 .
2014-04-11 15:55:48 -07:00
Andrew Meadows
5ac7be8945
merge upstream/master -> andrew/inertia
2014-04-11 12:20:00 -07:00
Philip Rosedale
8ccc0a2081
Merge pull request #2650 from thoys/chatwindow-docking-feature
...
Fixed docking of ChatWindow
2014-04-11 07:21:53 -07:00
Andrew Meadows
af158a3a94
save settings when any checkable menu item changes
2014-04-10 17:34:12 -07:00
Andrew Meadows
a436b59971
save settings for change in: identity, position
2014-04-10 17:14:51 -07:00
Thijs Wenker
f0463a5679
Fixed docking of ChatWindow
...
Temporary Pin Icon, replace with a nice looking one please
2014-04-11 00:45:38 +02:00
Stojce Slavkovski
112c8946d6
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 23:46:22 +02:00
Andrew Meadows
ac9ead36e2
fix crash: don't access null action
...
In particular, don't crash on pressing Enter when lacking qxmpp support
2014-04-10 13:10:24 -07:00
Stojce Slavkovski
459fed5c7b
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 21:52:37 +02:00
Ryan Huffman
2d481dda4e
Update chat menu to properly position itself when opening
...
The previous implementation seemed to assume a full-screen main window -
it will now open on the right side of the window, vertically centered,
regardless of where the main window is.
2014-04-10 11:46:28 -07:00
Ryan Huffman
5099a0e061
Remove chat window opening animation
2014-04-10 11:41:10 -07:00
Philip Rosedale
de6b55644b
Merge pull request #2636 from ey6es/faceplus
...
Basic Faceplus integration, cleanup for handling the various face trackers.
2014-04-09 22:13:34 -07:00
Stephen Birarda
cf47418d58
remove the audio scope
2014-04-09 17:16:29 -07:00
Stephen Birarda
1c861fbecb
resolve conflicts on merge with upstream master
2014-04-09 15:36:15 -07:00
Andrzej Kapolka
f707719f4e
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
2014-04-09 15:34:29 -07:00
Andrzej Kapolka
55e0035fc8
More progress on Faceplus integration.
2014-04-09 11:14:47 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
