Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
82845 commits 2 branches 0 tags 1.1 GiB
Commit graph

8306 commits

Author SHA1 Message Date
RebeccaStankus
b98d106a3b mend 2019-09-30 10:39:35 -07:00
RebeccaStankus
b25c874e5f More work on second launch UI 2019-09-30 10:38:11 -07:00
RebeccaStankus
44d9610048 Working on UI 2019-09-30 09:17:51 -07:00
Sam Gateau
57f8095506 Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script 2019-09-27 12:00:45 -07:00
RebeccaStankus
f4ecd3dcd8 Working on initial/second launch 2019-09-27 09:15:39 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
Sam Gateau
3e3c4c2e70 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-24 18:58:29 -07:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
Sam Gateau
2a78fc7b38 Remove the auto refresh list of resource because it takes too much time, instead user has to press refresh button 2019-09-24 14:29:09 -07:00
Sam Gateau
8aaa5deb11 Clean up the sort and filter system 2019-09-24 12:37:01 -07:00
Sam Gateau
d940e70564 Adding a proper SortFilterModel 2019-09-24 00:31:16 -07:00
Sam Gateau
3e17c1007a understanding the delegateModelGroup mechanism... 2019-09-23 18:14:45 -07:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
Sam Gateau
ee5de175eb Better monitoring of the resource loading in flights 2019-09-19 16:56:55 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
Sam Gateau
a87db2636c SOme stuff workbetter 2019-09-18 18:25:42 -07:00
Zach Fox
59184edc89 DEV-521: Update Emoji window's search field to display emoji's name during hover 2019-09-18 13:37:46 -07:00
Sam Gateau
c0660329a3 Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family 2019-09-17 18:06:08 -07:00
Sam Gateau
802326d4da Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-12 17:01:37 -07:00
Sam Gateau
133a8b7d5e a bunch of changes to debug why... 2019-09-11 18:21:44 -07:00
Zach Fox
3cfb4db36e
Merge pull request #16177 from MiladNazeri/DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation 
DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
 2019-09-11 15:35:04 -07:00
milad
4c340746c5 removed references to the emoji destroy sound 2019-09-11 12:50:49 -07:00
milad
275350c2fa removed sound from the out 2019-09-11 12:38:29 -07:00
Zach Fox
e9eb07d388 BUGZ-1339: Disable the Emote Indicator animation to prevent it from being 'jittery' 2019-09-11 10:20:59 -07:00
milad
d32438586a added flag for flying 2019-09-10 16:06:50 -07:00
milad
bb0b51116a cr1 2019-09-06 11:29:29 -07:00
milad
b352d53083 removed space made on accident 2019-09-06 11:00:14 -07:00
milad
1d8bbc3529 removed startup time var 2019-09-06 10:55:35 -07:00
milad
1576a29916 toggled flag for discconecting from wearable signal 2019-09-06 10:53:17 -07:00
milad
120c678557 added a wearable check for avimojis on startup 2019-09-06 10:51:12 -07:00
milad
531dceae4d changed status indicator to be similar to nametag and emoji 2019-09-05 10:29:25 -07:00
milad
57a309db53 small formatting changes 2019-09-04 20:58:20 -07:00
milad
408656f6ec added line break 2019-09-04 17:06:00 -07:00
milad
c73ea11b37 lowecase object 2019-09-04 17:00:30 -07:00
milad
3f2d2996a0 removed comment region sections 2019-09-04 16:59:14 -07:00
milad
252e8a2ed6 removed commented out code 2019-09-04 16:49:46 -07:00
milad
79b7271729 removed startup/unload apis from the 3 main modules 2019-09-04 16:48:24 -07:00
milad
d316f014eb fixed double scriptEnding being called 2019-09-04 15:51:07 -07:00
Zach Fox
df3f7fcb72
Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix 
Dev-486 : emote indicator should still be showing
 2019-09-04 13:11:24 -07:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -07:00
milad
6c9c22a5fb removed old code 2019-09-03 18:14:15 -07:00
milad
669fef763a removed logs 2019-09-03 18:11:56 -07:00
milad
44e518f5a1 working fix 2019-09-03 18:06:25 -07:00
Sam Gateau
03c5dfad3d propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version 2019-09-03 16:28:32 -07:00
Sam Gateau
cda2943b9a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-03 12:01:12 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365 
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
 2019-08-30 13:10:09 -07:00
