Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 17:19:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21373 commits 69 branches 58 tags 1.2 GiB
Commit graph

970 commits

Author SHA1 Message Date
Ryan Huffman
1ee01fdab3 Merge branch 'master' of github.com:highfidelity/hifi into 20024 2014-09-23 14:10:00 -07:00
Stephen Birarda
1007f528f0 Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations 2014-09-22 17:42:59 -07:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
stojce
cc83c2b2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-22 20:52:17 +02:00
stojce
466dbdcee5 added address bar dialog 2014-09-22 20:51:19 +02:00
Stephen Birarda
e09eef98f2 add option to add javascript objects to a DataWebDialog 2014-09-18 17:17:33 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
Philip Rosedale
929e463e40 Merge pull request #3447 from birarda/webkit-dialogs 
add a DataWebDialog class to display auth'ed pages from data-web
 2014-09-18 09:48:22 -07:00
Stephen Birarda
a0675162b6 hook My Locations to data-web dialog 2014-09-18 09:35:33 -07:00
Brad Hefta-Gaub
945b251f9b Merge pull request #3446 from stojce/20037 
Code Review for Job #20037
 2014-09-18 09:05:29 -07:00
stojce
9a523a60cf Add option to toggle on/off names above heads 2014-09-18 06:59:29 +02:00
Andrew Meadows
8359e672bb merge upstream/master into andrew/ragdoll 2014-09-17 17:56:35 -07:00
Stephen Birarda
abafaffe44 fix a missed Model->Entity rename that caused slot error 2014-09-17 14:43:48 -07:00
Ryan Huffman
0efce7c8ee Add hotkey to reload all scripts 2014-09-17 13:50:57 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Andrzej Kapolka
07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-16 13:20:43 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
Andrew Meadows
62867391a3 collide against PhysSimulation instead of VoxelTree 2014-09-12 17:38:45 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Stephen Birarda
29dae39ad7 handle location lookup for offline user or not found 2014-09-12 15:01:08 -07:00
Stephen Birarda
348bcdb37a resolve conflicts on merge with upstream master 2014-09-12 11:23:16 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
Stephen Birarda
5f6563f4c9 don't allow named location creation with no domain UUID 2014-09-11 17:42:04 -07:00
Stephen Birarda
dd1b23044f hook meta+enter up to address bar display 2014-09-11 10:24:04 -07:00
Stephen Birarda
71f2c0b542 initial addition of the AddressManager with location switch hooked up 2014-09-11 10:14:00 -07:00
Andrzej Kapolka
7b3d06a783 Add option to change Faceshift hostname. 2014-09-10 19:34:21 -07:00
Brad Hefta-Gaub
8068117f0c Merge pull request #3368 from chansensturm/audio-noise 
New Audio Buffer, Format, Tone Generator, Pink Noise Generator, and Gain objects
 2014-09-08 11:28:02 -07:00
Craig Hansen-Sturm
431fcbcf6c coding standard / SLOT selectAudioSourceSine440 linkage / tone gen amplitude parameter 2014-09-08 11:18:14 -07:00
Brad Hefta-Gaub
fe3f0cd358 Merge pull request #3355 from stojce/19964 
Code Review for Job #19964
 2014-09-06 15:43:27 -07:00
Brad Hefta-Gaub
d342f9281f Merge pull request #3357 from huffman/19968 
Code Review for Job #19968
 2014-09-06 15:42:02 -07:00
Craig Hansen-Sturm
1cdb01e072 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-05 18:31:02 -07:00
Craig Hansen-Sturm
68fa44f845 audio menu changes to support tone and noise generators 2014-09-05 18:30:39 -07:00
Andrzej Kapolka
b278857091 Wireframe option, fix for shadow menu group. 2014-09-05 13:51:22 -07:00
stojce
3339b92a49 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-05 07:45:55 +02:00
Ryan Huffman
d54dc5f2aa Merge branch 'master' of github.com:highfidelity/hifi into 19935 
Conflicts:
	interface/src/Menu.h
 2014-09-04 12:05:17 -07:00
