Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 01:50:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40906 commits 71 branches 59 tags 1.2 GiB
Commit graph

40906 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Stephen Birarda
efeef721ae Merge pull request #7383 from huffman/bugsplat-hifi-logs 
Add log to bugsplat report
 2016-03-17 14:14:18 -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
Brad Hefta-Gaub
df169e5c43 Merge pull request #7378 from AndrewMeadows/exit-immediately 
interface avoids registered exit handlers on Release shutdown
 2016-03-17 10:24:36 -07:00
Andrew Meadows
4bb705360d interface calls _exit() on Release shutdown 2016-03-17 09:48:50 -07:00
Brad Hefta-Gaub
9d15c190f7 Merge pull request #7373 from howard-stearns/lazy-obj 
Lazy obj aux file reading
 2016-03-17 09:47:52 -07:00
Brad Hefta-Gaub
ea99dbe59a Merge pull request #7377 from jherico/rift_off_crash 
Don't crash when the Rift is turned off
 2016-03-17 09:01:43 -07:00
Bradley Austin Davis
384351067e Don't crash when the Rift is turned off 2016-03-16 20:16:28 -07:00
David Rowe
ebe13b7b93 Fix edit toolbar's upload button 2016-03-17 14:44:57 +13:00
samcake
1240f144d4 Merge pull request #7358 from zzmp/fix/px-dirty-atomic 
Make procedural dirty marker atomic
 2016-03-16 18:41:12 -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
Clément Brisset
f2a5dce34e Merge pull request #7351 from ctrlaltdavid/20851 
Fix up script editor's "reload scripts?" message box
 2016-03-16 17:43:41 -07:00
David Rowe
62b24e6626 Explicitly enable button-down behavior in scripts 2016-03-17 11:49:49 +13:00
David Rowe
004a694741 Make toolbar buttons "click" 2016-03-17 11:25:37 +13:00
Chris Collins
307a0cf05a Merge pull request #7349 from zzmp/fix/guard-skybox-tex 
Guard against failure to load skybox tex
 2016-03-16 15:06:52 -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
Howard Stearns
07214843e0 Merge branch 'master' of https://github.com/highfidelity/hifi into lazy-obj 2016-03-16 09:50:17 -07:00
Howard Stearns
e25c547cb7 whitespace 2016-03-16 09:50:05 -07:00
Clément Brisset
35aa074955 Merge pull request #7369 from birarda/udt-slow-start 
repairs to udt SendQueue packet timing
 2016-03-16 09:44:58 -07:00
Stephen Birarda
c94e2bdc8b grab the now timestamp only when needed 2016-03-16 08:53:31 -07: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
Brad Hefta-Gaub
d840e68f05 Merge pull request #7365 from howard-stearns/reregister-and-scale-after-model-change 
Reregister and scale after model change
 2016-03-16 08:04:42 -07:00
Andrew Meadows
7acc56bf00 Merge pull request #7359 from zzmp/feat/bg-gpu-timer 
Add a DrawBackgroundDeferred gpu timer
 2016-03-16 07:58:53 -07:00
Howard Stearns
798a225573 Hack to suppress the attempted loading of .mtllib files if the url has a query part that includes "hifiusemat". 2016-03-15 21:11:54 -07:00
Howard Stearns
76b5b6aeeb clean 2016-03-15 20:31:57 -07:00
Zach Pomerantz
6f1079e0e0 Merge pull request #7372 from samcake/orange 
Fixing a bug when albedo map transparent is not quite loaded yet
 2016-03-15 19:47:02 -07:00
Howard Stearns
d1d8e6cb22 Merge branch 'master' of https://github.com/highfidelity/hifi into lazy-obj 2016-03-15 18:37:13 -07:00
Howard Stearns
c9f6b15ac5 checkpoint after lazy mtllib reading 2016-03-15 18:35:59 -07:00
howard-stearns
6161aab0c1 checkpoint 2016-03-15 17:05:01 -07:00
samcake
d58ac269ee Fixing a bug when albedo map transaprent but not quite loaded yet 2016-03-15 17:01: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
samcake
f30e8e9e0c Merge pull request #7281 from zzmp/fix/png-opacity 
Fix materials to honor png texture opacity
 2016-03-15 16:08:36 -07:00
Ryan Huffman
aa4c0ca15a Merge pull request #115 from birarda/atp-mappings 
make TRUNCATED_HASH_NUM_CHAR a non-static const
 2016-03-15 15:57:06 -07:00
Stephen Birarda
92b287355c make TRUNCATED_HASH_NUM_CHAR a non-static const 2016-03-15 15:56:13 -07:00
David Rowe
46a953885f Increase size of frame around and between buttons 
Makes easier to click and drag toolbar to new position.
 2016-03-16 11:43:11 +13:00
Brad Hefta-Gaub
870677a223 Merge pull request #7339 from samcake/red 
Less jittering at far distance
 2016-03-15 15:39:33 -07:00
Stephen Birarda
1cd16da83e do sleep timing off when next packet would have been 2016-03-15 15:28:55 -07:00
Clément Brisset
253b6e3067 Merge pull request #114 from birarda/atp-mappings 
fixes for styling and logging from CR
 2016-03-15 14:42:01 -07:00
Stephen Birarda
0012967734 use curly braced initialization for consts 2016-03-15 14:38:41 -07:00
Stephen Birarda
b13dff1c77 Revert "remove redundant static from const in AssetServer" 
This reverts commit 0837261d403e844f648f4f4ddcce7d7b79c7083b.
 2016-03-15 14:38:08 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Stephen Birarda
b8abb1b6dd remove redundant static from const in AssetServer 2016-03-15 14:38:08 -07:00
Stephen Birarda
42d7bc4263 Merge pull request #113 from Atlante45/feat/atp 
Fix drag&drop
 2016-03-15 14:36:37 -07:00
samcake
f3daa9e1c5 Fixing the lighting issue in stereo 2016-03-15 14:35:43 -07:00