sabrina-shanman
772eb57898
Remove broken/undocumented LODManager script features
2019-07-24 16:43:51 -07:00
sabrina-shanman
9d93a2f502
Fix simplifiedUI stuck on wrong LOD value
2019-07-24 16:27:24 -07:00
amer cerkic
db945851ac
fixed merge conflict
2019-07-24 16:03:23 -07:00
amer cerkic
3315271493
reverting commit:
2019-07-24 15:43:31 -07:00
Anthony Thibault
abeba03a7e
Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash
...
BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash
2019-07-24 15:39:25 -07:00
Simon Walton
53cf915e8d
Guard for AudioInjectorManager existance; clear an audio interface pointer
2019-07-24 14:51:41 -07:00
amer cerkic
bea31237b7
addressing comments
2019-07-24 14:30:43 -07:00
Ryan Huffman
c4b63ed5e4
Fix qmlToScript getting called on script thread and causing crash
2019-07-24 13:44:20 -07:00
luiscuenca
8900c4f2cd
stand up to right location-orientation
2019-07-24 13:29:01 -07:00
luiscuenca
6e4d1bde8e
Fix code and warnings
2019-07-24 13:16:53 -07:00
amer cerkic
f94b082946
addressing comment
2019-07-24 11:47:10 -07:00
amer cerkic
ac17493a40
removing comments
2019-07-24 11:37:38 -07:00
amer cerkic
8c022b025d
implementing Dante's change to connect the slots
2019-07-24 11:19:32 -07:00
luiscuenca
015d1951fc
Add sitting clip node
2019-07-24 10:44:33 -07:00
amer cerkic
ddc678bbc0
added interactivewindow proxy. moved event bridge binding to the proxy instead
2019-07-23 16:57:53 -07:00
luiscuenca
e7e864121f
Merge branch 'master' into avatarSitAPI
2019-07-23 14:22:42 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar
2019-07-23 14:20:54 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
...
Initial version of Avatar Reaction API
2019-07-23 13:13:31 -07:00
jennaingersoll
1e84b3f4a2
Merge pull request #15951 from ctrlaltdavid/DOC-122
...
DOC-122: LocationBookmarks JSDoc
2019-07-23 12:00:03 -07:00
David Rowe
8c92f972e5
Merge branch 'master' into DOC-124
...
# Conflicts:
# interface/src/scripting/Audio.h
2019-07-23 12:53:35 +12:00
David Rowe
3b2bb65c77
Tidy MyAvatar API's animation debug graphics methods' JSDod
2019-07-23 12:42:41 +12:00
David Rowe
6b80a27258
Tidy Audio API's gain properties etc. JSDoc
2019-07-23 11:26:48 +12:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102
...
DOC-102: Overlays JSDoc Update
2019-07-22 16:24:53 -07:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121
...
DOC-121: AvatarBookmarks JSDoc
2019-07-22 15:43:57 -07:00
David Rowe
1e8a205275
Fix typo
2019-07-23 10:30:10 +12:00
Shannon Romano
6d0ba98bfc
Merge pull request #15953 from ctrlaltdavid/DOC-123
...
DOC-123: AvatarInputs JSDoc
2019-07-22 15:21:50 -07:00
Shannon Romano
d719952022
Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor
...
BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input
2019-07-22 15:06:35 -07:00
David Rowe
a36bcbb2ed
Doc review
2019-07-23 07:36:11 +12:00
David Rowe
ddffb8ab9a
Doc review
2019-07-23 07:25:34 +12:00
jennaingersoll
abe1ce288c
Merge pull request #15926 from ctrlaltdavid/DOC-115
...
DOC-115: Comfort mode JSDoc
2019-07-22 10:46:11 -07:00
David Rowe
6d7b6f3e0a
AvatarInputs JSDoc
2019-07-20 10:19:22 +12:00
David Rowe
3a3bfd1463
Doc review
2019-07-20 09:39:34 +12:00
David Rowe
0a32386f45
Merge branch 'master' into DOC-102
2019-07-20 09:13:52 +12:00
Zach Fox
d62dde1ab8
Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection
...
Fix BUGZ-1062: Set the correct Settings value for bubble tools
2019-07-19 11:51:59 -07:00
Zach Fox
510c922912
Fix BUGZ-1062: Set the correct Settings value for bubble tools
2019-07-19 11:34:14 -07:00
David Rowe
9165a04641
Typo and improvement
2019-07-19 11:41:12 +12:00
David Rowe
c2b67f28d0
LocationBookmarks JSDoc
2019-07-19 11:35:06 +12:00
David Rowe
cf9e563458
Miscellaneous JSDoc fixes noticed in passing
2019-07-19 08:37:10 +12:00
David Rowe
a04da70f16
AvatarBookmarks JSDoc
2019-07-19 08:36:45 +12:00
Andrew Meadows
dcf3df68f2
avoid NaN input for MyAvatar's scripted motor
2019-07-18 10:58:41 -07:00
Andrew Meadows
7b7414dead
revert optimization that would skip read from packet
2019-07-17 17:04:12 -07:00
Anthony Thibault
ecae92724e
Added reaction api
2019-07-17 14:28:39 -07:00
Andrew Meadows
63b3d666f9
simplify rollover logic for SafeLanding sequence size calculation
2019-07-17 13:57:08 -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
d49fabf370
Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill
...
BUGZ-781: Remove loading-orb upon killing of avatar
2019-07-16 15:31:37 -07:00
dante ruiz
e896a53113
fix interactive crash
2019-07-15 17:18:38 -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
Simon Walton
e259aa55c2
Remove loading-orb upon killing avatar, in case destructor isn't called
2019-07-15 14:14:24 -07:00
Shannon Romano
a64bc7f638
Merge pull request #15761 from danteruiz/fix-interactive-window-crash
...
BUGZ-400: Crash in Application::notify
2019-07-15 11:35:15 -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
09729fb430
Merge pull request #15918 from zfox23/newGraphicsSettings
...
New Settings -> Graphics... dialog for Classic UI users
2019-07-15 08:38:01 -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
Shannon Romano
8ce64d95ab
Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux
...
BUGZ-863: wait for objects to be added to physics before completing SafeLanding
2019-07-15 08:34:17 -07:00
David Rowe
8a82ea55c7
HMD API vision squeeze properties JSDoc
2019-07-13 10:39:40 +12:00
dante ruiz
d78661a47f
redo requested work
2019-07-12 13:34:08 -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
Howard Stearns
7ce6dd71d5
fix comment
2019-07-12 10:48:05 -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
Shannon Romano
3e70f4f51c
Merge pull request #15671 from SamGondelman/uber
...
DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer
2019-07-12 09:39:33 -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
Dante Ruiz
2f74f8253f
finishing requested changes
2019-07-11 15:39:59 -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
SamGondelman
22a7a97a9a
fix forward web + parabola blending
2019-07-11 12:23:04 -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
Zach Fox
ce2b7e5baa
Finish all of the logic and most of the layout
2019-07-11 12:05:13 -07:00
howard-stearns
8d3dc52ac0
mac sleep monitor checkpoint
2019-07-11 10:58:31 -07:00
Zach Fox
2471a3eb72
Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings
2019-07-11 09:02:42 -07:00
SamGondelman
d545ba5bc6
haze on most entities, working on skybox
2019-07-10 23:52:50 -07:00
David Rowe
2cb3425740
Merge branch 'master' into DOC-102
2019-07-11 16:38:23 +12:00
David Rowe
a45d8924fa
Miscellaneous minor JSDoc fixes noticed in passing
2019-07-11 16:31:09 +12:00
David Rowe
46c81b268a
Typos and inconsistencies
2019-07-11 16:29:56 +12:00
David Rowe
e1f181e8ee
Update Overlays events and signals JSDoc
2019-07-11 16:15:24 +12:00
David Rowe
42bee63f52
Update Overlays methods JSDoc
2019-07-11 15:33:45 +12:00
dante ruiz
c4a0b39068
requested changes
2019-07-10 17:56:54 -07:00
Simon Walton
645a99c200
Generate RSA key-pair early in start-up
2019-07-10 17:36:25 -07:00
Zach Fox
4caa00d6cc
Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface
2019-07-10 16:42:48 -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
Andrew Meadows
1a5a925a4c
fix a typo
2019-07-10 14:18:34 -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
dante ruiz
7c024b4e8a
fix interactive window crash
2019-07-10 11:49:36 -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
Andrew Meadows
2da0714e36
comments and more readable code
2019-07-09 15:51:56 -07:00
Andrew Meadows
1bfd5386a9
restore entity->requestRenderUpdate() in SafeLanding::updateTracking()
2019-07-09 15:51:56 -07:00
Andrew Meadows
520c62f6f6
wait for objects added to physics before stop SafeLanding
2019-07-09 15:51:56 -07:00
Zach Fox
4dfbc489e8
Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype
2019-07-09 15:40:16 -07:00
SamGondelman
bd2003fa01
Merge remote-tracking branch 'upstream/master' into uber
2019-07-09 13:45:14 -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
SamGondelman
41e8a08484
Merge remote-tracking branch 'upstream/master' into uber
2019-07-08 23:00:36 -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
David Rowe
9f4c657bc3
Update Overlays properties JSDoc
2019-07-06 12:12:33 +12: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
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
SamGondelman
8b9fcd43b1
merge with master
2019-07-03 17:58:23 -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
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
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
David Rowe
c70d2c006f
Revise organization of Overlays types and properties JSDoc per Entities
2019-07-03 14:25:11 +12: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
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
Zach Fox
73db19464f
DEV-194: Iterate on PTT Ducking Slider design
2019-07-01 11:28:48 -07:00
Shannon Romano
89f654175c
Merge pull request #15856 from PrestonB1123/defaultShortcuts
...
DEV-173: Re-enable shortcuts
2019-06-28 15:29:53 -07:00
Preston Bezos
1315677aec
fixed doc and removed log spam
2019-06-28 15:02:33 -07:00
Preston Bezos
d1470d3323
readded ctrl+n and ctrl+b as shortcuts with a default script
2019-06-28 14:33:03 -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 Hefta-Gaub
8082ff8529
Merge pull request #15850 from zfox23/PTTAttenuationOption
...
BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option
2019-06-28 11:08:11 -07:00
Brad Davis
e3393a8ee5
Apply URL validation to top level window QML
2019-06-28 10:43:03 -07:00
Shannon Romano
67901166ba
Merge pull request #15851 from ctrlaltdavid/DOC-79
...
DOC-79: Entities JSDoc Update - Doc Review
2019-06-28 10:12:05 -07:00
Zach Fox
5cc6efc831
CR feedback
2019-06-28 09:07:58 -07:00
David Rowe
2d6d3eb4fe
Doc review
2019-06-28 17:05:36 +12:00
Brad Davis
8bcde84d89
Disable remote QML unless whitelisted
2019-06-27 16:37:56 -07:00
Zach Fox
8af469992e
BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option
2019-06-27 15:55:58 -07:00
