Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 17:03:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40959 commits 25 branches 0 tags 1.1 GiB
Commit graph

40959 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
d7d428d1b2 Merge pull request #7387 from ZappoMan/fixBlenderCrash 
Fix ModelBlender crash
 2016-03-21 09:14:11 -07:00
Brad Hefta-Gaub
6822f0643b Merge pull request #7397 from zzmp/fix/ambient-url-listener 
Add back ambientURL listener in editor
 2016-03-21 08:49:43 -07:00
Brad Hefta-Gaub
2e7bc5f430 Merge pull request #7405 from sethalves/fix-voxels-js 
make voxels.js buttons work, again
 2016-03-21 08:46:29 -07:00
Seth Alves
b600000307 refactor code a bit 2016-03-20 17:59:15 -07:00
Brad Hefta-Gaub
92c9dbc1aa Merge pull request #7404 from sethalves/quiet-invisible-zone 
don't spam log when a zone is invisible
 2016-03-20 17:56:15 -07:00
Seth Alves
21c688390c make voxels.js buttons work, again 2016-03-20 17:40:03 -07:00
Seth Alves
f8b8877369 coding standard 2016-03-20 17:37:06 -07:00
Brad Hefta-Gaub
5b3be03098 Merge pull request #7402 from hyperlogic/tony/empty-geometry-crash 
NetworkGeometry: Fix crash for empty geometry/bad FBX versions
 2016-03-20 17:25:27 -07:00
Seth Alves
d4ed9993b2 don't spam log when a zone is invisible 2016-03-20 15:06:17 -07:00
Brad Hefta-Gaub
9d4d396db4 Merge pull request #7403 from hyperlogic/tony/disable-watchdog-for-debug 
Application: disable deadlock watchdog for debug builds
 2016-03-20 12:37:50 -07:00
Anthony Thibault
b71a56de38 Application: disable deadlock watchdog for debug builds 
Cause it will cause a crash if you sit on a breakpoint for too long.
 2016-03-20 12:18:33 -07:00
Anthony Thibault
6e872edcae NetworkGeometry: Fix crash for empty geometry/bad FBX versions 
Interpret empty geometry as an error.
 2016-03-20 12:13:54 -07:00
Brad Hefta-Gaub
b8929c4416 Merge pull request #7384 from zzmp/fix/bugsplat-1836 
Check qml gl context on create
 2016-03-20 11:26:09 -07:00
Zach Pomerantz
12aa057ff6 Always log if gl context fails 2016-03-18 18:37:14 -07:00
Zach Pomerantz
105b4e16a9 Add back ambientURL listener in editor 2016-03-18 16:18:41 -07:00
Brad Hefta-Gaub
c3c7d3d776 Merge pull request #7394 from howard-stearns/safer-early-exit-for-obj-subresources 
Safer early-bail for fetch of subresources of .obj models.
 2016-03-18 15:42:33 -07:00
howard-stearns
b9a3e130cb Safer early-bail for fetch of subresources of .obj models. 2016-03-18 15:02:30 -07:00
Brad Hefta-Gaub
2ef5b3727e Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash 2016-03-18 14:04:45 -07:00
Chris Collins
5e8c10508c Merge pull request #7392 from jherico/resource 
Make shared lists thread safe
 2016-03-18 13:25:58 -07:00
James B. Pollack
ce932640bd Merge pull request #7353 from huffman/fix-keylight-edit 
Fix keylight direction naming and usage in edit.js
 2016-03-18 12:35:48 -07:00
samcake
312635c1db Merge pull request #7391 from zzmp/fix/fbx-alpha 
Look at whole tex for alpha mask
 2016-03-18 11:31:00 -07:00
Bradley Austin Davis
16e6d9a4f9 Make shared lists thread safe 2016-03-18 11:15:35 -07:00
Zach Pomerantz
a0ba5d3c29 Look at whole tex for alpha mask 2016-03-18 11:00:36 -07:00
Brad Hefta-Gaub
481a75faca Merge pull request #7366 from markej/ShowDownloadURLs 
Show which URLs are being actively downloaded
 2016-03-18 10:42:01 -07:00
Chris Collins
5ca1598572 Merge pull request #7388 from howard-stearns/os-window-vs-modal-overlay-in-script-editor 
Os window vs modal overlay in script editor
 2016-03-18 09:33:17 -07:00
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
Howard Stearns
0cbddb217c Don't ask about differences over after the user has said no -- until the external file changes again. 2016-03-17 19:58:28 -07:00
Brad Hefta-Gaub
0474be59c9 remove invalid.com url 2016-03-17 19:49:45 -07:00
Brad Hefta-Gaub
eb8a6527c6 change ModelBlender to use a set<WeakPointers> to safely handle model lifetime 2016-03-17 19:44:42 -07:00
Brad Hefta-Gaub
917c4644a5 make SkeletonModel be shared_ptr friendly as well 2016-03-17 18:03:49 -07:00
Philip Rosedale
0347f85d3a Merge pull request #7386 from sethalves/fix-parenting-grab 
observers see parent-grabs again
 2016-03-17 17:47:25 -07:00
Seth Alves
1e02c8d9d3 minimize diff 2016-03-17 17:28:36 -07:00
Seth Alves
cbfde2032c fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand 2016-03-17 17:09:32 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
howard-stearns
d59d5549a1 Merge branch 'master' of https://github.com/highfidelity/hifi into os-window-vs-modal-overlay-in-script-editor 2016-03-17 17:04:54 -07:00
Zach Pomerantz
60f22c51b9 Check qml gl context on create 2016-03-17 16:56:23 -07:00
howard-stearns
a957716511 Disable script editor close and tab close when we have a modal dialog up 
about external changes to the file.
 2016-03-17 16:54:59 -07:00
Brad Hefta-Gaub
a6ecfd789c Merge pull request #7381 from sethalves/fix-crashes-1 
fix FBXGeometry::convexHullContains crash
 2016-03-17 16:00:58 -07:00
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
d5bf65cc8f Merge pull request #7379 from sethalves/fix-crashes-0 
possibly fix a couple of crashes
 2016-03-17 15:51:27 -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
Seth Alves
87dbec8974 add comment 2016-03-17 14:43:00 -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
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
Seth Alves
cea97aa317 fix FBXGeometry::convexHullContains crash 2016-03-17 10:55:24 -07:00
Seth Alves
db5c6d80d2 possibly fix a couple of crashes 2016-03-17 10:31:54 -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