Brad Hefta-Gaub
19b76e3331
Merge pull request #2750 from Atlante45/master
...
Fixed QLINE_MIN_WIDTH warning on mac
2014-04-30 09:19:09 -07:00
Atlante45
e9a01a39a2
Fixed QLINE_MIN_WIDTH warning on mac
2014-04-29 17:38:55 -07:00
Ryan Huffman
edcff0b67f
Merge remote-tracking branch 'upstream/master' into RunningScripts
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/FramelessDialog.cpp
interface/src/ui/FramelessDialog.h
2014-04-29 16:28:36 -07:00
Clément Brisset
7c21fab50c
Merge pull request #2736 from SydoxX/master
...
Fix CustomUrl
2014-04-29 12:07:44 -07:00
Konstantin
ac8adad0e0
Remove 0,0,0 entry.
2014-04-29 20:49:20 +02:00
Clément Brisset
4c42a403e7
Merge pull request #2738 from huffman/19598
...
Login window
2014-04-28 19:28:50 -07:00
Andrew Meadows
c7dbc5984f
add local gravity option parameter for MyAvatar
2014-04-28 16:40:22 -07:00
Andrew Meadows
a7c4b02f2d
merge new work into andrew/inertia
2014-04-28 09:52:06 -07:00
Ryan Huffman
45fdd00608
Merge remote-tracking branch 'upstream/master' into 19598
...
Conflicts:
interface/src/ui/FramelessDialog.h
2014-04-28 09:13:00 -07:00
Ryan Huffman
81a0cbe761
Update Menu to use new login dialog
2014-04-28 09:01:13 -07:00
Konstantin
ec410d105b
Fix CustomUrl
...
Fixed custom url so that hifi://domain/ works.
2014-04-27 00:31:28 +02:00
Andrew Meadows
b05a315b5a
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-04-25 14:52:44 -07:00
Andrew Meadows
ecae89489e
mispelled slot
2014-04-25 14:13:44 -07:00
Ryan Huffman
84e7b1598c
Merge remote-tracking branch 'upstream/master' into RunningScripts
2014-04-25 08:45:54 -07:00
Clément Brisset
fd8ec9b5c2
Merge pull request #2723 from huffman/19554-2
...
19554 - Chat Updates
2014-04-24 16:44:22 -07:00
Andrew Meadows
0b5c1b0a9a
add MyAvatar::_motionBehaviors (for obeyGravity)
...
Also reconcile Menu checkable set vs script-set collision groups.
2014-04-24 15:43:03 -07:00
Andrew Meadows
f07a418a27
namechange CollisionFlags --> CollisionGroups
2014-04-24 11:07:49 -07:00
Mohammed Nafees
29d64373b4
Merge branch master
2014-04-24 18:52:59 +05:30
Andrzej Kapolka
0386dec2a6
Provide option to align wrists with forearms.
2014-04-23 12:09:54 -07:00
Ryan Huffman
c65d5f08ca
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-23 10:54:51 -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
Ryan Huffman
a552d48401
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-17 20:02:05 -07:00
Ryan Huffman
c0ae2fd7ae
Add QDesktopServices header to Menu.cpp
2014-04-17 19:53:59 -07:00
Ryan Huffman
e1e9c11189
Add Menu slot to open urls
2014-04-17 15:18:40 -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
Ryan Huffman
2de9848a37
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-16 14:42:20 -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
Ryan Huffman
cb1408d26d
Update chat window to use new Frameless Dialog
...
The new dialog class needed to be updated to handle windows in different
positions and windows that don't delete on close.
2014-04-16 10:01:35 -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
