Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl
2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2
fix openDirectory
2019-04-25 13:20:18 -07:00
SamGondelman
31b3f0e8f1
possible fix for openUrl exploit
2019-04-24 16:39:31 -07:00
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
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
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
Brad Davis
413091fed3
Trace application notification handler events if longer than 2 ms
2019-03-26 13:50:46 -07:00
Wayne Chen
77b7cc2457
separating out bubble icon qml - adding support for transparency
2019-03-22 14:16:29 -07:00
danteruiz
2ab8eb98e8
better implementation
2019-03-17 14:00:41 -07:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo
2019-02-28 14:06:47 -08:00
danteruiz
2fd94c6bbc
fixing login dialog
2019-02-27 10:08:38 -08:00
amer cerkic
9097d9c57c
working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.
2019-02-21 16:33:25 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
SamGondelman
0d1e4bed66
merge with master
2019-01-28 18:13:05 -08:00
Seth Alves
15aa574afd
Merge pull request #14774 from danteruiz/window-ontop
...
case 20705: Allow log window to stay on top
2019-01-28 10:05:48 -08:00
SamGondelman
70b1e17a8c
more wip
2019-01-27 00:05:25 -08:00
SamGondelman
0dd729232b
simplify keyboard focus highlight
2019-01-26 22:49:12 -08:00
Dante Ruiz
db58173977
fix mac issue
2019-01-25 15:10:53 -08:00
Dante Ruiz
2c22fb82b1
keep log window on top option
2019-01-24 18:16:07 -08:00
SamGondelman
0bfcde67ea
remove overlays from application.cpp
2019-01-24 14:11:24 -08:00
SamGondelman
217ff2b1b2
keyboardFocusOverlay
2019-01-23 18:33:35 -08:00
SamGondelman
5d19666f60
merge with master
2019-01-23 17:58:56 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
SamGondelman
6fd34bf1f0
setup qml surface contexts
2019-01-14 09:26:57 -08:00
Dante Ruiz
8252481ce7
Delete domain entities only
2019-01-11 16:00:10 -08:00
Seth Alves
0603431ac8
initialize _logger with null pointer
2019-01-10 15:16:33 -08:00
Seth Alves
c8db50cb20
start up logger before loading plugins.
...
put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.
2019-01-10 15:06:22 -08:00
NissimHadar
65d975fe5b
Added detection of Rift and Vive controllers.
2019-01-02 16:53:38 -08:00
NissimHadar
1e8e633025
Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo
2019-01-02 11:47:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5
...
Case 20200: Update EntityScriptingInterface to not find local entities (#2 )
2019-01-02 09:00:56 -08:00
NissimHadar
bb54353644
Compilation error.
2018-12-30 22:36:15 -08:00
NissimHadar
4b4ef4412a
Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo
2018-12-30 20:24:16 -08:00
NissimHadar
76ce63da64
Can read graphics card type.
2018-12-30 20:24:00 -08:00
Adam Smith
833ad936c0
Merge pull request #14630 from jherico/fix/20284_master
...
Fix for Oculus reset view issue
2018-12-28 16:24:40 -08:00
SamGondelman
b5a2642b6a
updated entityscriptinginterface API and related functions
...
(cherry picked from commit 6aac596698
2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
2018-12-20 16:53:33 -08:00
Brad Davis
c985eb3e80
Fix for Oculus reset view issue
2018-12-20 16:07:55 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5
...
Case 20200: Update EntityScriptingInterface to not find local entities
2018-12-20 19:10:22 +00:00
Wayne Chen
28fd1380df
adding target scale and default avatar to login state
2018-12-17 13:37:28 -08:00
Wayne Chen
1ce7d8a31c
dev feedback
2018-12-13 13:47:07 -08:00
Wayne Chen
dbebf1a67f
having stats mirror master
2018-12-11 19:29:17 -08:00
Wayne Chen
4b8200d5bb
forcing stats to be false until login determined
2018-12-11 17:27:54 -08:00
Wayne Chen
4c9c785c24
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-10 07:57:44 -08:00
SamGondelman
6aac596698
updated entityscriptinginterface API and related functions
2018-12-07 15:25:21 -08:00
