Sam Gateau
60045f4783
Replacing key combination to trigger a frame capture
2019-09-16 17:48:30 -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
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
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
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
