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
Ryan Huffman
8f6ad2faab
Add 'Load default scripts' button to preferences
2014-05-28 15:27:50 -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
38a5b5b8d1
Add ScriptsLocation settings value
2014-05-14 00:28:11 -07:00
Andrzej Kapolka
e0400dbd9c
Working on allowing attachment models to be uploaded.
2014-05-04 15:23:31 -07:00
Atlante45
cf7fe2306b
Fix audio jitter
2014-04-24 18:10:51 -07:00
Ryan Huffman
606a48d555
Fix issue with pref dialog disappearing
...
With the frameless dialog being updated to support different types of
window, the pref dialog was no longer able to rely on it to keep itself
open in certain cases. The window flags were also updated to update
after a "browse" call rather than in the slot so that it would still
execute in the case of cancelled selection.
2014-04-17 09:36:17 -07: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
Stojce Slavkovski
1a3e6595c5
Allow users to set the destination of Snapshots
2014-04-15 19:36:02 +02:00
Andrew Meadows
5ac7be8945
merge upstream/master -> andrew/inertia
2014-04-11 12:20:00 -07:00
stojce
9ab61faacb
additional CR fixes
2014-04-09 22:32:15 +02:00
stojce
a1c6843bd4
CR Fixes
2014-04-09 22:14:35 +02:00
stojce
dd5a198740
Models browser fixes
2014-04-06 16:13:15 +02: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
stojce
32502d7b0d
layout improvements
2014-03-23 16:20:29 +01:00
stojce
9077a05f9d
- Layout fix
...
- Model browsers
- merge
2014-03-21 22:34:10 +01:00
stojce
913783c0f1
resizing
...
- fixed layout
2014-03-16 22:47:03 +01:00
stojce
6383457e4e
styling
...
bad merge fix
2014-02-26 22:15:12 +01:00
stojce
1e2cd0c1a2
UI changes
2014-02-25 20:36:14 +01:00
stojce
ec73edb8d8
restyled preferences dialog
...
- Frameless dialog super class
2014-02-23 13:54:22 +01:00
