Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-11 17:38:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12097 commits 25 branches 0 tags 1.1 GiB
Commit graph

524 commits

Author SHA1 Message Date
matsukaze
ff7a1bd60f Job #19574. Add audio oscilloscope.' 2014-04-22 06:53:59 -04:00
Atlante45
05545b684d Made glowing when speaking an option 2014-04-18 17:47:21 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07: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
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
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
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
stojce
cc2f03fb49 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 08:19:41 +02:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Atlante45
d213cd7840 More work on Undo/Redo 2014-04-07 17:10:15 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
stojce
ba5a092ad7 Frameless dialog position/size fixes 
Fixed frameless dialog size and position on main window resize and move
 2014-04-06 15:30:30 +02:00
stojce
b45f61ec54 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-05 16:29:57 +02:00
ZappoMan
593fc6c963 lots of knobs and dials 2014-04-04 17:29:39 -07:00
Andrzej Kapolka
1c822542c1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 15:29:13 -07:00
Atlante45
a0e70d0d2a Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-04 14:53:12 -07:00
Andrzej Kapolka
3a125db1f8 Increase the rate at which we increase detail and put a limit on the LOD 
multiplier so that it never takes more than about five seconds to return to
default detail.  Also, since there seems to be a weird issue where OS X
throttles the frame rate to 30 fps (independent of our own throttling), use
that as the lower adjustment range.
 2014-04-04 14:31:30 -07:00
stojce
8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/resources/resources.qrc
	interface/src/Menu.cpp
 2014-04-04 21:16:29 +02:00
Andrzej Kapolka
a0c7e4d3cc Working on model rendering modes. 2014-04-04 11:45:03 -07:00