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
|
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 |
|
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 |
|
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
|
4dfbc489e8
|
Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype
|
2019-07-09 15:40:16 -07:00 |
|
Howard Stearns
|
4191c37f6e
|
indentation
|
2019-07-09 14:48:17 -07:00 |
|
Howard Stearns
|
79a3d45eae
|
new-account wallets in simplified UI
|
2019-07-09 14:25:11 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
Sam Gateau
|
b4e86741e0
|
Adress typo in gpuident and add extra checks on the recommended scale value
|
2019-07-06 01:13:38 +02: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
|
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 |
|
Seth Alves
|
708979a30c
|
use the correct gl format when creating the initial platform window
|
2019-07-05 10:48:57 -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 |
|
Shannon Romano
|
ab376d59db
|
Merge pull request #15865 from ctrlaltdavid/DOC-105
DOC-105: Pointers JSDoc revision
|
2019-07-04 12:02:52 -07:00 |
|
David Rowe
|
8fb83e98be
|
Doc review.
|
2019-07-04 20:02:42 +12: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 |
|
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
|
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 |
|
amer cerkic
|
39fd16fc9e
|
adding a null check escape to the activeItem. On right click back to root window active item becomes null instead of root item
|
2019-07-03 11:05:38 -07:00 |
|
Sam Gateau
|
1a71a63a8b
|
Merge pull request #15867 from SamGondelman/unlit
BUGZ-661: Add unlit property to text entities
|
2019-07-03 18:43:26 +02:00 |
|
Amer
|
f97cde46bf
|
Merge pull request #15868 from amerhifi/bugz-103
case BUGZ-103: HMD Mouse rendering
|
2019-07-03 09:17:23 -07:00 |
|
Anna
|
75c5a99ee2
|
removed secondary camera tone mapping compensation during 360 screenshot
|
2019-07-02 17:59:30 -07:00 |
|
SamGondelman
|
4973563c20
|
return entity load priority operator to proper state
|
2019-07-02 16:29:19 -07:00 |
|
amer cerkic
|
75beb95a97
|
Since switching to system mouse due to eco mode trailing mouse issues, this in turn caused hmd mode to render a blank mouse. Added a mouse setting functionality on activeplugin change lambda so taht when in hmd mode it uses either reticle mouse, if selected, or arrow. Othewise if non hmd use system mouse.
|
2019-07-02 10:31:31 -07:00 |
|
SamGondelman
|
fa416adaf6
|
adding unlit property to text, fixing transparency, normals, other cleanup
|
2019-07-02 10:28:36 -07:00 |
|
Ryan Huffman
|
d29cd796ca
|
Add defaultScriptsOverride option
|
2019-07-01 23:51:34 -07:00 |
|
David Rowe
|
5c29eb04b3
|
Typo
|
2019-07-02 16:19:32 +12:00 |
|
David Rowe
|
c6fd726111
|
Typos etc.
|
2019-07-02 16:12:47 +12:00 |
|
David Rowe
|
b7e92e0994
|
LaserPointers API JSDoc update
|
2019-07-02 16:12:47 +12:00 |
|
David Rowe
|
e109c8f6d3
|
Picks and RayPick API JSdoc updates per Pointers API JSDoc
|
2019-07-02 16:12:47 +12:00 |
|
David Rowe
|
f2cf3bd05c
|
Revise Pointers API JSDoc
|
2019-07-02 16:12:47 +12:00 |
|