SamGondelman
4fc97effda
combine snapshotOperator lists per sam's suggestions
2019-04-22 16:22:18 -07:00
SamGondelman
06fbc8440e
Merge remote-tracking branch 'upstream/master' into stencil2
2019-04-22 13:28:30 -07:00
SamGondelman
7fa81ffef3
fix warnings
2019-04-18 12:48:46 -07:00
SamGondelman
e7d12dc4f8
fix snapshots and preview
2019-04-17 15:43:05 -07:00
SamGondelman
c730e51d1e
wip redo stencil work
2019-04-11 13:22:51 -07:00
Sam Gateau
d7e5f1eb8e
Merge pull request #15280 from kitely/fix-startup-race-condition
...
case 21981: Fix startup race conditions in Interface
2019-04-10 11:30:23 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing
...
Case 21930: Don't change OpenGL context state every frame
2019-04-10 09:42:09 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 11:59:46 -07:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco
...
Case 21777: Locomotion Project
2019-04-04 16:18:32 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
...
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
r3tk0n
874fb6b6d7
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-04-03 12:42:33 -07:00
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid
...
Case 21893: Remove disabling of --url for Android.
2019-04-03 07:50:31 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates
...
Case 21899: New Audio Mute States
2019-04-01 15:27:03 -07:00
r3tk0n
4fb7bbabe1
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-04-01 14:52:21 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master
...
Case 21993: Globally disallow use of the camera or microphone by hosted web content
2019-04-01 14:05:22 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates
2019-04-01 12:24:46 -07:00
Wayne Chen
afdf95c894
remove unused slotted function
2019-04-01 12:20:55 -07:00
Brad Davis
58abfb44c4
Globally disallow use of the camera or microphone by hosted web content
2019-03-31 11:14:29 -07:00
NissimHadar
171aebd6aa
Remove disabling of --url for Android.
2019-03-28 13:04:16 -07:00
Oren Hurvitz
7a8b7c095b
Fixed a race condition related to the keyboard when starting Interface.
...
These two things need to happen in the following order:
1. Initialize the input plugins (including the keyboard)
2. Start the scripts
That's because the scripts try to use the keyboard (e.g., in edit.js), and if it's not ready yet
then they fail, and then Interface doesn't work right (e.g., the Create button doesn't work).
In order to ensure that these things happen in the correct order, we must make sure that
resumeAfterLoginDialogActionTaken() (which starts the scripts) is called only after everything
else in the Interface constructor has finished. Usually this happens correctly, but occasionally
resumeAfterLoginDialogActionTaken() is called too soon. This commit makes sure that even in that
case, we'll postpone calling resumeAfterLoginDialogActionTaken() until the Interface constructor
has finished.
2019-03-28 13:36:41 +02:00
Oren Hurvitz
49165056c9
Fixed a race condition that sometimes caused the main menus not to appear.
...
When Interface starts, it first calls pauseUntilLoginDetermined(), and later resumeAfterLoginDialogActionTaken().
But on rare occasions these functions are called in the reverse order, and this caused Interface to remain
in the "paused" state. Now we check for this case, and abort pauseUntilLoginDetermined() if it happens.
This has only happened to me when running Interface immediately after rebuilding it (in Release mode).
2019-03-28 11:44:12 +02:00
Oren Hurvitz
8e201f4801
Fixed race condition during initialization of the Desktop.
...
The Application constructor must setup event handlers for events emitted when the Desktop is
constructed *before* calling initializeUi(). Otherwise, sometimes these event handlers won't
be called.
When this problem happened (usually on slow machines), Interface would start but neither the
Desktop nor the Login Screen would appear.
2019-03-28 11:44:12 +02:00
Brad Davis
413091fed3
Trace application notification handler events if longer than 2 ms
2019-03-26 13:50:46 -07:00
SamGondelman
4ed7c09016
grab correct stencil masks from display plugins
2019-03-26 13:42:18 -07:00
Roxanne Skelly
90b9de8623
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832
2019-03-25 14:48:26 -07:00
Roxanne Skelly
1608b24be1
ase 20832 - Inventory app login and cancel buttons don't work on logout
2019-03-25 14:48:17 -07:00
r3tk0n
3ac42e69e3
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-25 11:27:31 -07:00
Wayne Chen
390ce9bb26
wip for getting AvatarInputsBar to switch accordingly
2019-03-22 15:34:06 -07:00
Wayne Chen
ee1a14505a
adding constants, removing entity creation in cpp
2019-03-22 14:54:15 -07:00
Wayne Chen
d0116abc52
separating out bubble icon qml - adding support for transparency
2019-03-22 14:54:13 -07:00
Wayne Chen
20e181cd82
staging avatar inputs for ignore radius
2019-03-22 14:42:51 -07:00
Wayne Chen
77b7cc2457
separating out bubble icon qml - adding support for transparency
2019-03-22 14:16:29 -07:00
Wayne Chen
d382893e75
staging avatar inputs for ignore radius
2019-03-22 14:16:28 -07:00
Sam Gondelman
40f5a0263c
Merge pull request #15201 from SamGondelman/emit
...
Case 21756: Entities.emitScriptEvent works now
2019-03-21 18:05:17 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio
...
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
2019-03-21 18:03:58 -07:00
r3tk0n
108e8b9994
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-21 15:17:56 -07:00
r3tk0n
543d53ecde
Add ability to toggle strafing.
2019-03-21 13:12:15 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui
...
Case 21771: Possible Entity Scipt Ban Incident
2019-03-21 13:10:54 -07:00
Shannon Romano
a6d4f98ee7
Merge pull request #15204 from roxanneskelly/Case21025
...
Case 21025 conditionalizing TabletWebView features
2019-03-20 14:21:37 -07:00
danteruiz
2ab8eb98e8
better implementation
2019-03-17 14:00:41 -07:00
SamGondelman
d4e1ec9741
fix emitScriptEvent
2019-03-15 16:20:01 -07:00
SamGondelman
83bac723ef
fix wearable duplication on domain switch
2019-03-15 13:38:25 -07:00
Roxanne Skelly
9182db8bd4
Case 21025 conditionalizing TabletWebView features
2019-03-15 12:56:43 -07:00
SamGondelman
609c4ab52e
try to fix audio injector threading issues
2019-03-12 18:41:43 -07:00
r3tk0n
39342b9771
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-11 16:27:05 -07:00
Wayne Chen
07ddd4e1dd
moving key press detection to JSON
2019-03-11 14:27:47 -07:00
Wayne Chen
7b51061b5f
fixing initialization in switch statement
2019-03-10 19:46:01 -07:00
Wayne Chen
20487b2ad1
connecting pushingToTalkChanged with handlePushedToTalk
2019-03-10 19:39:45 -07:00
Wayne Chen
48d1ec850c
removing debug statement
2019-03-08 16:07:48 -08:00
Wayne Chen
18b86d550d
adding PushToTalk action
2019-03-08 16:07:48 -08:00
