Alexander Ivash
1ddfc87396
wip on avatarapp
2018-07-06 21:00:51 +03:00
howard-stearns
d2cf042a88
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
2018-06-09 14:09:42 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode
...
Center of Gravity Leaning
2018-06-08 17:53:55 -07:00
Anthony J. Thibault
c3da4e74de
Code review feedback
2018-06-08 16:22:00 -07:00
howard-stearns
890c97e7cb
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
2018-06-07 12:24:27 -07:00
Alexander Ivash
b954ac6759
FB15569 - Debug default scripts no longer on developer menu
2018-06-06 03:43:27 +03:00
howard-stearns
254abfa04a
add request-services to default scripts.
2018-06-04 12:59:08 -07:00
Anthony J. Thibault
c3d1daf855
Merge branch 'master' into nativeCGCode
2018-06-04 09:32:38 -07:00
Dante Ruiz
072d8b70b1
adding back notifcations
2018-05-30 13:36:02 -07:00
amantley
3a10cacec0
1.added the swing twist code to update the follow rotation in MyAvatar.cpp
...
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head. Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity. This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
2018-05-07 17:41:35 -07:00
Alexia Mandeville
61e2814db4
Removing toolbar apps that are no longer necessary
2018-03-12 13:07:21 -07:00
ZappoMan
c4d0872bbf
first cut at an emote app
2018-01-07 22:28:50 -08:00
Dante Ruiz
e5600e4f1e
one universal controller pointer for all modules
2017-10-30 16:58:14 -07:00
SamGondelman
cf34fe3345
laserpointers generate pointerevents
2017-10-26 12:01:09 -07:00
Daniela
b18ffe9508
Remove fingerPaint.js from defaultScripts.js.
2017-09-27 17:46:59 +01:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
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
Artur Gomes
030877457b
Fix tablet not opening.
...
Fix headers not showing correctly since changes in editProperties page.
2017-08-16 20:59:09 +01:00
Artur Gomes
9d87954d71
Merge branch 'master' of github.com:CraftsmanMG/hifi
2017-08-16 18:52:39 +01:00
Delanir
59719a13b6
Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE
2017-08-16 18:23:04 +01:00
Delanir
6045169914
Merge remote-tracking branch 'refs/remotes/highfidelity/master'
...
# Conflicts:
# scripts/defaultScripts.js
2017-06-22 11:51:05 +01:00
Chris Collins
f160034bf0
Merge pull request #10681 from zzmp/audio/parity
...
Revamp audio device selection
2017-06-16 10:31:55 -07:00
Delanir
fee800c0a9
Remove stray tab.
2017-06-15 19:32:30 +01:00
Delanir
ab74c843fe
Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE
2017-06-15 19:26:40 +01: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
