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

177 commits

Author SHA1 Message Date
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
wangyix
d0a1d732c9 updated preferences UI "samples" to "frames" 2014-07-28 14:18:22 -07:00
Atlante45
6cb5483c21 Added send data option to prefs 2014-07-16 17:56:29 -07:00
Clément Brisset
ae6b4def32 Merge pull request #3108 from huffman/19800 
Code Review for Job #19800
 2014-07-02 15:46:56 -07:00
Brad Hefta-Gaub
2df851dcfc Merge pull request #3106 from ctrlaltdavid/19823 
Code Review for Job #19823
 2014-07-02 09:06:01 -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
David Rowe
e8e9d6464b Fix running scripts scrollbar and add scrollbar to list of all scripts 2014-06-30 12:41:01 -07:00
David Rowe
ce874305be Add checkbox that automatically reloads externally changed files 2014-06-29 21:50:16 -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
cde36dc70d Add user locations 2014-06-26 16:06:28 -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
Mohammed Nafees
ad41f2da9a Make changes to other UI forms as well 2014-06-21 16:27:13 +05:30
Mohammed Nafees
a69c6f8e29 Change pt to px to solve the Windows font size issue 2014-06-19 23:58:31 +05:30
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
Ryan Huffman
0877f9f159 Fix issues with running scripts window on Windows 
Replace running scripts table with a new widget that uses a proper
layout that doesn't rely on hard-coded sizing.  Custom painted lines
were replaced with a horizontal QFrame line.
 2014-06-17 20:19:49 -07:00
barnold1953
e4a0275f57 Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -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
Mohammed Nafees
2c3784c7d5 Merge branch master of upstream 2014-05-29 22:31:32 +05:30
AndrewMeadows
b849c07faf Merge pull request #2945 from huffman/19725 
Code Review for Job #19725
 2014-05-29 09:06:43 -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
8f6ad2faab Add 'Load default scripts' button to preferences 2014-05-28 15:27:50 -07:00
Mohammed Nafees
8b0212dc1e remove all key bindings from running scripts dialog 2014-05-28 23:19:15 +05:30
Ryan Huffman
4a0a9f8a36 Update console style 2014-05-27 08:57:29 -07:00
Ryan Huffman
b9248e0bbf Update JSConsole to QWidget 2014-05-27 08:03:46 -07:00
Ryan Huffman
1d7272cbbf Add console.ui interface file 2014-05-26 10:18:04 -07:00
David Rowe
97e5c928a4 Fix chat scroll bar widget jumping 
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
 2014-05-25 16:41:01 -07:00
Stephen Birarda
01e8d775f2 change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
Ryan Huffman
e21a7524c6 Update runningscripts style 2014-05-21 17:03:19 -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
407a98f00e Added realWorldFieldOfView to preferences. 2014-05-21 10:41:33 -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
Ryan Huffman
03f9c0c7e2 Update Running Scripts Widget to use ScriptModel 2014-05-14 01:42:24 -07:00
Ryan Huffman
38a5b5b8d1 Add ScriptsLocation settings value 2014-05-14 00:28:11 -07:00
Stojce Slavkovski
ff9daa257c Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-12 19:42:44 +02:00
Ryan Huffman
ef67a72f23 Remove icon paths from runningScriptsWidget.ui 
These icon paths are already set programmatically.
 2014-05-08 07:22:55 -07:00
Stojce Slavkovski
8ee282e7d2 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-06 22:01:48 +02:00
Stojce Slavkovski
13922171ea removed build warnings 2014-05-06 01:08:24 +02:00
Stojce Slavkovski
f668cc8581 Discourse upload image 
- success message set
- fixed signal/slots in QDialog w/QEventLoop
- layout fixes
 2014-05-05 00:55:24 +02:00
