Sam Gateau
381fc5146f
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-17 18:08:09 -07:00
Sam Gateau
c0660329a3
Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family
2019-09-17 18:06:08 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus
2019-09-17 17:15:16 -07:00
Seth Alves
a288c0a52d
remove old/unused eyetracker code.
2019-09-17 09:43:21 -07:00
Sam Gateau
60045f4783
Replacing key combination to trigger a frame capture
2019-09-16 17:48:30 -07:00
luiscuenca
7c7c3cd223
merge master
2019-09-11 14:07:19 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API
2019-09-10 18:10:02 -07:00
luiscuenca
78eee5961c
Fix key mapping for new camera
2019-09-05 18:05:46 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera
2019-09-05 17:04:39 -07:00
humbletim
271fac4bca
Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge
2019-09-05 09:46:21 -04:00
HifiExperiments
97b9179144
merge with master
2019-09-05 00:46:56 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365
...
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
2019-08-30 13:10:09 -07:00
Brad Davis
6aa967f29f
fixing test code
2019-08-29 14:11:22 -07:00
Brad Davis
428a58710d
BUGZ-1365: Ensure that by default web views can't access local content
2019-08-29 13:44:49 -07:00
Shannon Romano
3695a5e633
Merge pull request #16105 from amerhifi/bugz-186
...
CASE DEV-186: HQ Launcher/Interface Icons and wording need to be standardized
2019-08-28 15:58:10 -07:00
amerhifi
335dea43df
changing app name to high fidelity and changing icons to the new logo
2019-08-27 20:08:21 +02:00
Shannon Romano
3134332513
Merge pull request #16098 from hyperlogic/feature/backtrace-shutdown-flag
...
Added "shutdown" crash annotation and crash menu option
2019-08-27 10:57:07 -07:00
Anthony J. Thibault
e98cdab294
Moved CrashHelper.h include to the appropriate place.
2019-08-26 17:05:08 -07:00
Bradley Austin Davis
07ee9e901f
Merge pull request #16099 from jherico/fix/wake_crash
...
BUGZ-1264: Support platform independent sleep/wake notifications
2019-08-26 16:20:50 -07:00
Brad Davis
e1bf3f2540
PR feedback
2019-08-26 11:51:33 -07:00
Zach Fox
497edf6068
Add a comment
2019-08-26 09:03:10 -07:00
Brad Davis
dfd78a2662
Support platform independent sleep/wake notifications
2019-08-24 13:16:48 -07:00
Anthony J. Thibault
d410cb4fda
Added "shutdown" crash annotation and crash menu option
2019-08-24 11:12:28 -07:00
Zach Fox
dfcf70b9b5
Tons of Emote/Emoji changes
2019-08-23 14:14:53 -07:00
Andrew Meadows
32400a6baf
improved isStuck detection and MyAvatar::safeLanding() trigger
2019-08-20 17:33:29 -07:00
Ryan Huffman
8097ecef11
Fix cmd-leftclick not working correctly on Mac OS
...
On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to
be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only
on Mac, the MouseButtonRelease event for these mouse presses are sent to the top
level QWidgetWindow, but are not propagated further. The change here gets around
this problem by capturing these pseudo-RightClicks, and re-emitting them as
"pure" RightClicks.
2019-08-19 15:53:20 -07:00
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
Kalila R
28b27a1e48
Merge branch 'v0.83.0-rc' into kasen/core
2019-08-03 15:27:23 -04: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
humbletim
058c81aa1a
Merge branch 'hifi-master' into kpi-v1-modkit-rc
2019-07-26 01:36:52 -04:00
humbletim
d334a2e5e2
QML-only write access for 'private/' Settings keys
2019-07-26 01:32:01 -04: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
kasenvr
e9e9607a3b
modkit core changes initial commit
...
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
2019-07-14 21:35:13 -04:00
SamGondelman
60600779c9
merge with master
2019-07-12 11:01:17 -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
Anthony Thibault
6c66f5a37b
Fix for DependencyManager crash on shutdown on Mac
...
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.
However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early. Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.
To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.
However, this is only a speculative fix, because this is so difficult to reproduce.
2019-07-01 17:37:57 -07:00
Andrew Meadows
4bbfd7cad1
more correct bounding sphere around avatar for SafeLanding query
2019-07-01 15:53:42 -07:00
Andrew Meadows
0d8fdf51c5
fix safe landing to load proper set of objects
2019-07-01 14:18:19 -07:00
Shannon Romano
7ff751567b
Merge pull request #15848 from jherico/fix/dev-175-source
...
DEV-175: QML content URL validation, whitelist trusted sources
2019-06-28 14:18:56 -07:00
Sabrina Shanman
0b6dfe3f7c
Merge pull request #15846 from AndrewMeadows/avoid-SafeLanding-event-flood
...
BUGZ-868: Avoid SafeLanding signal-slot connection resource leak
2019-06-28 13:29:31 -07:00
Brad Davis
8bcde84d89
Disable remote QML unless whitelisted
2019-06-27 16:37:56 -07:00
Andrew Meadows
bf068a3211
fix SafeLanding start/stop on entity-server connection flow
2019-06-27 11:33:51 -07:00
Andrew Meadows
dfb7ac7044
name changes and improved flow for SafeLanding logic
2019-06-27 08:14:34 -07:00
Andrew Meadows
00185ee82e
cleaup to help unravel one spaghetti strand
2019-06-26 17:05:44 -07:00
Andrew Meadows
496a7f3608
less cruft, more readable
2019-06-26 16:02:00 -07:00
Andrew Meadows
46b3d84be5
remove unused cruft
2019-06-26 15:41:50 -07:00
Andrew Meadows
355de0e6d5
move Application::setFailedToConnect() to cpp for easier debugging
2019-06-26 15:41:01 -07:00
SamGondelman
5937a219dd
wait on thread pool threads
2019-06-26 15:25:17 -07:00
SamGondelman
9c1b139d5f
merge with master
2019-06-25 23:46:39 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh
2019-06-24 10:16:45 -07:00
Sam Gateau
35d7211aca
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-21 11:38:33 -07:00
Sam Gateau
a856fdb3ca
getting rid of the resolution Scale on the display plugin
2019-06-21 10:36:25 -07:00
amer cerkic
67e42148ef
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-06-21 09:43:33 -07:00
Sam Gateau
69bb9ac0b6
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-20 22:23:15 -07:00
Sam Gateau
22cd631a04
Merge And Modifying the Graphics settings and the dev menu
2019-06-20 17:48:36 -07:00
amer cerkic
1218f7e014
moved audioclient stop to dtor
2019-06-20 15:10:21 -07:00
Andrew Meadows
cd9b450475
re-expose mic and camera to disable crash
2019-06-20 15:03:15 -07:00
Kalila R
500e089e44
Updated version no. to 0.83.0
2019-06-20 16:56:03 -04:00
Sam Gateau
b5e4a47375
Proper allocation of the resource in forward and starting to remove the ui as we have it
2019-06-19 17:33:26 -07:00
Andrew Meadows
eee52deefe
destroy WebSurfaces on shutdown
2019-06-12 16:07:15 -07:00
Shannon Romano
453085f992
Merge pull request #15741 from huffman/feat/set-and-get-bookmarks
...
BUGZ-484: Add --setBookmark and getAddress API
2019-06-11 15:31:41 -07:00
Ryan Huffman
a1b7392854
Add --setBookmark and getAddress API
2019-06-11 14:10:09 -07:00
dante ruiz
01fab12942
fixing interface and laucnher script argument
2019-06-11 09:18:20 -07:00
SamGondelman
37feb7f027
merge with master
2019-06-10 10:29:39 -07:00
Shannon Romano
69094aa8f3
Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix
...
BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()
2019-06-10 10:12:26 -07:00
Shannon Romano
e213fd6b5e
Merge pull request #15712 from amerhifi/master
...
case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef
2019-06-07 18:59:34 -07:00
Ken Cooke
9d57f5ac62
Defer DependencyManager::destroy<AudioInjectorManager>() until all ScriptAudioInjectors have been destroyed
2019-06-07 18:35:39 -07:00
PrestonB1123
059d931d17
Merge pull request #15711 from PrestonB1123/removingShortcuts
...
DEV-108: Removed ctrl+b and ctrl+n as shortcuts
2019-06-07 16:26:38 -07:00
amer cerkic
b57e4869c8
removed debug info
2019-06-07 16:26:21 -07:00
amer cerkic
da071abd8b
wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist
2019-06-07 16:25:04 -07:00
Preston Bezos
a0753f6393
removed ctrl+b and ctrl+n as shortcuts
2019-06-07 15:41:44 -07:00
amer cerkic
f2c6cb79f7
if formatting
2019-06-07 14:17:49 -07:00
amer cerkic
fd7dd7948f
reverted vs spacing changes
2019-06-07 13:41:14 -07:00
amerhifi
b1df463f56
disabling dde initialization due to random crashes while closing down the socket connection on mac
2019-06-07 10:16:36 -07:00
Seth Alves
06436e6a7d
quiet build warning
2019-06-04 13:00:26 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh
2019-06-04 09:56:25 -07:00
Sam Gateau
2a4d0cfaec
Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset
2019-06-03 18:06:28 -07:00
Sam Gateau
db04f61c5b
Merge branch 'master' of github.com:highfidelity/hifi into nut
2019-06-03 09:37:13 -07:00
Sam Gateau
54d1705f06
Testing a different approach
2019-05-31 18:42:26 -07:00
Sam Gondelman
d94b685c94
Merge pull request #15661 from SamGondelman/avatarCrash
...
BUGZ-478: Fix address manager crash
2019-05-31 16:01:07 -07:00
SamGondelman
e29bf376a4
fix address manager crash
2019-05-31 14:01:58 -07:00
sabrina-shanman
fa79d0ec18
Fix Application not checking window minimize state properly
2019-05-31 11:36:52 -07:00
Sam Gateau
b88deb52b0
Cleaning up the interface for the Performance PRESET and the associated debug ui
2019-05-30 12:03:44 -07:00
Sam Gateau
bf7617ea8e
INtroducing the PerformanceManager
2019-05-29 15:47:14 -07:00
Shannon Romano
d065847bee
Merge pull request #15638 from samcake/nut
...
case BUGZ-191: Implement patform tier profile from platform description
2019-05-28 15:28:05 -07:00
Sam Gateau
546639fdfe
Adding a script and ui to check the values returned by the PlatformInfo ui
2019-05-26 12:30:50 -07:00
Andrew Meadows
5988f8cce6
avoid calling removeOwnershipData() from multiple threads
2019-05-24 16:12:21 -07:00
luiscuenca
050682c84c
Keep logged in after first run
2019-05-23 19:53:37 -07:00
luiscuenca
42c1f4be33
fix typo and entry on first run when --url is set
2019-05-23 17:07:06 -07:00
luiscuenca
8db3d03772
add display name as param
2019-05-23 10:21:47 -07:00
Sam Gondelman
a7842fe3ea
Merge branch 'master' into proceduralMesh
2019-05-21 09:51:33 -07:00
Howard Stearns
f1e8343b30
put DomainServerCheckIn on NodeList thread
2019-05-17 14:30:30 -07:00
SamGondelman
6d3e23a7fe
merge with master
2019-05-16 20:03:10 -07:00
Sam Gateau
ffbe055fa8
Merge pull request #15569 from SamGondelman/switch
...
BUGZ-187: Proper Render Scripting Interface with renderMethod property
2019-05-16 18:29:18 -07:00
SamGondelman
283cc18269
Merge remote-tracking branch 'upstream/master' into proceduralMesh
2019-05-16 16:33:16 -07:00
Brad Hefta-Gaub
1ac1735d55
Merge pull request #14533 from SamGondelman/oculusHome
...
Case 22439: Fix HMD auto switch detection
2019-05-16 16:26:04 -07:00
SamGondelman
451c52fa47
merge with master
2019-05-16 16:02:52 -07:00
SamGondelman
fee20d9e46
render scripting interface + renderMethod control
2019-05-16 16:01:21 -07:00
Sam Gateau
6b3707873b
Merge pull request #15562 from jherico/bugz-133
...
BUGZ-133: Expose additional functionality to QML/Scripts
2019-05-16 12:03:22 -07:00
Brad Davis
9bcc23f0c4
PR comments
2019-05-16 09:40:22 -07:00
SamGondelman
da254c2ccc
(¬‿¬)
2019-05-15 23:48:04 -07:00
Brad Davis
5db78ef2e1
Add scripting to set the refresh rate
2019-05-15 12:55:25 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI
...
Simplified UI v1
2019-05-14 17:45:30 -07:00
Roxanne Skelly
68fb43ec7f
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-14 10:11:02 -07:00