Ryan Huffman
51e616d122 Add margin to chat window for titlebar + menu 2014-09-04 07:20:27 -07:00
stojce
b527966db8 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 
Conflicts:
	interface/ui/preferencesDialog.ui
 2014-08-29 08:46:02 +02:00
David Rowe
1d3a176f5f Rename method 2014-08-28 13:53:47 -07:00
David Rowe
85e9f8064a Simplify to use bool instead of storing domain name 2014-08-28 12:21:55 -07:00
David Rowe
46c1a9d59a Make login dialog automatically show only once per domain visit 2014-08-28 11:25:13 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Ryan Huffman
e38d8f7afd Update all locations that update settings to call bumpSettings() 2014-08-26 07:47:22 -07:00
stojce
7e250bc899 Remove custom styling 2014-08-23 00:16:25 +02:00
Andrew Meadows
328167464f Merge branch '19908' of github.com:huffman/hifi into huffman-19908 
Conflicts:
	interface/src/Menu.cpp
 2014-08-21 09:21:24 -07:00
Philip Rosedale
8e024982d5 Merge pull request #3301 from huffman/19864 
Code Review for Job #19864
 2014-08-19 20:48:30 -07:00
Ryan Huffman
42de56381a Update blue audio sphere name and angle to draw at 2014-08-19 19:40:27 -07:00
Ryan Huffman
8bc5f86666 Add Audio Sphere menu option 2014-08-19 19:21:53 -07:00
Andrew Meadows
1a8a2d9156 Add Avatar submenu to main menu for non-debug stuff 2014-08-19 17:26:01 -07:00
Ryan Huffman
284c4d8ac0 Merge branch 'master' of github.com:highfidelity/hifi into 19864 
Conflicts:
	interface/CMakeLists.txt
 2014-08-19 11:59:53 -07:00
Atlante45
6592a6dca2 Fix for custom URL schemes 2014-08-15 10:28:22 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
Craig Hansen-Sturm
481108ecd1 added support for biquad, parametric, and multi-band filter eq 2014-08-10 22:47:27 -07:00
Ryan Huffman
9127ac24a0 Move speechRecognizer to Menu 2014-08-07 17:45:27 -07:00
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -07:00
wangyix
1eaf175a92 removed disable audio output overflow check menu option 2014-08-05 10:21:53 -07:00
Ryan Huffman
ffb178cb43 Add SpeechRecognizer 2014-08-01 13:44:06 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream 
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
 2014-07-30 18:00:17 -07:00
wangyix
a2945eaa96 qaudiooutput overflow check enabled by default 2014-07-30 12:52:35 -07:00
wangyix
efd4b7ad67 switched upstream/downstream stats; added menu item to disable injected stats 2014-07-30 12:04:03 -07:00
wangyix
81e5419287 added CTRL+A shortcut to display audio stats 2014-07-30 11:43:33 -07:00
wangyix
bcf9a3c20c changed default max frames over desired in client to 20 2014-07-29 17:17:10 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
wangyix
145b7f8a0e got Preferences jitter buffer frames override working 2014-07-28 14:05:17 -07:00
Brad Hefta-Gaub
8b43ddc426 Merge pull request #3212 from birarda/select-library 
standardization of hints used to find external libraries
 2014-07-28 08:51:15 -07:00
Stephen Birarda
6fdd64c9fc change to new style of signal slot connection for XmppClient 2014-07-24 16:52:18 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
Stephen Birarda
19618182a3 don't show Faceshift option if not present 2014-07-22 14:40:53 -07:00
wangyix
1b2dc2cbe1 added central audio stats including pipeline latency; old stats still there 2014-07-22 14:21:53 -07:00
Brad Hefta-Gaub
fb097c77b5 Merge pull request #3186 from wangyix/master 
made Audio::_ringBuffer size 10 frames for non-Windows builds; improved interface downstream audio framesAvailable stat; disable QAudioOutput overflow check by default
 2014-07-21 14:50:15 -07:00
