Commit graph

79946 commits

Author SHA1 Message Date
MiladNazeri
20b709b382 Update interface/resources/qml/controlsUit/PermissionPopup.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:46:10 -07:00
milad
5083e449b0 cr round 2 2019-07-25 15:42:25 -07:00
milad
2f4566b63c merged master and fixed height 2019-07-25 15:42:03 -07:00
milad
4c0d8b6fda improved layout to match the figment more 2019-07-25 15:42:02 -07:00
milad
993e5db2da changed rectangle to have anchor.fill 2019-07-25 15:42:02 -07:00
milad
2498bf2fd8 Cr changes r1 2019-07-25 15:42:02 -07:00
milad
9f0fc8bd06 removed logs and prototype code 2019-07-25 15:42:02 -07:00
milad
189809dc2c Fixed undefined error when displaying from the dictionary 2019-07-25 15:42:02 -07:00
milad
2b4dd327ec removed log statements 2019-07-25 15:42:01 -07:00
milad
b0bc4639be removed temp folder 2019-07-25 15:42:01 -07:00
milad
cd5df63f51 working version for all qml web files 2019-07-25 15:41:53 -07:00
dante ruiz
58dea69ecf create zip file for launcher 2019-07-25 15:41:34 -07:00
milad
fb7a66b110 working version with just flickable 2019-07-25 15:38:23 -07:00
milad
43268c0f65 Working QML window 2019-07-25 15:38:23 -07:00
milad
dec176b921 checking to see if I did something blocking the build 2019-07-25 15:38:22 -07:00
Roxanne Skelly
130e68c9b5 DEV-168 - make interface-installed content sets display info on web
installed content section
2019-07-25 14:37:41 -07:00
Ryan Huffman
9872c1c2f7 Add missing emit inside of 2019-07-25 13:55:44 -07:00
Ryan Huffman
de233e456e
Merge pull request #15976 from huffman/feat/serverless-tutorial
DEV-266: Add serverless tutorial
2019-07-25 13:39:03 -07:00
Shannon Romano
c2186305b3
Merge pull request #15981 from luiscuenca/WLVersionAndUpdate
DEV-243 | DEV-221: Display Window Launcher version number and autoupdate
2019-07-25 13:28:21 -07:00
Howard Stearns
520ba59899
Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown
BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor
2019-07-25 12:50:07 -07:00
Zach Fox
12a9837a4b
Merge pull request #15984 from zfox23/removeSomeEventBridgeCode
BUGZ-969: Remove some audio-related code that hasn't worked in a while
2019-07-25 12:41:43 -07:00
Zach Fox
6e33f3f23a BUGZ-969: Remove some audio-related code that hasn't worked in a while 2019-07-25 11:49:28 -07:00
Roxanne Skelly
22e71115dd DEV-168 - add filename reporting for installed/restored backup content 2019-07-25 11:46:05 -07:00
luiscuenca
c3ad65f628
add --skipSplash param 2019-07-25 11:22:20 -07:00
luiscuenca
13952bf27e
Fixes and seamless self update 2019-07-25 10:51:18 -07:00
Samuel Gateau
da491bc577 Changing the default Intel GPU platform profile from mid to low 2019-07-25 15:02:44 +02:00
sabrina-shanman
3a4ce44633 On second thought, do not expose default octree size scale 2019-07-24 17:32:25 -07:00
luiscuenca
4d9557dfc1
Display version and autoupdate 2019-07-24 17:16:22 -07:00
Shannon Romano
7e91fe9e8b
Merge pull request #15979 from amerhifi/master
fix android local build
2019-07-24 17:04:47 -07:00
sabrina-shanman
772eb57898 Remove broken/undocumented LODManager script features 2019-07-24 16:43:51 -07:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
sabrina-shanman
9d93a2f502 Fix simplifiedUI stuck on wrong LOD value 2019-07-24 16:27:24 -07:00
Roxanne Skelly
5afae43051 CR fix 2019-07-24 16:05:34 -07:00
amer cerkic
5d7286b055 removed change from my master branch, that is getting checked in on separate pr 2019-07-24 16:05:13 -07:00
amer cerkic
db945851ac fixed merge conflict 2019-07-24 16:03:23 -07:00
amer cerkic
c57f60d887 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-07-24 15:55:05 -07:00
amer cerkic
e6dd52d331 Merge branch 'master' into bugz-1029a 2019-07-24 15:53:23 -07:00
amer cerkic
3315271493 reverting commit: 2019-07-24 15:43:31 -07:00
Anthony Thibault
abeba03a7e
Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash
BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash
2019-07-24 15:39:25 -07:00
Roxanne Skelly
fe4334d6c4 BUGZ-829 fix a few nits 2019-07-24 15:33:13 -07:00
Simon Walton
53cf915e8d Guard for AudioInjectorManager existance; clear an audio interface pointer 2019-07-24 14:51:41 -07:00
amer cerkic
bea31237b7 addressing comments 2019-07-24 14:30:43 -07:00
amer cerkic
bae3ebd577 fix android local build 2019-07-24 14:07:58 -07:00
Ryan Huffman
c4b63ed5e4 Fix qmlToScript getting called on script thread and causing crash 2019-07-24 13:44:20 -07:00
luiscuenca
8900c4f2cd
stand up to right location-orientation 2019-07-24 13:29:01 -07:00
luiscuenca
6e4d1bde8e
Fix code and warnings 2019-07-24 13:16:53 -07:00
Roxanne Skelly
783c61500e BUGZ-829 DEV-168 - domain backup/content management improvements
BUGZ-829 - improve error reporting during restore of content

DEV-168 - show last installed archive information
2019-07-24 12:52:06 -07:00
amer cerkic
f94b082946 addressing comment 2019-07-24 11:47:10 -07:00
amer cerkic
ac17493a40 removing comments 2019-07-24 11:37:38 -07:00
amer cerkic
8c022b025d implementing Dante's change to connect the slots 2019-07-24 11:19:32 -07:00