Zach Fox
c561bca79c BUGZ-1386: Update simplifiedStatusIndicator to use domainID as org name instead of location.hostname 2019-08-30 11:37:52 -07:00
Brad Davis
6aa967f29f fixing test code 2019-08-29 14:11:22 -07:00
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -07:00
Zach Fox
4098dd9999 BUGZ-1342: Add lock icon to Emote tray when it's locked open; Make tray close when unlocking it 2019-08-27 12:59:57 -07:00
RebeccaStankus
abd4f24770 Added unload check that timeout is not running 2019-08-26 15:15:25 -07:00
RebeccaStankus
96dbd4620d pull clear timeout into a separate function 2019-08-26 15:08:18 -07:00
RebeccaStankus
f66b696721 Clear timeout on selecting a different emote 2019-08-26 14:39:38 -07:00
RebeccaStankus
c3dfc4e8d8 Restore emote indicator after reaction emote 2019-08-26 14:23:27 -07:00
Zach Fox
701dd679c7 Change the icons' 2019-08-23 15:18:45 -07:00
Zach Fox
27574dd3f3 Prepare for new emote indicator icon 2019-08-23 14:48:49 -07:00
Zach Fox
98626b564c Couple more changes 2019-08-23 14:40:39 -07:00
Zach Fox
dfcf70b9b5 Tons of Emote/Emoji changes 2019-08-23 14:14:53 -07:00
Zach Fox
44ac3f3a7a Don't use entity creation library (reduce risk); use remote URL for broadcast image entity URLs 2019-08-22 13:58:35 -07:00
Zach Fox
a086d6fe6d Fix triggered reactions not showing their icon in the emote indicator 2019-08-22 11:54:28 -07:00
Zach Fox
177590614e Fix emote bar always visible on MacOS; small logic cleanup 2019-08-22 11:44:09 -07:00
Zach Fox
63d27fb002 Much smaller emoji wrt filesize; Fix emoji toolbar not sticking to window on MacOS 2019-08-22 11:00:15 -07:00
Zach Fox
3766ca8660 Add help/attributions popup to emoji popup window 2019-08-21 11:05:55 -07:00
Sam Gateau
e1e4d9ac6c Exposing the AA mode of the AA job 2019-08-20 18:15:35 -07:00
Zach Fox
5869ed3f20 Remove Emote App bar when in HMD mode and re-enable conditionally; don't allow keyboard shortcuts to work in HMD 2019-08-20 15:21:12 -07:00
Zach Fox
7f45a7b45c Show a not found message when the user searches for nonexistent emoji 2019-08-20 15:11:17 -07:00
Zach Fox
1cb4a31e09 Reticle update rate limiter; end reactions on shutdown 2019-08-20 15:02:36 -07:00
Zach Fox
cc9c9ec443 Fixup signal handling causing app errors; add keyboard navigation to emoji window 2019-08-20 14:52:19 -07:00
Zach Fox
8b79dc3020 Fix clapping silence issue 2019-08-20 14:22:13 -07:00
RebeccaStankus
0be3f133de Removed some Milad notes 2019-08-20 14:17:00 -07:00
RebeccaStankus
a78284871e more CR feedback changes 2019-08-20 13:59:41 -07:00
RebeccaStankus
cc22386f06 CR feedback changes 2019-08-20 13:29:02 -07:00
Sam Gateau
6cd37ef73c Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-20 09:41:08 -07:00
Sam Gateau
c5bd9ecf4f REfreshing the antialiasing qml na dconfig of the Jitter Job 2019-08-19 18:14:29 -07:00
RebeccaStankus
022d1aee8e Added check to remove persisting reticle entities on script startup 2019-08-19 15:36:21 -07:00
Zach Fox
b40d5658e3 Moved a timer from JS to QML; progress circle on Emote Indicator 2019-08-19 15:12:48 -07:00
Zach Fox
fd287654f4 Fixup keyboard shortcuts; Modify tooltips 2019-08-19 14:19:25 -07:00
Zach Fox
14a04dfb1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 13:52:35 -07:00
RebeccaStankus
e690d4f7ef Limited distance to rez a point reticle 2019-08-19 13:40:50 -07:00
RebeccaStankus
4787785660 first version of pointing reticle 2019-08-19 13:19:01 -07:00
Zach Fox
05abff1c0b
Merge pull request #16071 from zfox23/helpApp1 
Help App: Phase 1
 2019-08-19 11:16:44 -07:00