wangyix
a70eb12245 made Audio::_ringbuffer 10 frames for nonWindows; 
fixed/separated framesAvailable stats for _ringBuffer and _audioOutput;
made QAudioOutput overflow check disabled by default
 2014-07-21 13:21:31 -07:00
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
Stephen Birarda
45ae9f614d add dialog to Menu to insert wallet private key 2014-07-17 11:43:30 -07:00
Atlante45
5dca794322 On/Off for activity logger 2014-07-16 12:22:27 -07:00
Andrew Meadows
d832f5bec8 fix menu config of visible stats 2014-07-11 16:08:37 -07:00
Brad Hefta-Gaub
635cb380f2 Merge pull request #3151 from ctrlaltdavid/19860 
Code Review for Job #19860
 2014-07-09 18:35:01 -07:00
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
David Rowe
603ca02ef9 Default UI to "on" 2014-07-09 11:21:16 -07:00
Clément Brisset
3f24feeb1d Merge pull request #3143 from PhilipRosedale/master 
Add Low Velocity Filter for hand movement as menu option
 2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df Merge pull request #3138 from ctrlaltdavid/19836 
Code Review for Job #19836
 2014-07-08 23:16:32 -07:00
Philip Rosedale
c50d9ae3e4 Hand low velocity filter as a menu option 2014-07-08 22:22:27 -07:00
David Rowe
305623d8a7 Add option to hide focus indicators 2014-07-08 21:37:08 -07:00
wangyix
df1b4107fd moved qAudioOutput buffer overflow debug option to existing audio menu 2014-07-08 13:01:05 -07:00
wangyix
6ee52e97c8 added dev menu option to disable _audioOutput overflow check 2014-07-08 12:23:43 -07:00
Ryan Huffman
c509ae9ffd Merge branch 'master' of git://github.com/highfidelity/hifi into 19828 2014-07-07 13:49:26 -07:00
Ryan Huffman
df6bbd2944 Fix goTo* dialog bug with chat on Mac OSX 
If chat was open, when pressing enter on Mac OSX the operation would not go through and
would focus on the chat window.  There seems to be a  deeper issue, but
it was decided to go with the simple solution of making these dialog
windows not of `Sheet` type.
 2014-07-07 13:47:31 -07:00
David Rowe
8b04a9c8b6 Add toggle for user interface display 
- "/" toggles UI (incl. stats if displayed); menu View > User Interface
- "%" = toggle status; menu View > Stats
- Acts on normal, 3DTV, and Oculus display.
 2014-07-03 16:19:05 -07:00
Ryan Huffman
ccc638d8c1 Merge branch 'master' of git://github.com/highfidelity/hifi into 19800 2014-07-01 20:03:54 -07:00
Ryan Huffman
83349e0e53 Rename UserLocationsWindow to UserLocationsDialog 2014-07-01 20:03:05 -07:00
Ryan Huffman
a9e352981a Fix cleanup of resources for UserLocations* 2014-07-01 17:59:49 -07:00
Ryan Huffman
51e42221be Update menu to toggle User Locations Menu 2014-06-30 22:24:27 -07:00
barnold1953
1cd2066e79 Added option to disable glow effect for 10fps boost for oculus 2014-06-30 17:13:47 -07:00
barnold1953
2727328729 Removed unneeded menu option 2014-06-30 16:46:25 -07:00
Aleric Inglewood
1bc2f214a5 Compiler warning fixes. 
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
 2014-06-27 22:18:38 +02:00
Ryan Huffman
33e11be3e0 Add user locations to menu 2014-06-26 16:06:49 -07:00
Clément Brisset
463ac9cc74 Merge pull request #3078 from PhilipRosedale/master 
Improved toy ball, JS calls for palm position, concertCamera.js
 2014-06-26 11:03:48 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Ryan Huffman
5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
 2014-06-24 20:27:44 -07:00
Ryan Huffman
173be2c89d Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 12:01:04 -07:00
Andrew Meadows
7f4ffb363b merge upstream/master into andrew/ragdoll 2014-06-23 12:33:21 -07:00
Brad Hefta-Gaub
29a8307825 Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut 
Fix fullscreen toggle shortcut
 2014-06-23 11:42:20 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
David Rowe
633746ab16 Different fullscreen shortcuts for Mac and Windows 
Revert to the original Mac OSX key combination and provide alternative for Windows.
 2014-06-20 13:30:04 -07:00
Ryan Huffman
0c87f0aabc Update chat window behavior 
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
 2014-06-19 19:45:43 -07:00
