Zach Fox
712d608c15
Better logic in bootstrapper to not load alread running scripts
2019-07-10 13:23:50 -07:00
Zach Fox
85b563461a
DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts
2019-07-10 12:06:08 -07:00
Zach Fox
4dfbc489e8
Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype
2019-07-09 15:40:16 -07:00
RebeccaStankus
714a3f6b08
Fixed path to tabletAssetServer in HMD, simplifiedUI system folder
2019-07-09 13:02:54 -07:00
Zach Fox
d622e53458
Some comments; changed the code to be backwards compatible
2019-07-08 17:10:11 -07:00
Zach Fox
5048b8bd89
Implement DEV-218 & DEV-219 and commit a starting point for the Emote app
2019-07-08 16:46:58 -07:00
Shannon Romano
cc57e92a81
Merge pull request #15890 from zfox23/SUI/noAutoLOD
...
BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users
2019-07-08 07:57:55 -07:00
Sam Gateau
f2cda426d8
Merge pull request #15884 from samcake/nut
...
BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier
2019-07-06 02:18:11 +02:00
RebeccaStankus
352f9590b1
Fixed Qt.resolvedUrl format
2019-07-05 16:23:29 -07:00
Zach Fox
eb79752455
BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users
2019-07-05 12:00:17 -07:00
Samuel Gateau
28fddc2fb3
full stack for windows
2019-07-04 18:13:08 +02:00
Samuel Gateau
12cc69e41c
Merge branch 'master' of github.com:highfidelity/hifi into nut
2019-07-04 01:56:06 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit
...
BUGZ-661: Add unlit property to text entities
2019-07-03 18:43:26 +02:00
Samuel Gateau
3be8b80eff
Merge branch 'master' of github.com:highfidelity/hifi into nut
2019-07-03 01:01:26 -07:00
Zach Fox
ba7ed32135
Merge pull request #15874 from MiladNazeri/nameTagInBodyFix
...
[Bugz-893] :: Name tag in body fix
2019-07-02 16:56:46 -07:00
milad
c7f5a5064d
removed bad log
2019-07-02 16:41:24 -07:00
milad
83546de9da
removed distance check for redraw to prevent nametag in user's body
2019-07-02 16:40:23 -07:00
RebeccaStankus
d840723fe3
Fixed space before function params
2019-07-02 15:08:34 -07:00
RebeccaStankus
0670147bf8
Fixed paths to included files and collision with 'clamp'
2019-07-02 14:24:02 -07:00
milad
ccc4b0d9e1
added unlit property
2019-07-02 10:33:19 -07:00
SamGondelman
fa416adaf6
adding unlit property to text, fixing transparency, normals, other cleanup
2019-07-02 10:28:36 -07:00
Sam Gateau
2c412808e7
More information from the platform on mac
2019-07-02 14:48:25 +02: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
raveenajain
17d127ecf3
modify shadow debugger for new bias input
2019-06-28 10:07:49 -07:00
Shannon Romano
b96db7517c
Merge pull request #15836 from RebeccaStankus/create
...
BUGZ-659 Fix create menu paths
2019-06-26 11:52:02 -07:00
MiladNazeri
7d6cff46ff
Merge pull request #15842 from MiladNazeri/refreshNametagLifetime
...
[BUGZ 798] :: updated lifetime
2019-06-25 19:32:33 -04:00
RebeccaStankus
d8daee49a8
Fixed bad path to gridControls
2019-06-25 16:31:21 -07:00
milad
72867437be
updated lifetime
2019-06-25 15:38:02 -07:00
RebeccaStankus
e9777dc40f
Merge branch 'master' of github.com:highfidelity/hifi into create
2019-06-25 09:28:43 -07:00
Sam Gateau
8d0b7a81f5
one more
2019-06-24 17:01:11 -07:00
Sam Gateau
b0ebcc745d
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-24 15:36:28 -07:00
RebeccaStankus
6aca2fcf07
Working on new file structure
2019-06-24 14:01:51 -07:00
Zach Fox
cccc241553
Actually fix the bug
2019-06-21 16:19:09 -07:00
Sam Gateau
aa160c4d0f
Improving presentation of stats & debug information
2019-06-21 16:17:28 -07:00
Zach Fox
8044b33d65
This also works
2019-06-21 13:44:31 -07:00
Zach Fox
5067fd4cd2
OK this is definitely working
2019-06-21 13:41:11 -07:00
Zach Fox
21454f6256
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-21 09:44:54 -07:00
Sam Gateau
69bb9ac0b6
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-20 22:23:15 -07:00
Sam Gateau
22cd631a04
Merge And Modifying the Graphics settings and the dev menu
2019-06-20 17:48:36 -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
Zach Fox
3334e06cf4
This fixes it!
2019-06-20 16:52:46 -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
Zach Fox
d546550c3f
test this
2019-06-20 15:49:40 -07:00
RebeccaStankus
e7cec0f11f
Fixed dialogs imports
2019-06-20 15:07:39 -07:00
Zach Fox
d49205be74
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-20 09:45:49 -07:00
Sam Gateau
b5e4a47375
Proper allocation of the resource in forward and starting to remove the ui as we have it
2019-06-19 17:33:26 -07:00
