Sam Gateau
|
32399997b1
|
Merge branch 'master' of github.com:highfidelity/hifi into nut
|
2019-06-10 10:52:53 -07:00 |
|
Bradley Austin Davis
|
355249a402
|
Merge pull request #15705 from danteruiz/allowing-launching-from-dmg
BUGZ-588: MAC LAUNCHER: We can not run from inside of the DMG
|
2019-06-10 10:47:39 -07:00 |
|
Shannon Romano
|
d8791c4379
|
Merge pull request #15710 from SamGondelman/lightmap
BUGZ-596: Fix baking of light maps
|
2019-06-10 10:13:55 -07:00 |
|
Shannon Romano
|
69094aa8f3
|
Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix
BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()
|
2019-06-10 10:12:26 -07:00 |
|
Shannon Romano
|
e213fd6b5e
|
Merge pull request #15712 from amerhifi/master
case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef
|
2019-06-07 18:59:34 -07:00 |
|
Ken Cooke
|
9d57f5ac62
|
Defer DependencyManager::destroy<AudioInjectorManager>() until all ScriptAudioInjectors have been destroyed
|
2019-06-07 18:35:39 -07:00 |
|
Anthony Thibault
|
d6331d1bf6
|
Merge pull request #15714 from hyperlogic/bug-fix/settings-on-tablet
Fix crash using Settings in the Tablet in VR
|
2019-06-07 18:15:56 -07:00 |
|
Sam Gateau
|
e0714e5b1a
|
Removing comments
|
2019-06-07 17:18:30 -07:00 |
|
Sam Gateau
|
2d9a7f7c4f
|
Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware
|
2019-06-07 17:00:37 -07:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|