Commit graph

79638 commits

Author SHA1 Message Date
howard-stearns
8d3dc52ac0 mac sleep monitor checkpoint 2019-07-11 10:58:31 -07:00
Amer
4c145386e5
Merge pull request #15899 from amerhifi/bugz-907
Case bugz-907: On launch default to non hmd device
2019-07-10 16:03:29 -07:00
Howard Stearns
084b2edad4
Merge pull request #15908 from SimonWalton-HiFi/keygen-thread-logging
BUGZ-918: Verbose RSA-keypair logging
2019-07-10 15:57:30 -07:00
Howard Stearns
7eaa29c147
Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui
new-account wallets in simplified UI
2019-07-10 15:09:59 -07:00
Simon Walton
7a64ed10f6 Verbose RSA-keypair logging 2019-07-10 15:08:51 -07:00
amer cerkic
e463a828ef removed extra line 2019-07-10 14:09:51 -07:00
amer cerkic
bc51b8e709 removed extra space 2019-07-10 14:08:20 -07:00
amer cerkic
fc21f6088a undoing code structures changes to else blocks 2019-07-10 14:07:10 -07:00
Zach Fox
ebfbe46760
Merge pull request #15907 from zfox23/moveSimplifiedUIJS
DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts
2019-07-10 13:52:19 -07:00
Zach Fox
712d608c15 Better logic in bootstrapper to not load alread running scripts 2019-07-10 13:23:50 -07:00
Zach Fox
85b563461a DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts 2019-07-10 12:06:08 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts
DEV-164: Add defaultScriptsOverride option
2019-07-10 10:16:55 -07:00
Zach Fox
57c820f42f
Merge pull request #15897 from zfox23/SUI/emoteAppPrototype
Implement DEV-218 & DEV-219 and commit a starting point for the Emote app
2019-07-10 09:53:09 -07:00
Shannon Romano
c7e8aa141c
Merge pull request #15902 from luiscuenca/WLShowProgress
DEV-179: Windows Launcher progress indicator
2019-07-09 17:55:35 -07:00
Shannon Romano
fcd29d686b
Merge pull request #15900 from danteruiz/launcher-progress-indicator
DEV-180: Lilypad Launcher: (Mac) Launcher progress indicator
2019-07-09 17:53:39 -07:00
luiscuenca
ea94e0f637
No trace 2019-07-09 16:36:06 -07:00
luiscuenca
25c4ad76be
Fix set process 2019-07-09 16:34:32 -07:00
luiscuenca
ec63684866
Fix bar draw and catch incomplete install 2019-07-09 16:08:45 -07:00
dante ruiz
996a2f0888 remove comment 2019-07-09 15:47:05 -07:00
Zach Fox
4dfbc489e8 Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype 2019-07-09 15:40:16 -07:00
Shannon Romano
4bc5282039
Merge pull request #15903 from RebeccaStankus/createAgain
BUGZ 951-952 Fix create for HMD
2019-07-09 15:31:56 -07:00
dante ruiz
1741b9a91b remove prints 2019-07-09 14:49:08 -07:00
Howard Stearns
4191c37f6e indentation 2019-07-09 14:48:17 -07:00
dante ruiz
8819a37712 making updates 2019-07-09 14:44:40 -07:00
Howard Stearns
79a3d45eae new-account wallets in simplified UI 2019-07-09 14:25:11 -07:00
luiscuenca
c5156780ca
Fix bug when enter is pressed and add uninstall progress 2019-07-09 14:02:23 -07:00
RebeccaStankus
169b15c985 Merge branch 'master' of github.com:highfidelity/hifi into createAgain 2019-07-09 13:03:08 -07:00
RebeccaStankus
714a3f6b08 Fixed path to tabletAssetServer in HMD, simplifiedUI system folder 2019-07-09 13:02:54 -07:00
luiscuenca
9f110cac13
Add progress bar 2019-07-09 12:20:09 -07:00
amer cerkic
09ecb49e5b --no-launcher is the launcher override for interface. if app is launched with the args, the first run is bypassed and default display device will always be desktop. not hmd 2019-07-09 11:39:42 -07:00
dante ruiz
15cc7a0e6c finished work 2019-07-09 10:43:46 -07:00
amer cerkic
45b339a6c7 removing comment 2019-07-09 09:35:58 -07:00
amer cerkic
d04a06e757 changing the default fallback to non hmd device 2019-07-09 09:33:44 -07:00
Howard Stearns
7aef864d7f
Merge pull request #15898 from howard-stearns/log-windows-wakeup
log wakeup (on client and report to DS) during connection on Windows
2019-07-09 09:29:57 -07:00
Amer
749a78680d
Merge pull request #15877 from amerhifi/bugz-690
case BUGZ-690 & BUGZ382 : adding a null check escape to the activeItem. On right click back to …
2019-07-09 09:17:30 -07:00
Zach Fox
d622e53458 Some comments; changed the code to be backwards compatible 2019-07-08 17:10:11 -07:00
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
Zach Fox
5048b8bd89 Implement DEV-218 & DEV-219 and commit a starting point for the Emote app 2019-07-08 16:46:58 -07:00
Shannon Romano
9474ca29f5
Merge pull request #15893 from luiscuenca/WLKeepConfigWhenESC
BUGZ-768: Keep config.json when updating to avoid relogin.
2019-07-08 15:26:02 -07:00
Shannon Romano
31582cf857
Merge pull request #15887 from sethalves/set-default-gl-format
BUGZ-926: use the correct gl format when creating the initial platform window
2019-07-08 14:03:43 -07:00
Jamil Akram
aa82c4e971
Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements
Idles talks locomotion improvements
2019-07-08 13:30:51 -07:00
amerhifi
84055a6f0d adding focus back on _glWidget 2019-07-08 11:12:50 -07:00
amer cerkic
386d945eeb Merge branch 'master' into bugz-690 2019-07-08 09:28:28 -07:00
Brad Hefta-Gaub
3108b69e5f
Merge pull request #15881 from SimonWalton-HiFi/cyan-sphere-debugging
BUGZ-781: Additional debugging for dropped avatar data
2019-07-08 09:14:13 -07:00
Shannon Romano
cc57e92a81
Merge pull request #15890 from zfox23/SUI/noAutoLOD
BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users
2019-07-08 07:57:55 -07:00
dante ruiz
a5f9283bde almost done 2019-07-06 11:46:40 -07:00
Sam Gateau
f2cda426d8
Merge pull request #15884 from samcake/nut
BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier
2019-07-06 02:18:11 +02:00
Zach Fox
c0e8bc9080
Merge pull request #15894 from RebeccaStankus/fixCreate
BUGZ 915 Create does not work in HMD
2019-07-05 17:05:28 -07:00
RebeccaStankus
352f9590b1 Fixed Qt.resolvedUrl format 2019-07-05 16:23:29 -07:00
Sam Gateau
b4e86741e0 Adress typo in gpuident and add extra checks on the recommended scale value 2019-07-06 01:13:38 +02:00