Stojce Slavkovski
d3fecd7a31 store discourse api key 2014-05-02 22:16:19 +02:00
Stojce Slavkovski
852756e84d Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-02 19:03:11 +02:00
Thijs Wenker
cf1baaf6ea - Highlighting Fixes ( Single line comments in quoted text don't occur anymore. / Better number recognition) 
- Line numbers in ScriptEditor
 2014-04-30 23:32:41 +02:00
Thijs Wenker
7125b6ab8e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 
Conflicts:
	interface/src/Application.cpp
 2014-04-30 20:08:11 +02: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
Thijs Wenker
5ea512f65a ScriptEditorWindow not modal, but yet always on foreground 2014-04-29 23:53:46 +02:00
Thijs Wenker
d93f91a628 Resized ScriptEditorWindow 2014-04-29 22:17:45 +02:00
Thijs Wenker
4bdc945f94 Changed font sizes in script-editor to pixels, it should he readable in both Windows and OSX now 2014-04-29 20:12:16 +02:00
Ryan Huffman
24350761ac Update layout of login messages and move text to .ui file 2014-04-28 13:16:50 -07:00
Ryan Huffman
d5d440eec5 Update font on login window 2014-04-28 12:04:28 -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
01f66420de Fix issue with icon being disabled on login window while authenticating 2014-04-28 09:11:09 -07:00
Ryan Huffman
23397a4b10 Add LoginDialog 2014-04-28 08:55:03 -07:00
Ryan Huffman
5a8a78e7b8 Update location of Load Script button 2014-04-25 10:14:18 -07:00
Ryan Huffman
84e7b1598c Merge remote-tracking branch 'upstream/master' into RunningScripts 2014-04-25 08:45:54 -07:00
Ryan Huffman
a86af6b07f Add Load Script button to RunningScripts Dialog 2014-04-24 14:05:09 -07:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Ryan Huffman
b0e1eab7ed Fix chat input textbox to use native scrollbar 
The border around the textedit was causing QT to use a non-native
scrollbar.  Moving the box into a frame that contains the border styling
fixes this.
 2014-04-23 16:15:51 -07:00
Ryan Huffman
95357a7c35 Update chat input area to use a 14pt font 2014-04-23 12:30:40 -07:00
Ryan Huffman
951d5004e1 Add ChatInputArea with custom paste 2014-04-23 11:57:43 -07:00
Ryan Huffman
c65d5f08ca Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-23 10:54:51 -07:00
Stojce Slavkovski
e9962241be Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-23 18:12:49 +02:00
U-Uthoypia\Thijs
0e28ff2fcd This should fix the ubuntu build 2014-04-21 06:33:20 +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
Ryan Huffman
f2112c665a Disallow rich text from being pasted into the chat area 2014-04-17 14:02:21 -07:00
Ryan Huffman
3ee613b9d5 Add right margin to user list area in chat 2014-04-17 13:20:17 -07:00
Ryan Huffman
c1fa6b41e4 Update chat window to use vertical layout 2014-04-17 13:19:36 -07:00
Stojce Slavkovski
27c2255adf Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-17 20:52:30 +02:00
Ryan Huffman
2de9848a37 Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-16 14:42:20 -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
Ryan Huffman
4afea2d228 Remove chat window docking 2014-04-16 09:55:12 -07:00
Thijs Wenker
8e6130091d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 11:28:46 +02:00
Thijs Wenker
e66822c6ee ScriptEditor: Syntax highlighting update 2014-04-16 00:55:06 +02:00
Stojce Slavkovski
05023a2585 Snapshot preferences title 2014-04-15 23:29:28 +02:00
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02: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
Ryan Huffman
f698f3375a Update resource urls for chat window close button 2014-04-14 11:34:27 -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
Stojce Slavkovski
4d0ed5796e Merge branch 'master' of https://github.com/worklist/hifi into 19507 
Conflicts:
	interface/interface_en.ts
 2014-04-12 08:45:23 +02:00
Atlante45
c39434f4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 
Conflicts:
	interface/resources/resources.qrc
 2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4 Modify UIs that were using the qrc 2014-04-11 11:59:23 -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
Stojce Slavkovski
3af3b29588 removed dependency on QT resource 2014-04-11 00:54:54 +02: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
Ryan Huffman
de475ee46c Update behavior of chat window close button 
Use a stylesheet to suppress highlighting of the background when
pressing the button down.  Instead, it will change the image.

Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system.  The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
 2014-04-10 12:19:27 -07:00
stojce
8d45a53af9 Merge branch 'master' of https://github.com/worklist/hifi into 19507 
Conflicts:
	interface/interface_en.ts
 2014-04-09 19:53:48 +02:00
Mohammed Nafees
136b91feb5 Align the buttons text properly 2014-04-05 01:32:21 +05:30
Mohammed Nafees
7b5c733d9e Fixed spacing of number and script name in recently loaded list. 2014-04-05 01:10:02 +05:30
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
Mohammed Nafees
eae95a57b7 UI alignment changes 2014-04-04 23:12:56 +05:30
Mohammed Nafees
1ecdec7a5e Minor changes. Added a sweet tooltip :) 2014-04-04 19:52:37 +05:30
Mohammed Nafees
f3121e1bf6 Removed the animation, placed UI elements according to mockup 2014-04-03 22:33:45 +05:30
Mohammed Nafees
e5d9812742 Major changes to the running scripts widget 2014-04-03 13:21:27 +05:30
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Mohammed Nafees
d85d4fea5d Added the new Running Scripts widget 2014-04-02 12:46:57 +05:30
Dimitar Dobrev
3907c563df Put the chat window above the 3D view and animated its showing. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413 Changed the dock widget for the chat so that it replicates the agreed 
upon design.
 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
d764ef79ed Gave more space to the user in sent messages so that resizing of the 
column for messages occurs for really long user names.
 2014-03-28 18:36:53 +02:00
stojce
8b6db350da Switched to QDockWidget 2014-03-27 21:50:41 +01:00
stojce
9f05d71796 fixed QTextEdit border color 2014-03-26 21:30:02 +01:00