Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 21:56:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59725 commits 71 branches 56 tags 1.2 GiB
Commit graph

73 commits

Author SHA1 Message Date
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
Chris Collins
f160034bf0 Merge pull request #10681 from zzmp/audio/parity 
Revamp audio device selection
 2017-06-16 10:31:55 -07:00
Seth Alves
023ca85623 remove chat from default scripts 2017-06-15 09:27:43 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
337b6bca14 update JS with Audio.muted 2017-06-13 16:02:58 -04:00
Liv
03edb06ecb change design to run chat separately so it can be removed if users prefer to not use it 2017-06-08 13:46:33 -07:00
Liv
0e27ad767c Move chat app to be included as part of the default scripts 2017-06-08 13:07:01 -07:00
Zach Fox
1b74576259 Fix tablet-close behavior for PAL; remove users-tablet.js 2017-03-29 14:53:45 -07:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Dante Ruiz
a078121c46 saving work 2017-03-24 00:23:13 +01:00
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