Commit graph

189 commits

Author SHA1 Message Date
Brad Davis
8c375db90f Add display plugin introspection to the window scripting interface 2019-05-15 12:55:47 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
813defebfc Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged 2018-09-26 16:45:22 -07:00
Gabriel Calero
3163ae5997 Fix case 18465: redirect to domain after login 2018-09-26 19:41:43 -03:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
Dante Ruiz
fa5dfb6e28 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-26 09:18:12 -07:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
30e9d57026 adding pattern for during timeout to put into error state 2018-09-11 18:52:28 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Wayne Chen
d4dfaec8ea
updating typo 2018-09-11 17:02:38 -07:00
Wayne Chen
d478fcf027
remove unused signal from domain handler 2018-09-11 17:01:14 -07:00
Wayne Chen
0f25756908 expose domain connection error to Window 2018-09-11 16:29:39 -07:00
Dante Ruiz
03ede9371e cleaning code 2018-08-30 14:26:39 -07:00
danteruiz
e2cd695dfb PR code clean up 2018-08-27 11:01:29 -07:00
Dante Ruiz
26a30edec9 trying to fix loading bar 2018-08-21 18:27:21 -07:00
Dante Ruiz
6a4a56cee3 imporving the interstitial page script 2018-08-06 17:42:21 -07:00
Dante Ruiz
2377626203 exposing physics progress 2018-08-03 10:47:58 -07:00
David Rowe
46c9853152 Remove deprecated Window.raiseMainWindow API function 2018-07-12 14:04:08 +12:00
Gabriel Calero
fedc0a9e61 Support web3d overlays in android 2018-06-25 16:37:03 -03:00
Zach Fox
96858c9586 MS15529: Add secondary camera snapshot notification flag 2018-06-01 13:38:41 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login
Android new login
2018-05-17 15:53:25 -07:00
Gabriel Calero
868b58e66d Un-expose Application from javascript. Restore displayplugin deactivation when goes to background 2018-05-04 18:01:01 -03:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
Zach Fox
a2b84c0fbb It's working!! 2018-04-30 12:11:46 -07:00
Zach Fox
1b29946a48 I feel so close; why isn't this variable capturing? 2018-04-27 17:26:05 -07:00
David Rowe
6868ca971f Make Window.x and Window.y report top left of drawable area of window 2018-04-04 09:43:39 +12:00
David Rowe
a3c8b2792d Fix Window.geometryChanged() values for moving and resizing window 2018-04-04 09:42:05 +12:00
David Rowe
63603ff97c Fix window height reported by Window.geometryChanged() signal 2018-04-03 14:21:15 +12:00
David Rowe
d1d58eceab Add Window.raise() as replacement for Window.raiseMainWindow() 2018-03-27 13:04:50 +13:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
David Rowe
966d711e56 Fix Window.raiseMainWindow() 2018-03-14 13:38:48 +13:00
David Rowe
16aefea2e1 Merge branch 'master' into 21776 2018-03-13 14:46:07 +13:00
Seth Alves
621e6a62d6 merge from upstream 2018-03-09 12:07:24 -08:00
David Rowe
287ea8eff2 Fix Window.setFocus() unsetting focus if Interface has focus 2018-03-02 15:40:49 +13:00
David Rowe
b50044fb2b Remove deprecated Window.openFileChanged() signal from API 2018-03-02 13:15:27 +13:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
Seth Alves
c83dcbc626 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-22 07:42:49 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items
Remove some deprecated JavaScript API items
2018-02-21 16:31:16 -08:00
Seth Alves
afa059d331 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-16 12:58:56 -08:00
Seth Alves
b2a4181bc0 working to integrate serverless domains into history, etc 2018-02-16 12:58:50 -08:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
2018-02-16 06:57:03 -08:00
Cain Kilgore
d1ecc85fb3 Merge branch 'master' of https://github.com/highfidelity/hifi into 21668 2018-02-12 23:19:20 +00:00
Cain Kilgore
5048bf16cb Fixed Async Prompts/Assets/Dialogs 2018-02-12 23:01:19 +00:00
David Rowe
033b85a3a8 Merge branch 'master' into remove-deprecated-items
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
2018-02-13 09:42:40 +13:00