RebeccaStankus
44d0e0ba1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 09:16:19 -07:00
Sam Gateau
aeb407698d bloom ui 2019-08-18 22:15:20 -07:00
Sam Gateau
3ace52629c Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-16 17:35:15 -07:00
Sam Gateau
a934b79321 Updating the bloom debug ui 2019-08-16 17:34:16 -07:00
RebeccaStankus
0699433df8 Emoji app updates emoteIndicator 2019-08-16 16:34:08 -07:00
Zach Fox
30d552919a Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-16 14:06:58 -07:00
Zach Fox
a274e5c2b1 Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner 2019-08-16 12:31:50 -07:00
Zach Fox
301dca6937 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 12:14:52 -07:00
Zach Fox
c13697803d Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-16 12:14:44 -07:00
RebeccaStankus
18a9f3fbfb Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 12:09:17 -07:00
Zach Fox
4ac0c5902d 52px emojis and custom emoji 2019-08-16 12:08:30 -07:00
RebeccaStankus
2357934d49 Working tooltips 2019-08-16 12:08:26 -07:00
Zach Fox
b06b0b51df Mipmap the emoteIndicator Image 2019-08-16 10:07:22 -07:00
Zach Fox
92c5ca2d75 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 09:58:44 -07:00
RebeccaStankus
73941f1ece Fixed bug with emote indicator icon not restoring 2019-08-16 09:46:46 -07:00
RebeccaStankus
c64da85344 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-16 09:11:03 -07:00
RebeccaStankus
a06cb85f9e Indicator image swapping 2019-08-15 17:20:27 -07:00
Zach Fox
6176214d45 Remove extra log 2019-08-15 17:00:59 -07:00
Zach Fox
a053f9ed9e Impelement settingChanged; clean up some emoteIndicatorVisible code 2019-08-15 17:00:27 -07:00
RebeccaStankus
876ae771d4 Tray buttons swap color on hover 2019-08-15 16:44:50 -07:00
Zach Fox
98eff6ebb6 Mipmap the emoji bar images 2019-08-15 16:32:59 -07:00
RebeccaStankus
64dcb48925 Removed extra file, moved qml images 2019-08-15 16:31:37 -07:00
RebeccaStankus
f93d754f15 Button label characters are now images 2019-08-15 16:25:25 -07:00
RebeccaStankus
2fc603b85e Replacing button label characters with images 2019-08-15 15:35:41 -07:00
Zach Fox
d29cdffe8c Toggle reaction bugfix 2019-08-15 14:42:27 -07:00
Zach Fox
2149f1acc7 Reaction logic now nice and stable! 2019-08-15 14:40:33 -07:00
RebeccaStankus
af97384948 Adding icon swaps to emoteIndicator 2019-08-15 14:21:03 -07:00
Zach Fox
0497c10d69 Ensure mask covers non-circular emoji 2019-08-15 13:20:09 -07:00
Clement
5be1cfcb36 Fix linux specific script engine crash 2019-08-15 13:07:43 -07:00
Zach Fox
9ae5eba12a Remove reliance on QML timer - still need to fix non-circular emoji mask 2019-08-15 13:04:50 -07:00
Zach Fox
dcae607cfb Applause sound and fixup handler 2019-08-15 12:46:30 -07:00
Zach Fox
38743f924f Autofocus Emoji search text field 2019-08-15 12:23:29 -07:00
Zach Fox
0338b0258c Add Search to Emoji window and clean up some code 2019-08-15 12:21:29 -07:00
RebeccaStankus
078ff223a4 Emote animations start and stop correctly 2019-08-15 12:01:25 -07:00
Zach Fox
143c3e966c Big optimizations to Emoji window 2019-08-15 10:58:13 -07:00
Zach Fox
2c604d2c5b Simpler code! 2019-08-15 09:58:45 -07:00
Zach Fox
bfb4c0c49a Fixup emote indicator 2019-08-15 09:21:42 -07:00
RebeccaStankus
46a8e804b3 Working on tray functionality 2019-08-15 09:11:52 -07:00
RebeccaStankus
bc67241100 Finished changes for CR feedback 2019-08-14 14:09:48 -07:00
RebeccaStankus
0645796e74 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-14 13:28:08 -07:00
RebeccaStankus
8728640f60 Initial CR changes 2019-08-14 12:03:49 -07:00
Sam Gateau
f4c33d8392 Refining the look of the enable button of the TaskPropView 2019-08-14 11:33:30 -07:00
Sam Gateau
5e57e53db2 Address errors sent from running the ENgine Inspector.js 2019-08-14 11:15:52 -07:00
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