Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-18 06:09:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11781 commits 25 branches 0 tags 1.1 GiB
Commit graph

501 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
ZappoMan
c35d6bdb0c add reflection stats to stats display, add pre-delay, add toggle for separate ears, add surface randomness 2014-04-04 11:25:43 -07:00
ZappoMan
98f0fe8619 latest pass, improved distance calulations, added menu item to remove original source 2014-04-03 18:57:08 -07:00
Atlante45
d3ce2c7640 Added undo/redo support to the client 2014-04-03 16:51:08 -07:00
ZappoMan
06adaa009c add first cut at simple low pass filter 2014-04-03 12:40:35 -07:00
Dimitar Dobrev
716858e6f6 Informed users who want to chat they have to log in first. 2014-04-03 20:09:54 +03:00
Atlante45
4a1687c023 Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
 2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Andrew Meadows
db40a955c9 merge upstream/master into "improved URL scheme" 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:50:08 -07:00
matsukaze
f7d9269314 Modifications to support spatial audio processing. 2014-04-03 17:36:03 -07:00
Andrew Meadows
aad945c180 merge upstream/master into "improved URL scheme" 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:45:01 -07:00
Andrew Meadows
715f2c53d5 merge upstream/master into avatar-interaction 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:28:22 -07:00
Andrew Meadows
b65855a384 merge upstream/master into avatar-interaction 2014-04-01 12:53:47 -07:00
Atlante45
bdd5c291b0 Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-01 12:03:45 -07:00
Atlante45
03958f2fa0 work on metadata in the model browser + real time updates 2014-04-01 12:02:47 -07:00
AndrewMeadows
f12da05722 Merge pull request #2581 from Atlante45/more_upload_fixes 
More upload fixes
 2014-04-01 09:51:25 -07:00
AndrewMeadows
ff211dbc2b Merge pull request #2573 from PhilipRosedale/master 
Audio VU level meter to replace scope
 2014-04-01 09:41:39 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model 
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
 2014-04-01 09:25:25 -07:00
Philip Rosedale
7d12fcee9d 220Hz tone injection option for easier audio quality checks 2014-03-31 21:55:29 -07:00
James Brotchie
19b8f101d8 Improved hifi:// style URL scheme handling. 
First steps towards implementing #1463.

 - Moved url parsing code from Application::event to
   Menu::goTo(QString).
 - Handle destination component of URL as either a @username,
   #place, or x-xx,y-yy,z-zz style coordinate.
 - Added support for entering hifi:// style URL into @ invoked
   goto menu option.
 2014-04-01 11:31:43 +10:00
Atlante45
77f5a50738 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-31 17:19:45 -07:00
James Brotchie
da116608a0 Hitting enter no longer shows chat window when chat is disabled. 
When chat is disabled (QXMPP library not available or XMPP disconnected)
hitting enter would show the chat window, even when the Tools -> Chat
menu item is grayed out!
 2014-04-01 07:38:22 +10:00
Philip Rosedale
27f0214032 first pass audio VU scope 2014-03-28 23:09:51 -07:00