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
barnold1953
407a98f00e
Added realWorldFieldOfView to preferences.
2014-05-21 10:41:33 -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
