RebeccaStankus
0670147bf8
Fixed paths to included files and collision with 'clamp'
2019-07-02 14:24:02 -07:00
Shannon Romano
89f654175c
Merge pull request #15856 from PrestonB1123/defaultShortcuts
...
DEV-173: Re-enable shortcuts
2019-06-28 15:29:53 -07:00
Preston Bezos
1315677aec
fixed doc and removed log spam
2019-06-28 15:02:33 -07:00
Preston Bezos
b9deb7bb58
formatting
2019-06-28 14:42:48 -07:00
Preston Bezos
09830dd40c
removed white space
2019-06-28 14:41:07 -07:00
Preston Bezos
d1470d3323
readded ctrl+n and ctrl+b as shortcuts with a default script
2019-06-28 14:33:03 -07:00
RebeccaStankus
d8daee49a8
Fixed bad path to gridControls
2019-06-25 16:31:21 -07:00
RebeccaStankus
e9777dc40f
Merge branch 'master' of github.com:highfidelity/hifi into create
2019-06-25 09:28:43 -07:00
RebeccaStankus
6aca2fcf07
Working on new file structure
2019-06-24 14:01:51 -07:00
Shannon Romano
334e7414a7
Merge pull request #15811 from RebeccaStankus/migrateEditFiles
...
Emergency fix to restore create in non-launcher builds
2019-06-20 17:19:39 -07:00
Anthony J. Thibault
3a6d8dc383
Disable handTouch.js to prevent finger twitching
...
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.
Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.
Also, three new items were added to the Developer > Show Animation Stats panel.
* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.
https://highfidelity.atlassian.net/browse/BUGZ-154
2019-06-20 15:52:36 -07:00
RebeccaStankus
e7cec0f11f
Fixed dialogs imports
2019-06-20 15:07:39 -07:00
RebeccaStankus
f5fa44dc21
Revert "Changed icons path to be relative"
...
This reverts commit e277070423
.
2019-06-19 12:06:34 -07:00
RebeccaStankus
e277070423
Changed icons path to be relative
2019-06-19 11:17:52 -07:00
RebeccaStankus
30dd667b17
Changed qml import method
2019-06-19 10:40:32 -07:00
RebeccaStankus
3b53e34c95
fixing paths
2019-06-18 11:35:00 -07:00
RebeccaStankus
5a49ac9a22
moved files
2019-06-17 16:45:54 -07:00
Seth Alves
22d602a334
CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list
2019-06-07 16:36:29 -07:00
Ryan Huffman
1894951f54
Add ignorePickIntersection to Create
2019-05-28 16:15:00 -07:00
Zach Fox
053576e29f
Move SimplifiedUI folder and create new defaultScripts.js
2019-05-23 11:31:42 -07:00
Zach Fox
46ee148a69
Fix a bug and remove magic numbers
2019-05-22 15:24:33 -07:00
Zach Fox
7a88c8362b
naming CR feedback
2019-05-22 15:01:22 -07:00
Zach Fox
3a4bf2e8f7
Fix the janky audio output settings UI
2019-05-22 14:27:06 -07:00
Zach Fox
6f7557b00d
Implement BUGZ-305 and BUGZ-306
2019-05-22 09:56:28 -07:00
Zach Fox
5749392e83
New bg color; Final status indicator design; Fixed HMD icon
2019-05-21 14:10:27 -07:00
Zach Fox
15bdb66943
Integrate Status into top bar; improve Audio settings; improve spacing between settings
2019-05-17 17:25:48 -07:00
Brad Hefta-Gaub
4e86948c25
Merge pull request #15580 from MiladNazeri/simplifiedUINametag
...
changed size of always on overlays to be smaller
2019-05-17 14:42:29 -07:00
Zach Fox
e40e34856b
Remove some extra menus from top bar; Only show VR button if headset connected
2019-05-17 13:28:59 -07:00
milad
0d80761cf0
added larger distance for on
2019-05-17 13:23:03 -07:00
milad
06056b9531
updated location in main UI
2019-05-17 13:00:26 -07:00
milad
df098cab2f
changed size of always on overlays to be smaller
2019-05-17 12:36:03 -07:00
Zach Fox
90a5b25600
A bunch of changes here
2019-05-16 14:18:04 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI
...
Simplified UI v1
2019-05-14 17:45:30 -07:00
Brad Hefta-Gaub
7440ef3cf3
Merge pull request #15506 from SaracenOne/unify_primitives
...
Case 19510: Unify cube and sphere edit menu entries into one.
2019-05-14 15:31:06 -07:00
Zach Fox
f9b51df296
Reduce size of output muted overlay; restore scroll to 0 on settings tab switch
2019-05-14 15:05:26 -07:00
Zach Fox
c57ddf969a
Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI
2019-05-14 09:32:07 -07:00
Zach Fox
89006cd9c5
Hide controls in top left; don't remove certain menus; fixup slider UIT
2019-05-13 17:26:19 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2
...
case 22190: Disable triggering away state when interface focus lost
2019-05-13 13:22:28 -07:00
Shannon Romano
b1060bcb83
Merge pull request #15508 from dback2/materialTargetTooltip
...
Case 22467: Fix material target tooltip
2019-05-13 13:08:28 -07:00
milad
51cbadcad1
Removed Selection related logic
2019-05-10 14:41:55 -07:00
Zach Fox
112e13383b
Dock it!
2019-05-10 12:03:29 -07:00
Zach Fox
314c04ab96
Simplified UI v1
2019-05-10 10:49:25 -07:00
SamGondelman
2bb522eea6
entity icons ignorePickIntersection when not visible
2019-05-09 14:16:59 -07:00
Saracen
b730c457ca
Replace tabs with spaces
2019-05-09 18:08:36 +01:00
Saracen
fd3c69a905
Replace tabs with spaces.
2019-05-09 02:14:00 +01:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
...
Avatar verification
2019-05-06 08:04:06 -07:00
unknown
0da318f2cd
fix material target tooltip
2019-05-03 10:37:35 -07:00
Saracen
43ddf7ca23
Unify cube and sphere edit menu entries into one.
2019-05-02 22:40:11 +01:00
Angus Antley
c0da46453b
made correction
2019-04-30 14:34:10 -07:00
Angus Antley
5c6ea082db
changed away script to make you active if you turn on your mic
2019-04-30 14:06:18 -07:00