David Rowe
2dbf8d7daf Fix fullscreen toggle shortcut 
Remove the "Meta" modifier so that the shortcut works on Windows.
 2014-06-19 11:08:21 -07:00
Ryan Huffman
7a08ac76d2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Menu.cpp
	interface/ui/preferencesDialog.ui
 2014-06-17 20:27:16 -07:00
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll 
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
 2014-06-17 17:03:16 -07:00
Andrew Meadows
b37b9fb097 remove warnings about unused variables 2014-06-17 11:59:26 -07:00
Philip Rosedale
0084c36cd0 Merge pull request #3024 from Barnold1953/OculusOverlay 
Exposed sixense mouse options and oculus UI angle to prefs
 2014-06-16 16:42:33 -07:00
Ryan Huffman
9faf9d7749 Remove extra connect and disconnect for multipleDestinationsDecision 2014-06-16 11:43:04 -07:00
Ryan Huffman
a13810bd72 Merge branch 'master' of git://github.com/highfidelity/hifi into 19779 
Conflicts:
	interface/src/location/LocationManager.cpp
 2014-06-16 11:35:55 -07:00
Ryan Huffman
978b7521db Move connect call for multiple destinations to constructor 2014-06-16 11:30:47 -07:00
Ryan Huffman
af3b2a9d0f Update LocationManager::goTo to use new addresses API 
The new API address is now used for goTo when # or @ isn't present
Fixed the multiple locations popup to show when multiple locations are
found
 2014-06-16 10:43:13 -07:00
barnold1953
7e4317d5d2 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-13 15:06:11 -07:00
Andrew Meadows
5bd37acdb8 Changed RagDoll to Ragdoll 2014-06-13 11:55:39 -07:00
barnold1953
e4a0275f57 Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -07:00
John Grosen
14f56310f6 Changed AccountManager to only rely on a proper OAuth response. 
This involved making another request after the initial OAuth authorization.
Because of this now-two-step process, some methods and signals were renamed
to make their purpose more clear. Additionally, a _hasProfile member variable
was added to DataServerAccountInfo in order to allow for knowledge of whether
the profile elements had been fetched when being deserialized from disk.
Error handling for the whole process is still nonexistant.
 2014-06-12 23:28:43 -07:00
Brad Hefta-Gaub
e8ba3c8bb1 Merge pull request #3019 from ctrlaltdavid/19769 
Code Review for Job #19769
 2014-06-12 17:31:53 -07:00
barnold1953
bc293071d6 Removed left handed menu option 2014-06-12 12:25:22 -07:00
barnold1953
84e01e6b25 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-11 17:22:30 -07:00
barnold1953
2fec7400e2 Added menu options for sixense mouse input 2014-06-11 17:21:59 -07:00
Stephen Birarda
82bf6002e2 only display the OAuthWebViewHandler when we need to ask user for authorization 2014-06-11 14:57:05 -07:00
Ryan Huffman
355fe01490 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/RunningScriptsWidget.cpp
	interface/ui/preferencesDialog.ui
	interface/ui/runningScriptsWidget.ui
 2014-06-11 13:30:47 -07:00
David Rowe
39e3deb9b9 Add menu item that toggles VR display mode 
Toggles the display mode if a Rift is found connected at program start.
 2014-06-10 15:03:07 -07:00
Brad Hefta-Gaub
f3fb39574f Merge pull request #3007 from wangyix/master 
Added Developer menu option to disable nack packets.
 2014-06-09 18:11:01 -07:00
wangyix
ffda98fe0b var name change again 2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f nackdisable to disablenack 2014-06-09 17:41:20 -07:00
wangyix
de61029f05 Added dev menu option to disable nack packets 2014-06-09 17:30:09 -07:00
Andrzej Kapolka
28490f9bbc Merge pull request #2994 from AndrewMeadows/ragdoll 
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
 2014-06-09 11:55:19 -07:00
