Sam Gateau
859016bf37
Addressing review comments
2019-08-14 10:28:42 -07:00
Zach Fox
52c4d4fe69
better FAQ
2019-08-14 09:31:08 -07:00
Zach Fox
7297ac9a09
Merge branch 'master' of github.com:highfidelity/hifi into helpApp1
2019-08-14 09:11:04 -07:00
Sam Gateau
5c085bd08d
CLean the code of the task::COnfig changes
2019-08-13 18:58:35 -07:00
Sam Gateau
4a93b23d83
Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly
2019-08-13 18:47:57 -07:00
Sam Gateau
9139edc8b1
Maybe fixed the problem, cannot render the gl41 version properly
2019-08-12 00:44:14 -07:00
Sam Gateau
53642763c9
Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse
2019-08-11 21:57:36 -07:00
Sam Gateau
a96ef7b5f0
Exloring the why....
2019-08-09 18:34:36 -07:00
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation
...
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
2019-08-09 17:28:46 -07:00
Sam Gateau
fe08609b0c
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-08-09 11:25:03 -07:00
Zach Fox
e8b93998da
Merge branch 'master' of github.com:highfidelity/hifi into helpApp1
2019-08-09 09:33:13 -07:00
Shannon Romano
5e5c5a27ab
Merge pull request #16041 from Atlante45/fix/oom
...
BUGZ-830: Fix memory leak in the ESS
2019-08-09 09:03:56 -07:00
Sam Gateau
67a13ee7cd
Exploring differences in the polyline rendering
2019-08-08 17:10:46 -07:00
Clement
29d017bb65
CR
2019-08-08 13:49:15 -07:00
sabrina-shanman
71bc1a4258
Make simplifiedUI default to 20:20 vision
2019-08-08 13:03:39 -07:00
Zach Fox
72e14a32f9
Implement the Help App skeleton; Implement Help App Controls; Implement Help App About
2019-08-07 17:13:20 -04:00
Clement
ec9d13700d
Break JS circular ref to help garbage collect
2019-08-07 13:19:53 -07:00
milad
b8c5192d7a
add images
2019-08-06 19:59:10 -07:00
milad
c2fddbf03a
cut down files
2019-08-06 19:55:48 -07:00
Ryan Huffman
609b533cf2
Fix create duplication key conflicting with camera orbit
2019-08-06 17:23:13 -07:00
milad
82f6c29923
updated emoji size info
2019-08-06 13:23:10 -07:00
milad
f1ff9207f9
removing empty js file
2019-08-06 13:20:15 -07:00
milad
c20933b813
removed saved emoji called and also add more info to description
2019-08-06 13:16:58 -07:00
milad
1a95c126c3
working version but taking a snapshot of added emoji code before removing for handoff
2019-08-06 13:13:38 -07:00
Sam Gateau
eb616452ec
An afternounwatchign code
2019-08-05 17:54:46 -07:00
milad
d1efbc051a
working UI
2019-08-04 15:11:55 -07:00
Sam
d84bebcc28
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-08-02 09:36:58 -07:00
Shannon Romano
2f6d79fb45
Merge pull request #15920 from annabrewer/combine-tone-map-resample
...
BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines
2019-08-01 17:39:38 -07:00
Sam
7948fb266e
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-07-31 11:46:09 -07:00
Sam
6e2ffe14a0
better ui
2019-07-31 11:44:42 -07:00
Shannon Romano
75146a104d
Merge pull request #15982 from sabrina-shanman/bug_lod_too-low
...
(BUGZ-1040) Fix LOD randomly being too low in simplified UI
2019-07-29 09:45:19 -07:00
Sam
767f413a2c
merging the various job/task/switch congif into one
2019-07-29 00:07:16 -07:00
sabrina-shanman
601b579c42
Set the LOD angle in simplifiedUI to current effective default, to be adjusted later
2019-07-25 17:32:56 -07:00
sabrina-shanman
4b5a45209e
Prefer using LODManager.lodAngleDeg for setting manual LOD
2019-07-25 17:15:22 -07:00
milad
f87e306ad4
adding extra padding to the initial textbox calculation
2019-07-25 16:35:30 -07:00
sabrina-shanman
3a4ce44633
On second thought, do not expose default octree size scale
2019-07-24 17:32:25 -07:00
sabrina-shanman
9d93a2f502
Fix simplifiedUI stuck on wrong LOD value
2019-07-24 16:27:24 -07:00
Anna
1df43fc83a
Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample
2019-07-23 15:41:01 -07:00
Shannon Romano
b799abdac1
Merge pull request #15967 from sabrina-shanman/picks_too-many_grab-enabled
...
(BUGZ-955) Disable unnecessary picking (conservative subset)
2019-07-23 14:57:19 -07:00
sabrina-shanman
d48c8d897c
Clarify that a Grabber member function toggles both picks and pointers
2019-07-23 12:58:07 -07:00
sabrina-shanman
abac1787a6
Fix using invalid pick API functions on HMD ray pointer
2019-07-23 12:58:07 -07:00
sabrina-shanman
79d09f68fd
Disable grab.js picks when in HMD
2019-07-23 12:58:07 -07:00
Ryan Huffman
8b2c935f92
Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate
...
Make Create app use Ctrl key to duplicate entities instead of Alt
2019-07-23 08:52:22 -07:00
Simon Walton
8fb28bf4e8
Whitespace changes per code review
2019-07-22 10:36:57 -07:00
Simon Walton
63c3452cf2
Restore avatar theft functionality; banner-click to appropriate menu
2019-07-19 16:35:07 -07:00
MiladNazeri
25fc4fbb8f
Merge pull request #15937 from MiladNazeri/sessionDisplayNameChange
...
[BUGZ-537] :: removed session display name from nametag
2019-07-16 18:06:05 -07:00
sabrina-shanman
fcaa64b9ef
Fix teleport collision picks always enabled if user never enters HMD
2019-07-16 17:46:59 -07:00
sabrina-shanman
e043d181cd
Disable picks in controllerDispatcher when not in HMD
2019-07-16 17:46:54 -07:00
Anna
b59d967b6c
fixed luci, made tone mapping mirrored auto generate, changed color format on forward, bug fixes
2019-07-16 15:44:28 -07:00
Shannon Romano
53a67dcfa9
Merge pull request #15872 from SamGondelman/bias
...
DEV-202: Expose shadow bias and max distance to Zone Entity
2019-07-16 15:22:37 -07:00
milad
77ec048947
added change to the statusIndicator for the same thing
2019-07-16 12:23:32 -07:00
milad
53ec19dd57
removed session display name from nametag
2019-07-16 10:27:56 -07:00
PrestonB1123
526b210fcd
remembered that macs exist
2019-07-12 12:39:58 -07:00
PrestonB1123
aaf10cec39
added conditionals to shortcuts to remove overlap
2019-07-12 12:37:40 -07:00
David Rowe
f2d591dbe9
Take no action if Alt is pressed at mouse-down
2019-07-12 21:28:44 +12:00
David Rowe
db1137fa0f
Use Ctrl to duplicate entities instead of Alt
2019-07-12 21:27:33 +12:00
PrestonB1123
07c71cbadb
disabled P shortcut and re-enabled in metaverse
2019-07-11 12:05:15 -07:00
SamGondelman
6ce809fb2a
merge with master
2019-07-11 09:01:30 -07:00
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
SamGondelman
29dbbc49ad
Merge remote-tracking branch 'upstream/master' into bias
2019-07-09 15:38:13 -07:00
SamGondelman
8fd2251612
mostly working equation?
2019-07-09 13:34:33 -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
SamGondelman
72f52b069e
cleanup, fix shadow qml
2019-07-03 16:21:47 -07:00
Sam Gondelman
0d9f639331
Merge branch 'master' into bias
2019-07-03 10:20:16 -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
SamGondelman
692c776be5
expose shadow bias and max distance wip
2019-07-02 15:18:28 -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
Sam Gateau
b2631e89e9
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-19 17:11:20 -07:00
Shannon Romano
3d72370d1a
Merge pull request #15792 from MiladNazeri/nametagFixes
...
Bugz-504: more stable nametag updates
2019-06-19 14:07:19 -07:00
Zach Fox
8fdfdbaae4
Another attempt, still not working
2019-06-19 13:31:21 -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
Milad Nazeri
61e4155eda
cr-r1
2019-06-19 07:30:28 -07:00
Zach Fox
7a4aa1e98c
BUGZ-657; BUGZ-713: Add a copy of the system library JS files because lots of system scripts depend on them being in the default scripts location
2019-06-18 17:13:38 -07:00
Milad Nazeri
422c70f300
fixed cache and extra line
2019-06-18 14:35:00 -07:00
Milad Nazeri
6196c6b746
more stable nametag updates
2019-06-18 14:32:11 -07:00
RebeccaStankus
3b53e34c95
fixing paths
2019-06-18 11:35:00 -07:00
Sam Gateau
f30eb919c7
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-18 11:24:04 -07:00
RebeccaStankus
cd508a5475
Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles
2019-06-18 09:10:41 -07:00
RebeccaStankus
5a49ac9a22
moved files
2019-06-17 16:45:54 -07:00
Preston Bezos
1801dc9d90
gave previous status a default value
2019-06-17 15:18:16 -07:00
Sam Gateau
e5a772a9b8
Introducing the HUD layer rendering pass into it s own task and file
2019-06-14 17:54:15 -07:00
Sam Gateau
12f8c7486b
getting rescaling to work for forward yop
2019-06-14 00:48:07 -07:00
Sam Gateau
4ba34f9a85
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02
Drafting ways to rescale in forward
2019-06-13 17:42:32 -07:00
RebeccaStankus
772bad58ca
Increased bottom margin on muted overlay
2019-06-13 15:55:49 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut
...
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
2019-06-13 14:32:36 -07:00
Zach Fox
1a0002db0c
BUGZ-676: Remove references to interstitial from SUI version of progress.js
2019-06-13 13:06:40 -07:00
Sam Gateau
b132a42e89
fixing the scroll view
2019-06-12 22:42:05 -07:00
Preston Bezos
e32d6e96ce
code was backwards
2019-06-12 16:12:24 -07:00
Preston Bezos
2eeec3518d
one last fix
2019-06-12 16:03:03 -07:00
Preston Bezos
3cd3f1a508
one last fix
2019-06-12 15:56:27 -07:00
Preston Bezos
8dcf6e6a03
removed a dead line of code, made a couple formating changes
2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b
hopefully good now
2019-06-12 15:36:20 -07:00
Preston Bezos
8fa80f8935
fixed some formatting problems
2019-06-12 14:57:37 -07:00
Preston Bezos
038747e645
Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering
2019-06-12 14:55:37 -07:00
Preston Bezos
34e9acc0b5
better fix for the toolbar remnant
2019-06-12 14:31:43 -07:00
Zach Fox
5077ae1bd7
Merge pull request #15745 from PrestonB1123/hudRemnant
...
BUGZ-355: Persistent UI Element
2019-06-12 10:40:37 -07:00
Preston Bezos
6c0bbfae76
hopefully good now
2019-06-12 10:02:33 -07:00
Preston Bezos
266c08227f
turned an else into an else if
2019-06-12 09:29:43 -07:00
Preston Bezos
a79a75702a
reverted a couple of testing changes and added a variable
2019-06-12 09:17:18 -07:00
Preston Bezos
b32a715496
fixed persistant ui element when switching from HMD to Desktop. not a complete fix but sufficient for M1
2019-06-11 16:29:32 -07:00
Brad Hefta-Gaub
0a9552226d
Merge pull request #15713 from sethalves/fix-create-baked-indicator
...
case BUGZ-599: CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list
2019-06-10 14:37:29 -07:00
