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 |
|
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 |
|
Howard Stearns
|
335119cb58
|
log wakeup (on client and report to DS) during connection on Windows
|
2019-07-08 16:50:36 -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 |
|
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 |
|
luiscuenca
|
6a7b9c0202
|
Delete install directory right before installing and keep a copy of config.json
|
2019-07-05 13:59:35 -07:00 |
|
Brad Hefta-Gaub
|
a4584f9d74
|
Merge pull request #15888 from luiscuenca/WLAllowDrag
BUGZ-706: Allow the launcher window to be moved
|
2019-07-05 13:00:12 -07:00 |
|
Zach Fox
|
243733028b
|
Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch
BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About
|
2019-07-05 12:59:56 -07:00 |
|
Zach Fox
|
afd5da07b0
|
Merge pull request #15892 from zfox23/PALLogSpam
BUGZ-917: Fix log spam in NameCard.qml
|
2019-07-05 12:59:13 -07:00 |
|
Zach Fox
|
38ad93a7ed
|
BUGZ-917: Fix log spam in NameCard.qml due to errant line of code
|
2019-07-05 12:24:05 -07:00 |
|
Zach Fox
|
4223800af7
|
BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About
|
2019-07-05 12:17:28 -07:00 |
|
Zach Fox
|
eb79752455
|
BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users
|
2019-07-05 12:00:17 -07:00 |
|
Sabrina Shanman
|
47a863cb11
|
Merge pull request #15882 from SamGondelman/imagey
BUGZ-661: Fix Image Entity Y flip and Text Entity shutdown crash
|
2019-07-05 11:57:59 -07:00 |
|
luiscuenca
|
a94eb4d44b
|
Allow the launcher window to be moved
|
2019-07-05 11:09:36 -07:00 |
|
Seth Alves
|
708979a30c
|
use the correct gl format when creating the initial platform window
|
2019-07-05 10:48:57 -07:00 |
|
Shannon Romano
|
7b3fa22d0c
|
Merge pull request #15886 from luiscuenca/waitForInterface
BUGZ-874: Don't shut down launcher's splash screen until interface's window is shown
|
2019-07-05 10:31:57 -07:00 |
|
Samuel Gateau
|
1aa067db74
|
address warning
|
2019-07-05 18:54:33 +02:00 |
|
luiscuenca
|
07983cd642
|
Don't shut down launcher until interface window is shown
|
2019-07-05 09:02:34 -07:00 |
|
Sam Gateau
|
11f036246e
|
Implement the ppi scaling in sync with the platform tier
|
2019-07-05 17:52:44 +02:00 |
|
Samuel Gateau
|
6ef652038b
|
EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed
|
2019-07-05 16:15:19 +02:00 |
|
Samuel Gateau
|
9d9b80dec0
|
remove cruft on the win side and live with a crappy ppiDesktop
|
2019-07-05 15:02:51 +02:00 |
|
Samuel Gateau
|
0c26d3ef66
|
clean up etc
|
2019-07-05 13:23:19 +02:00 |
|
Sam Gateau
|
4cc3800384
|
COmprehensive enumeration of gpu and displays from mac
|
2019-07-05 12:26:42 +02:00 |
|
Sam Gateau
|
98f4448813
|
Merge branch 'master' of github.com:highfidelity/hifi into nut
|
2019-07-04 23:24:34 +02:00 |
|
Shannon Romano
|
ab376d59db
|
Merge pull request #15865 from ctrlaltdavid/DOC-105
DOC-105: Pointers JSDoc revision
|
2019-07-04 12:02:52 -07:00 |
|
Samuel Gateau
|
28fddc2fb3
|
full stack for windows
|
2019-07-04 18:13:08 +02:00 |
|
Samuel Gateau
|
12cc69e41c
|
Merge branch 'master' of github.com:highfidelity/hifi into nut
|
2019-07-04 01:56:06 -07:00 |
|
Samuel Gateau
|
8284c8d015
|
doing the full enumeration in windows
|
2019-07-04 01:55:48 -07:00 |
|
David Rowe
|
8fb83e98be
|
Doc review.
|
2019-07-04 20:02:42 +12:00 |
|
SamGondelman
|
ea1b117ca4
|
fix image y flip and text crash
|
2019-07-03 23:14:52 -07:00 |
|
Shannon Romano
|
a87072a23d
|
Merge pull request #15879 from luiscuenca/WLcloseInterface
BUGZ-845: Shut down interface when executing the Windows Launcher
|
2019-07-03 18:06:01 -07:00 |
|
Shannon Romano
|
22e9628e77
|
Merge pull request #15662 from SamGondelman/uber2
DEV-203: Add ability for .slp files to define shader variants
|
2019-07-03 18:03:56 -07:00 |
|
Simon Walton
|
597477614c
|
Debugging for missing Avatar Data
|
2019-07-03 17:51:05 -07:00 |
|
amer cerkic
|
9384c5b3a3
|
testing what happens (for mac specifically) when we specify the focus item to be the root, not NULL as sometimes happens when toggling between modal popups and the main window
|
2019-07-03 16:02:56 -07:00 |
|
luiscuenca
|
dcbb0f5db5
|
Shut down interface when executing the Windows Launcher
|
2019-07-03 15:22:41 -07:00 |
|
Sam Gondelman
|
00441f1899
|
Merge pull request #15875 from SamGondelman/load
BUGZ-910: Return entity load priority operator to proper state after safe landing
|
2019-07-03 14:20:03 -07:00 |
|
amer cerkic
|
e429b7a1e2
|
Merge branch 'master' into bugz-690
|
2019-07-03 14:00:27 -07:00 |
|
Zach Fox
|
86ccb89c0c
|
Merge pull request #15878 from zfox23/SUI/aboutAudio
BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text
|
2019-07-03 13:34:56 -07:00 |
|
Zach Fox
|
1f54f3c159
|
BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text
|
2019-07-03 12:49:23 -07:00 |
|