Stephen Birarda
7da091d2b4 initial hooks for stereo audio 2014-06-06 10:15:09 -07:00
Andrew Meadows
551029c2f5 slave SkeletonModel's collision shapes to RagDoll 2014-06-06 08:51:22 -07:00
barnold1953
4ed03e996a Added Oculus Options menu 2014-06-02 16:15:51 -07:00
ZappoMan
8b51cd0d8a fix bug in Menu::removeAction() where we weren't removing the action key from the hash, memory leak, and other problems 2014-05-31 14:04:33 -07:00
ZappoMan
22a8f88195 add support for Menu.menuExists() and menu.menuItemExists() 2014-05-31 13:24:07 -07:00
AndrewMeadows
5b74829318 Merge pull request #2955 from ey6es/cascade 
Basic cascaded shadow maps for increased shadow draw distance.
 2014-05-29 18:57:44 -07:00
ZappoMan
ac22cebde1 more performance stats debugging 2014-05-29 17:41:40 -07:00
Andrzej Kapolka
67921c474e Merge branch 'master' of https://github.com/highfidelity/hifi into cascade 2014-05-29 17:09:09 -07:00
Andrzej Kapolka
09231f01f3 Retain "simple" shadows, supply cascaded as option. 2014-05-29 12:48:41 -07:00
ZappoMan
e6966c2155 add improved detailed rendering and FPS debugging stats 2014-05-29 12:12:23 -07:00
AndrewMeadows
21f045ebe0 Merge pull request #2939 from huffman/19648 
Code Review for Job #19648
 2014-05-29 08:53:31 -07:00
Ryan Huffman
425632e072 Add 'f' to end of const float to follow coding standard 2014-05-29 08:48:22 -07:00
matsukaze
619db8ee93 Job #19694 - Add option for larger number of frames to the audio scope display 2014-05-27 23:24:28 -04:00
Andrzej Kapolka
3f478b1939 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 12:31:12 -07:00
Andrzej Kapolka
edaa251e5f Provide option to disable avatar shadowing. 2014-05-27 11:43:34 -07:00
Mohammed Nafees
5055b18a4b Merge branch master from upstream 2014-05-28 00:02:15 +05:30
Ryan Huffman
b9248e0bbf Update JSConsole to QWidget 2014-05-27 08:03:46 -07:00
Ryan Huffman
422c2eac67 Update showConsole -> toggleConsole and change shortcut 2014-05-27 07:29:48 -07:00
Ryan Huffman
099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-26 10:01:44 -07:00
Ryan Huffman
3d28cff9df Add console to menu 2014-05-26 09:58:06 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Mohammed Nafees
c4b17963e2 Remove unnecessory header file inclusion in Menu.cpp 2014-05-22 16:55:24 +05:30
Mohammed Nafees
ad49b5c2e1 Show OS notification when user is not logged in 2014-05-22 16:53:07 +05:30
barnold1953
5b366fe714 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-05-21 16:01:28 -07:00
Ryan Huffman
4115e0fab2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/ui/preferencesDialog.ui
 2014-05-21 13:42:37 -07:00
barnold1953
21f03a4fb5 Made oculus camera modes only active when AllowOculusCameraModeChange is checked. 2014-05-21 12:43:44 -07:00
Andrzej Kapolka
5da656e3f5 Working on animation dialog. 2014-05-19 16:55:33 -07:00
Mohammed Nafees
b35134e325 Fix the chat widget's visibility when not logged in 2014-05-17 20:38:43 +05:30
Ryan Huffman
b48b8aab12 Merge branch 'master' of git://github.com/highfidelity/hifi into 19630 
Conflicts:
	interface/src/Application.cpp
 2014-05-16 11:48:58 -07:00
Ryan Huffman
f646eda7aa Move server borders to a submenu 2014-05-16 09:30:34 -07:00
Brad Hefta-Gaub
6bd1bdebde Merge pull request #2865 from talentraspel/19662 
MenuOption::Visage now default to false.
 2014-05-16 08:59:31 -07:00
Kai Ludwig
e8937852bc MenuOption::Visage now default to false. 2014-05-16 15:12:49 +02:00
Ryan Huffman
21819ce3b4 Merge branch '19630' of github.com:huffman/hifi into 19630 
Conflicts:
	interface/src/Menu.h
 2014-05-15 14:37:05 -07:00
