Commit graph

8262 commits

Author SHA1 Message Date
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
Simon Walton
9aacd136b8 Add blocking to script unload for client entity-scripts 2019-08-14 13:51:40 -07:00
Zach Fox
a225a009cd BUGZ-1233: Remove keyboard shortcut to LoD tools 2019-08-12 11:27:34 -07:00
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
2019-08-09 17:28:46 -07:00
sabrina-shanman
0d5260bccc More LOD renaming with focus on angles 2019-08-06 16:35:41 -07:00
sabrina-shanman
bc3acfa3c0 Clean up and re-name to reflect what uses octreeSizeScale and what uses
visibilityDistance
2019-08-06 15:46:10 -07:00
Simon Walton
baa586939c Merge branch 'master' into min_threadpool_2 2019-08-06 14:25:37 -07:00
Brad Davis
06ad461c32 PR feedback 2019-08-01 16:57:54 -07:00
Brad Davis
bfe42215aa DEV-279: Add rendering API information to the platform JSON object 2019-08-01 14:29:03 -07:00
Shannon Romano
f29284198c
Merge pull request #15978 from roxanneskelly/bugz829
BUGZ-829 DEV-168 - domain backup/content management improvements
2019-07-29 15:28:49 -07:00
Howard Stearns
6ef0821801 steam gets the oculus store commerce treatment 2019-07-26 12:44:48 -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
Simon Walton
53cf915e8d Guard for AudioInjectorManager existance; clear an audio interface pointer 2019-07-24 14:51:41 -07:00
Andrew Meadows
b0f297e696 wait for SafeLanding to start before starting octreeQuery 2019-07-17 11:22:01 -07:00
Andrew Meadows
05d896f3de fix SafeLanding failure mode when first sequence number not 0 2019-07-17 11:22:01 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving
Case 21663: comfort mode
2019-07-15 14:54:31 -07:00
Shannon Romano
7ea8675e83
Merge pull request #15919 from howard-stearns/mac-sleep-monitor
Mac sleep monitor
2019-07-15 08:39:19 -07:00
Shannon Romano
1bc72a86da
Merge pull request #15911 from amerhifi/bugz-968
case Bugz-968 adding a null check to the display plugin. Possible that display plug…
2019-07-15 08:35:29 -07:00
amerhifi
ba6307e8e4 revert of extra space 2019-07-12 10:55:44 -07:00
amerhifi
f78c1cb5d0 reverting display plugin reset change 2019-07-12 10:54:08 -07:00
Simon Walton
33494d7477 Bump minimum threadpool size to 2 2019-07-12 10:30:52 -07:00
Shannon Romano
74b830dd12
Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen
BUGZ-918: Generate RSA key-pair early in start-up
2019-07-12 09:42:11 -07:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
howard-stearns
cc7214fca3 cleanup 2019-07-11 16:56:35 -07:00
howard-stearns
2eb3fdb1ec Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor 2019-07-11 14:35:00 -07:00
amer cerkic
15e7663ed5 removing the destroy call since its not necessary 2019-07-11 14:27:41 -07:00
amer cerkic
efccd10a65 adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed 2019-07-11 12:15:15 -07:00
PrestonB1123
07c71cbadb disabled P shortcut and re-enabled in metaverse 2019-07-11 12:05:15 -07:00
howard-stearns
8d3dc52ac0 mac sleep monitor checkpoint 2019-07-11 10:58:31 -07:00
Simon Walton
645a99c200 Generate RSA key-pair early in start-up 2019-07-10 17:36:25 -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
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
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
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
amerhifi
84055a6f0d adding focus back on _glWidget 2019-07-08 11:12:50 -07:00
Seth Alves
708979a30c use the correct gl format when creating the initial platform window 2019-07-05 10:48:57 -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
amer cerkic
e429b7a1e2 Merge branch 'master' into bugz-690 2019-07-03 14:00:27 -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
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
Ryan Huffman
d29cd796ca Add defaultScriptsOverride option 2019-07-01 23:51:34 -07:00