Commit graph

160 commits

Author SHA1 Message Date
David Rowe
cb4bd58381 Load controller scripts in their own script engine 2017-03-15 14:31:13 +13:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Anthony J. Thibault
1acc5ea760 Finger now points when near tablet + deadspot added when touching the tablet 2017-03-08 19:03:56 -08:00
Anthony J. Thibault
84b29c6872 Reload all scripts when Debug defaultScripts.js is changed. 2017-02-23 11:02:25 -08:00
Anthony J. Thibault
83b3c12559 Removed Window.alert() because it was blocking the defaultScripts thread. 2017-02-23 10:28:16 -08:00
Anthony J. Thibault
1429a32928 Prevent use after free of ScriptEngine pointer when shutting down all scripts.
Before this change, if you were running with the Debug defaultScripts.js option on,
it could result in a dereference of a previously freed ScriptEngine pointer.
To prevent this, defaultScripts.js no longer explicitly calls ScriptDiscoveryService.stopScript() on
Script.scriptEnding.
2017-02-23 10:28:15 -08:00
David Rowe
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
Faye Li
4f04865963 load tablet users in default scripts 2017-02-01 15:37:54 -08:00
Faye Li
6f46136699 reorder buttons to match mockup 2017-01-25 15:02:55 -08:00
Dante Ruiz
6c51edec77 added context menu to tablet 2017-01-10 09:13:45 -08:00
Anthony J. Thibault
6794ed7cc4 Merge remote-tracking branch 'upstream/master' into tablet-ui 2017-01-09 10:37:46 -08:00
Chris Collins
215659c695 Enabled the ability to have other marketplaces.
Enabled the ability to have other marketplaces.
2017-01-07 08:17:13 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
howard-stearns
8eb6699420 help script 2016-11-02 16:50:37 -07:00
Anthony J. Thibault
60f728585a away.js now shows hand controllers in away mode.
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
  and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
2016-10-21 10:40:39 -07:00
James B. Pollack
a8a9577866 actually remove the math.random 2016-08-31 21:14:50 -07:00
James B. Pollack
2acf316d1c fix 2016-08-31 13:45:58 -07:00
James B. Pollack
193065eb05 remove auto toggle 2016-08-31 12:36:28 -07:00
James B. Pollack
e4bdc2e86c cleanup 2016-08-30 14:17:27 -07:00
James B. Pollack
a6a834f2c7 remember and work on toggle 2016-08-30 13:58:28 -07:00
Andrew Meadows
da387a958a fix typo 2016-08-25 10:26:05 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
Andrew Meadows
3690b38c65 fix warnings found by eslint in defaultScripts.js 2016-08-25 08:56:22 -07:00
Andrew Meadows
13a12a2a13 Script.include() default scripts not Script.load() 2016-08-25 08:56:22 -07:00
James B. Pollack
d9ebad7976 Merge pull request #8372 from elisa-lj11/zip_project
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
elisa-lj11
137f795f29 Made clara marketplace its own .js 2016-08-23 11:22:01 -07:00
Howard Stearns
7428eb2635 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-19 21:34:55 -07:00
Chris Collins
74cb2d4bcf Merge pull request #8461 from imgntn/demo_movement
Movement changes for Hand Controllers
2016-08-19 18:36:40 -07:00
Atlante45
dd60683e29 Move steam.js to unpublishedScripts 2016-08-19 17:14:14 -07:00
James B. Pollack
c89103481b change load order 2016-08-18 14:40:08 -07:00
James B. Pollack
b8213aed7b naming and some logging for teleport stuff 2016-08-18 11:59:58 -07:00
James B. Pollack
7768e65e8b update name 2016-08-18 09:22:43 -07:00
James B. Pollack
a4a41faf24 demo and only do for vive 2016-08-17 16:12:07 -07:00
James B. Pollack
8bc6ca2fa1 demo changes 2016-08-17 15:08:43 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
Atlante45
6c5acf4481 Change location of the Steam invite icon 2016-08-12 14:53:03 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Atlante45
3d6a6b9d6b Add steam.js to default scripts 2016-08-08 15:39:25 -07:00
David Kelly
d34e72512b Add snapshot.js to defaultScripts 2016-08-02 15:13:48 -07:00
Stephen Birarda
6e50e11002 replace ignore in default scripts with mod 2016-08-02 14:35:51 -07:00
Zander Otavka
72978c5d96 Rename examples -> marketplace
Includes the title of the marketplace web window.
2016-07-21 15:44:42 -07:00
Stephen Birarda
0918b55e7e add ignore to defaultScripts 2016-07-13 15:06:31 -07:00
James B. Pollack
5ca14b528b remove prints and format 2016-07-08 15:08:44 -07:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd
Automatically enter first person when in HMD mode
2016-06-24 15:58:38 -07:00
Zander Otavka
0c56af7ae8 Add default script to enter first person for HMD 2016-06-24 11:57:50 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Howard Stearns
91450addd3 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into goto-button 2016-06-05 10:46:18 -07:00
howard-stearns
6881956117 Basic HMD toggle button. 2016-06-03 14:57:46 -07:00
howard-stearns
247286c71f Basic address bar toggle button. 2016-06-03 11:55:33 -07:00
howard-stearns
3f3233da66 Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-05-09 09:26:28 -07:00
James B. Pollack
d1755649b1 order 2016-05-05 14:55:41 -07:00
James B. Pollack
67b1015f4a re add users to default, default to visible friends only 2016-05-05 14:54:04 -07:00
Howard Stearns
773770a7fc All but origin-correction. 2016-05-03 07:01:23 -07:00
James B. Pollack
90c59c5af0 remove directory from default 2016-04-28 10:39:53 -07:00
James B. Pollack
92f61dc86f prepend /system to default scripts 2016-04-27 00:44:04 -07:00
James B. Pollack
6c16e8c6c7 rename default scripts 2016-04-27 00:43:30 -07:00
Renamed from scripts/system/defaultScripts.js (Browse further)