Ryan Huffman
7a3826b72a Add Node border display 2014-05-15 14:35:01 -07:00
Ryan Huffman
cfb1e5ac4e Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
 2014-05-14 17:33:47 -07:00
Andrzej Kapolka
8388255542 Working on alternate IK mode. 2014-05-14 15:29:16 -07:00
Ryan Huffman
38a5b5b8d1 Add ScriptsLocation settings value 2014-05-14 00:28:11 -07:00
Bennett Goble
55d9614757 Menu.cpp Typo: goToOrientation calling goToDestination. 2014-05-13 00:58:49 -04:00
Clément Brisset
db9f2c563b Merge pull request #2830 from huffman/19645 
Code Review for Job #19645
 2014-05-12 08:58:06 -07:00
Ryan Huffman
fdaa42b219 Add hifi:// clickable links to chat 
The handling also needed to be updated to handle domains correctly -
just routing to goToURL instead of gTo fixes this.
 2014-05-08 07:54:49 -07:00
Philip Rosedale
3a2562697c Merge branch 'master' of https://github.com/worklist/hifi 2014-05-07 21:00:11 -07:00
Philip Rosedale
538e785208 Merge pull request #2815 from ZappoMan/modelserver 
More Model Improvements & some other tweaks
 2014-05-07 20:59:04 -07:00
Philip Rosedale
01e5b009ee scope menus better, pause hotkey, no stay paused, remove menu for shared face culling ops 2014-05-07 20:43:23 -07:00
ZappoMan
128e4a13de place models in proper containing voxel 2014-05-07 17:32:51 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Atlante45
6308c39aab Fix for windows 2014-05-07 14:03:30 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
68b0e91630 gravity disabled by default 2014-05-06 11:09:13 -07:00
AndrewMeadows
7a191961cf Merge pull request #2793 from PhilipRosedale/master 
Further improvements to avatar eye contact based on head direction
 2014-05-06 09:08:19 -07:00
Stojce Slavkovski
aedc7eda3e Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 08:27:55 +02:00
Philip Rosedale
e0c898bba0 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-05 18:03:33 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Stojce Slavkovski
bcad49d0a9 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 01:05:13 +02:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Stojce Slavkovski
01ebefde11 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 01:24:15 +02:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Stojce Slavkovski
37664d3877 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-04 18:32:01 +02:00
Philip Rosedale
eb991b60ce Remove dead ‘play slaps’ code 2014-05-03 09:08:26 -07:00
Stephen Birarda
aa2931d9bb resolve conflicts on merge with upstream/master 2014-05-02 10:39:17 -07:00
Stephen Birarda
4936fb3857 expose access token from AccountManager 2014-05-02 10:34:29 -07:00
Stojce Slavkovski
23da9d85a4 Merge branch '19597' of https://github.com/stojce/hifi; branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-02 18:47:45 +02:00
AndrewMeadows
05e5277084 Merge pull request #2764 from ZappoMan/modelserver 
Model Server, Renderer, Scripting, etc
 2014-05-01 15:39:12 -07:00
Stojce Slavkovski
c5bceed880 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-01 13:10:51 +02:00
Ryan Huffman
33ca387c86 Update goToURL to work with domains and user/location 
If the path starts with # or @ it's a location or user, respectively,
otherwise it is a domain.
 2014-04-30 21:12:04 -07:00
Stojce Slavkovski
d6b7dac649 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-01 01:41:11 +02:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
Andrew Meadows
db9221da6e fix misspelled slot 2014-04-30 10:38:42 -07:00
Ryan Huffman
65fd2a7724 Merge remote-tracking branch 'upstream/master' into 19612 
Conflicts:
	interface/src/Menu.cpp
 2014-04-30 09:57:17 -07:00
Ryan Huffman
ff51b22bfe Add Menu::goToUrl 2014-04-30 09:39:48 -07:00
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
Stojce Slavkovski
ca2c8d2fff Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 22:31:47 +02: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
Stojce Slavkovski
d24b55871f Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 19:05:16 +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
Stojce Slavkovski
963ad64d07 Fixed online user presence in chat window 2014-04-28 23:49:59 +02: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
Stojce Slavkovski
5c7fb3eca5 Add chat mention notifications 2014-04-26 22:19:33 +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