f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes."
2020-01-16 18:51:49 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
...
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
Kasen IO
336b5e275b
Removed obsolete default scripts + more branding changes.
2020-01-12 23:13:01 -05:00
kasenvr
1d14bed3ce
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
...
QML Whitelisting
2019-12-30 19:51:51 -05:00
kasenvr
9dc7f54bfd
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
...
Feature/quality of life k2
2019-12-29 18:28:58 -05:00
Nex-Pro
4856dd07fc
Update interface window title
...
Change window title from "High Fidelity" to "Project Athena"
2019-12-25 00:20:36 +00:00
Kasen IO
c34cd996df
change Metaverse API from setting
2019-12-20 11:39:05 +01:00
David Rowe
e13b237e96
Add missing Controller.Hardware.Application camera properties' JSDoc
2019-12-19 11:23:36 +13:00
Fluffy Jenkins
0f3e8d2101
Made requested changes
2019-12-18 20:08:20 +00:00
Kasen IO
d4c3504c8d
Updated about dialog (old logo still there), application name, and readme.md
2019-12-14 23:12:54 -05:00
Fluffy Jenkins
82dc6d197a
New feature
2019-12-14 03:02:13 +00:00
Brad Hefta-Gaub
bb68f92d3e
Merge pull request #16562 from ctrlaltdavid/DEV-2442
...
DEV-2442: Fix main gamepad (XBox controller) controls
2019-12-13 13:36:20 -08:00
Brad Hefta-Gaub
f8a9789f86
Merge pull request #16499 from HifiExperiments/proceduralMesh
...
Procedural vertex shaders
2019-12-13 13:00:01 -08:00
HifiExperiments
0bd5e15b47
fix non-procedural material entity crash
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-13 02:17:52 -05:00
HifiExperiments
6e961b9f2f
procedural vertex shaders
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 22:49:48 -05:00
HifiExperiments
2eb0ec18fc
fix non-procedural material entity crash
2019-12-11 00:42:59 -08:00
Seth Alves
f97c3217a5
allow Linux interface to connect to domain when DISABLE_QML is true
2019-12-10 09:52:12 -08:00
Kasen IO
68443f878b
Update Application.cpp
...
updated application name.
2019-12-09 18:06:33 -05:00
David Rowe
96e21343bf
Selfie view menu option isn't present in HMD mode
2019-12-08 12:38:48 +13:00
David Rowe
aabf27955b
Fix camera view cycling getting stuck in non-existent fullscreen mirror
2019-12-08 12:38:48 +13:00
Kasen IO
6976939ff4
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-04 13:42:20 -05:00
Kasen IO
245224f0e9
Updated readme.md again + updated application title again.
2019-12-04 13:39:22 -05:00
Kasen IO
2cf453432e
Updated readme.md + updated application title.
2019-12-04 11:50:01 -05:00
Kasen IO
165eb16f93
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 20:04:32 -05:00
Kasen IO
872a0b4496
Updated application version to 86.
2019-12-01 20:04:00 -05:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05:00
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom
2019-11-18 11:33:31 -07:00
HifiExperiments
b73a608094
procedural vertex shaders
2019-11-15 00:22:40 -08:00
Zach Fox
5229b0c0f3
Various cleanup and CR
2019-11-14 15:45:52 -08:00
Zach Fox
b4135e2655
We are so close...
2019-11-13 17:35:57 -08:00
Kalila R
a7b2c3a32c
Updated application name and version.
2019-11-11 20:22:19 -05:00
milad
c6f7c058bc
merging master
2019-11-05 17:30:09 -08:00
HifiExperiments
bae2ba7bae
merge with master
2019-11-02 01:08:56 -07:00
MiladNazeri
676e7bd5b8
Merge branch 'master' into screenshareElectronApp
2019-10-31 13:11:56 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
...
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Zach Fox
47b3fdbfe3
Stop screenshare process on interface shutdown
2019-10-31 10:01:00 -07:00
milad
ea373ac14c
First steps towards a screenshare app
2019-10-30 16:44:42 -07:00
HifiExperiments
deb5aacfad
fix materialcachescriptinginterface
2019-10-25 18:16:08 -07:00
Shannon Romano
15f27e53cb
Merge pull request #16372 from ctrlaltdavid/DEV-2055
...
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
2019-10-24 15:20:34 -07:00
HifiExperiments
1e100a672e
merge with master and try to fix opacity mode stuff
2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7
Merge branch 'master' into feature/arkit-blendshapes
2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI
...
DEV-2285: Improve eyes look at
2019-10-23 20:42:27 -07:00
David Rowe
378c47d16c
Replace world detail quality float with enum
2019-10-22 19:18:11 +13:00
luiscuenca
a4fcb2c39e
Add eyesLookAtTarget set/get API methods
2019-10-21 14:31:15 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls
2019-10-17 15:06:12 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode
2019-10-17 13:26:42 -07:00
Shannon Romano
95f00e2caa
Merge pull request #16362 from huffman/fix/mac-early-exit
...
DEV-830: Remove call to processEvents on Mac in ~Application
2019-10-16 22:22:58 -07:00
Ryan Huffman
e83ac8c0dd
Remove call to processEvents on Mac in ~Application
2019-10-16 16:14:27 -07:00
Anthony J. Thibault
da0911e01b
Delete legacy blendshape code
...
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36:37 -07:00
luiscuenca
93a1adc736
Fix camera position in first person
2019-10-15 18:25:33 -07:00
Ken Cooke
ec67b67966
On waking from sleep/hibernate, restart the audio devices
2019-10-10 14:10:47 -07:00
Brad Davis
960cab9994
Qt 5.13 warnings & fixes
2019-10-08 15:40:13 -07:00
luiscuenca
059bcc10cc
merge master
2019-10-02 13:24:32 -07:00
Maia Hansen
220123ff3b
Merge pull request #16254 from kencooke/macos-appnap-disabler
...
BUGZ-1117: On Mac OS, disable App Nap to prevent audio glitches
2019-10-01 10:53:03 -07:00
luiscuenca
0fac1e134f
Allow avatar look at when in first person camera
2019-09-30 16:43:02 -07:00
Shannon Romano
e8f1eecc5b
Merge pull request #16258 from samcake/yellow
...
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
2019-09-30 16:36:24 -07:00
Brad Davis
403499bf32
Cleaning up android build warnings
2019-09-27 09:19:52 -07:00
Ken Cooke
ae62b96f67
On Mac OS, disable App Nap to prevent audio glitches while running in the background
2019-09-26 08:52:35 -07:00
Sam Gateau
ba11c3e702
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-25 17:54:21 -07:00
Clement
96b58756b1
Add flag for account settings feature
2019-09-24 16:50:10 -07:00
Sam Gateau
483a716839
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-23 10:19:45 -07:00
Sam Gateau
3c2809b9ed
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2019-09-21 08:52:13 -07:00
Clement
1ca30b688d
Put flush timer on right thread without parenting
2019-09-20 15:39:35 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera
...
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
2019-09-20 13:03:03 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings
2019-09-19 17:30:01 -07:00
luiscuenca
279e25ca70
Merge master
2019-09-19 13:21:49 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json
2019-09-19 10:45:20 -07:00
Sam Gateau
819c942056
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-19 09:01:19 -07:00
Clement
527b27b32d
Make sure the flush timer is not spawned too early
2019-09-18 17:05:05 -07:00
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at
2019-09-18 17:00:10 -07:00
Shannon Romano
e7001c3f1b
Merge pull request #16157 from sethalves/vive-pro-groundwork
...
DEV-605: Vive pro groundwork
2019-09-18 16:36:12 -07:00
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
