Brad Hefta-Gaub
edcf642410
Merge pull request #7374 from jherico/plugin_switch_crash
...
Reduce crashes on switching display plugins
2016-03-17 15:51:39 -07:00
Brad Hefta-Gaub
6f8f5ed15c
Merge pull request #7382 from hyperlogic/tony/crash-fix-focus-out-event
...
Application: prevent crash on startup when "Crashed" dialog is shown
2016-03-17 15:51:15 -07:00
Bradley Austin Davis
d6d7e67ca3
Fix OpenVR shutdown crash
2016-03-17 14:37:43 -07:00
Ryan Downe Karpf
8914406987
Merge pull request #7367 from ctrlaltdavid/20852
...
Restyle directory, edit, and marketplace toolbars
2016-03-17 14:32:48 -07:00
Ryan Huffman
d7d447c998
Add log to bugsplat report
2016-03-17 13:05:57 -07:00
Anthony J. Thibault
a8bc8a7843
Application: prevent crash on startup when "Interface Crashed" dialog is shown.
...
If the application "Interface Crashed" dialog is shown at startup, it can cause Application to receive events before it has been fully constructed.
In this case the QMainWindow _window pointer is uninitialized, causing Menu::getInstance() to de-reference an invalid pointer.
The fix for this is three fold.
1. Construct the QMainWindow before calling setupEssentials (which in turn spawns the "Interface Crashed" dialog).
2. Change Menu::getInstance() from a static_cast to a dynamic_cast. This will cause it to return a nullptr if [QMainWindow::menuBar()](http://doc.qt.io/qt-4.8/qmainwindow.html#menuBar ) returns an instance of QMenuBar and not a ui::Menu instance.
3. In Application::event return false if Menu::getInstance() returns a nullptr. This should prevent any code that relies on having a valid ui::Menu instance from running.
2016-03-17 12:13:01 -07:00
Bradley Austin Davis
1cf89f046c
Fix off by one error
2016-03-17 10:13:52 -07:00
Bradley Austin Davis
7045680bc7
Reduce crashes on switching display plugins
2016-03-17 10:13:52 -07:00
Andrew Meadows
4bb705360d
interface calls _exit() on Release shutdown
2016-03-17 09:48:50 -07:00
Brad Hefta-Gaub
10a0bac90b
Merge pull request #7375 from jherico/display_switch_shortcut
...
Allow display plugin switching by keyboard
2016-03-16 18:38:09 -07:00
Bradley Austin Davis
80e2025ebf
Allow display plugin switching by keyboard
2016-03-16 18:28:48 -07:00
David Rowe
df870d6e82
Merge branch 'master' into 20852
2016-03-17 10:35:26 +13:00
David Rowe
bef8c5a807
Fix some QML warnings
2016-03-17 09:51:32 +13:00
David Rowe
48d4316714
Fix typo
2016-03-17 09:34:21 +13:00
David Rowe
5faa7b3e87
Merge branch 'master' into 20851
...
Conflicts:
interface/resources/qml/dialogs/MessageDialog.qml
2016-03-17 09:29:56 +13:00
Chris Collins
733e4d74f8
Merge pull request #7290 from huffman/bugsplat-username
...
Add HF username as default username for bugsplat
2016-03-16 08:42:26 -07:00
Andrew Meadows
6028c3e841
Merge pull request #7318 from birarda/atp
...
Asset Transfer Protocol Mappings
2016-03-15 16:52:36 -07:00
Stephen Birarda
0012967734
use curly braced initialization for consts
2016-03-15 14:38:41 -07:00
Stephen Birarda
29cd487f84
fixes for styling and logging from CR
2016-03-15 14:38:08 -07:00
David Rowe
5d08f6f5a2
Update the HiFi-Glyphs font file
2016-03-16 10:29:22 +13:00
Atlante45
03efde5b3c
Change text in case of drag and drop.
2016-03-15 13:53:13 -07:00
Chris Collins
e47c8896db
Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h
...
Application: fix third-person and fullscreen-mirror toggle
2016-03-15 11:50:22 -07:00
Atlante45
4265ddbd0e
Can't drop fbx if you can't rez
2016-03-15 11:42:48 -07:00
Atlante45
4a90ec303c
Fix drag&drop
2016-03-15 11:22:42 -07:00
Anthony Thibault
addde84bee
Merge pull request #7363 from markej/master
...
Fill in the Downloads: line of the stats window
2016-03-15 10:42:09 -07:00
Clément Brisset
17e5b441cf
Merge pull request #111 from huffman/atp-manager-name
...
Add atp filename to entities added to world
2016-03-15 10:19:53 -07:00
Ryan Huffman
1b81b4f01b
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
2016-03-15 10:19:20 -07:00
Anthony J. Thibault
7539eec134
Application: fix third-person and fullscreen-mirror toggle
2016-03-15 10:11:56 -07:00
Ryan Huffman
7947bd7724
Fix message typo enter => entering
2016-03-15 10:11:53 -07:00
Ryan Huffman
cbed674cba
Merge pull request #112 from Atlante45/feat/atp
...
In place editing
2016-03-15 09:54:03 -07:00
Clément Brisset
bbfbbf6565
Merge pull request #109 from birarda/asset-migrator
...
tweaks to the ATP asset migrator for compound URLs and mappings
2016-03-15 09:25:11 -07:00
Atlante45
07d2213628
Remove debug
2016-03-15 09:14:22 -07:00
Atlante45
9b8b1d41e3
Edit in place
2016-03-15 09:14:22 -07:00
Atlante45
98851679c5
Remove unused AssetMappingItem
2016-03-15 09:14:22 -07:00
Stephen Birarda
72c64532f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-15 09:12:49 -07:00
Brad Hefta-Gaub
11e88f965d
Merge pull request #7347 from hyperlogic/tony/prevent-roll-in-goto-location
...
MyAvatar: prevent roll and pitch in avatar via snapshot url.
2016-03-14 18:58:49 -07:00
Brad Hefta-Gaub
447918d148
Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes
...
Avatar & Animation cppcheck static analysis fixes
2016-03-14 18:58:25 -07:00
Stephen Birarda
605474a32c
actually use the JSONTypePair alias
2016-03-14 18:11:34 -07:00
Ryan Huffman
7823882aa1
Add atp filename to entities added to world
2016-03-14 16:13:33 -07:00
David Rowe
ab963b4a4b
Fix up script editor's "reload script?" message box
2016-03-15 09:04:23 +13:00
Mark Johnson
2834ff2935
Change Q: -> Pending:
2016-03-14 11:45:05 -07:00
David Rowe
f75aa97728
Grow width of QML message box to accommodate wide title if necessary
2016-03-15 07:22:21 +13:00
Ryan Huffman
4b6dd4636f
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
2016-03-13 21:32:25 -07:00
Ryan Huffman
960047f412
Remove right click selection
2016-03-13 21:06:52 -07:00
Ryan Huffman
6c27bd9eb2
Update upload flow and make asset list dynamically sized
2016-03-13 21:04:07 -07:00
Anthony Thibault
1e94d9bdf5
interface/src/avatar: cppcheck fixes
2016-03-13 18:56:15 -07:00
Anthony Thibault
b921ac7757
MyAvatar: prevent roll and pitch in avatar via snapshot url.
2016-03-13 11:32:48 -07:00
Mark Johnson
b7a47d7bf2
Tabs -> Spaces
2016-03-12 17:35:57 -08:00
Mark Johnson
47d3f418e3
Merge remote-tracking branch 'highfidelity/master'
2016-03-12 17:30:22 -08:00
Mark Johnson
00829db375
Fill in the downloads line of the stats window
...
Will show the active download, current download limit and how many
pending requests
2016-03-12 17:27:43 -08:00
