Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 14:11:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79026 commits 75 branches 59 tags 1.2 GiB
Commit graph

79026 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
00bba828ee Fix crash using Settings in the Tablet in VR 
This was introduced in Qt5.12.3.  There are several issues in their bug tracker about this issue.

https://bugreports.qt.io/browse/QTBUG-75516
https://bugreports.qt.io/browse/QTBUG-75335

To workaround this, we call Qt.createComponent() manually, instead of letting StackView do it for us.
 2019-06-07 16:41:56 -07:00
Seth Alves
22d602a334 CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list 2019-06-07 16:36:29 -07:00
PrestonB1123
059d931d17
Merge pull request #15711 from PrestonB1123/removingShortcuts 
DEV-108: Removed ctrl+b and ctrl+n as shortcuts
 2019-06-07 16:26:38 -07:00
amer cerkic
b57e4869c8 removed debug info 2019-06-07 16:26:21 -07:00
amer cerkic
da071abd8b wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist 2019-06-07 16:25:04 -07:00
Preston Bezos
a0753f6393 removed ctrl+b and ctrl+n as shortcuts 2019-06-07 15:41:44 -07:00
Roxanne Skelly
ec1118db1f Attempting to write to a socket in unbound state was causing qt to crash 
after a number of tries.  This fix does an initial check to prevent that
case.
 2019-06-07 15:23:06 -07:00
Shannon Romano
e4b26656d4
Merge pull request #15703 from amerhifi/master 
case : BUGZ 560: disabling dde initialization due to random crashes while closing down…
 2019-06-07 15:15:46 -07:00
SamGondelman
129d96a997 get rid of lightmapMap 2019-06-07 14:53:31 -07:00
amer cerkic
f2c6cb79f7 if formatting 2019-06-07 14:17:49 -07:00
amer cerkic
049ff8e618 fixed last space 2019-06-07 14:11:13 -07:00
amer cerkic
c61f0bcf3e more vs cleanup 2019-06-07 14:07:06 -07:00
amer cerkic
64534913af more vs changes udo 2019-06-07 13:59:18 -07:00
amer cerkic
fd7dd7948f reverted vs spacing changes 2019-06-07 13:41:14 -07:00
Roxanne Skelly
6643633400 Move rebind on network error to rebind on silent domain checkin 2019-06-07 13:38:50 -07:00
PrestonB1123
73ce5ef619
Merge pull request #15695 from PrestonB1123/logspam 
BUGZ-346: QML Logspam
 2019-06-07 13:37:38 -07:00
amer cerkic
9498e0a462 addressing comment concerning preferences 2019-06-07 12:47:04 -07:00
Shannon Romano
8d8c7c1a10
Merge pull request #15555 from raveenajain/gltf_walkingBounding 
Case 22352: gltf walking, bounding, collision
 2019-06-07 12:23:52 -07:00
Shannon Romano
96a9092847
Merge pull request #15706 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-429) Fix stuck transition due to removing sub render items before parent
 2019-06-07 12:23:15 -07:00
Shannon Romano
5accee848a
Merge pull request #15692 from luiscuenca/winLauncherUpdate 
Windows Launcher Fixes
 2019-06-07 12:15:43 -07:00
Preston Bezos
e89f499c1a this should work 2019-06-07 12:02:15 -07:00
Preston Bezos
4eccb7a124 Revert "made one more change to get rid of ubuntu warning" 
This reverts commit e7255298de.
 2019-06-07 12:00:36 -07:00
Preston Bezos
e7255298de made one more change to get rid of ubuntu warning 2019-06-07 11:59:26 -07:00
Preston Bezos
27de181d0c Merge branch 'master' of github.com:highfidelity/hifi into logspam 2019-06-07 11:54:48 -07:00
Shannon Romano
1994e08689
Merge pull request #15704 from sethalves/bugz-566 
case BUGZ-566: don't hang if somehow setting display plugin to the current one
 2019-06-07 11:22:49 -07:00
Preston Bezos
ad562b8f91 really need to stop clanging myself 2019-06-07 11:22:11 -07:00
sabrina-shanman
21966fe345 Fix stuck transition due to removing sub render items before parent 2019-06-07 11:14:32 -07:00
Preston Bezos
e63d98e137 fixed a couple of doc errors and accounted for some edge cases 2019-06-07 11:09:21 -07:00
dante ruiz
5499da0b7b removing debug statments 2019-06-07 10:59:56 -07:00
dante ruiz
00baaffb97 allow launcher to work from mounted dmg 2019-06-07 10:56:44 -07:00
Preston Bezos
3ab4be6b8d I got clanged 2019-06-07 10:42:31 -07:00
Seth Alves
54906a270e don't hang if somehow setting display plugin to the current one 2019-06-07 10:31:48 -07:00
amerhifi
b1df463f56 disabling dde initialization due to random crashes while closing down the socket connection on mac 2019-06-07 10:16:36 -07:00
Shannon Romano
1e827a925a
Merge pull request #15699 from SamGondelman/avatarPick 
BUGZ-373, BUGZ-407: Put avatar spheres in R3 in simulation
 2019-06-07 09:59:42 -07:00
Sam Gateau
07ddc535a0 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-07 09:32:50 -07:00
Sam Gateau
76836ebe9f Exposing a lot more details about displays on mac 2019-06-07 09:32:26 -07:00
luiscuenca
ad1333b0d3 add review changes 2019-06-07 09:21:50 -07:00
Shannon Romano
96aa7e38d9
Merge pull request #15697 from jherico/fix/ci_python_error 
Fix spurious error from prebuilt script
 2019-06-06 17:30:11 -07:00
SamGondelman
3bb645b2d7 put avatar spheres in r3 in simulation 2019-06-06 17:17:18 -07:00
Howard Stearns
6394d14f2a
Merge pull request #15687 from SimonWalton-HiFi/dissectors-message-limits 
Dissectors: Limit message number & position values
 2019-06-06 17:03:09 -07:00
PrestonB1123
f3f0c4de43
Merge pull request #15688 from PrestonB1123/PushToTalk 
DEV-94: Push to Talk
 2019-06-06 16:49:08 -07:00
Brad Davis
11b505f59f Fix spurious error from prebuilt script 2019-06-06 16:40:39 -07:00
Sam Gateau
d406e52d71 Messing around 2019-06-06 16:37:49 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-559) Improve transition debugging and transition clean-up
 2019-06-06 16:35:04 -07:00
Preston Bezos
a7a765b025 added a couple more notifies and fixed a couple of jsdocs 2019-06-06 16:23:54 -07:00
Zach Fox
b737e31421
Merge pull request #15696 from zfox23/emitWhenDocking 
Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup
 2019-06-06 15:45:32 -07:00
Shannon Romano
fae13682d6
Merge pull request #15690 from danteruiz/mac-launcher-bugs 
Fixing mac luancher bugs.
 2019-06-06 15:07:07 -07:00
Simon Walton
d2e9abd72c Tweak limits; add comment 2019-06-06 15:01:54 -07:00
sabrina-shanman
9a75feecde Fix binding to temporary transitionStage pointer 2019-06-06 14:52:42 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00