Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-10 06:12:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79168 commits 17 branches 0 tags 1.1 GiB
Commit graph

79168 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Rowe
15d3c7231e Fix typos 2019-06-07 12:21:32 +12: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
dante ruiz
5fe4f35139 propertly encode 2019-06-06 14:35:45 -07:00
Zach Fox
a7ad087bd0 Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup 2019-06-06 14:23:18 -07:00
Roxanne Skelly
d0bd4a7d47 try rebinding on error writing/reading from bound socket 2019-06-06 14:01:34 -07:00
Sabrina Shanman
73ac38a6a6
Merge pull request #15686 from samcake/nut 
BUGZ-442: Adding extra check when setting Performance & render api enums
 2019-06-06 13:58:09 -07:00
luiscuenca
e572057d7c Password case insensitive and encoded. Proper uninstall 2019-06-06 13:37:22 -07:00
David Rowe
beb70988c3 Tablet and related JSDoc 2019-06-07 08:34:53 +12:00
Zach Fox
a2d70cb19f
Merge pull request #15691 from zfox23/NUI/removeHeadphone 
DEV-113: Remove headphones icon from status indicator in top bar
 2019-06-06 13:31:50 -07:00
sabrina-shanman
971d563f49 Add debug icons for transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
faf5db5476 Change semantic for removing transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
sabrina-shanman
5587193640 Add more transition icon debugging 2019-06-06 13:25:00 -07:00
Sam Gateau
56efba1873 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-06 12:30:11 -07:00