Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 09:51:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83569 commits 73 branches 59 tags 1.2 GiB
Commit graph

8526 commits

Author SHA1 Message Date
Kasen IO
3f4b3c4b36 First prototype styling and layout. 2020-04-02 19:29:33 -04:00
kasenvr
243309fdc4
Merge pull request #247 from FluffyJenkins/feature/chat 
Added license
 2020-03-30 18:50:53 -04:00
Fluffy Jenkins
f5b287b084 Added license 2020-03-30 22:10:53 +01:00
David Rowe
0bef98fd96 Relabel "GOTO" app's button to "OLD GOTO" 2020-03-29 13:34:26 +13:00
Kasen IO
46bd7e6001 Update title. 2020-03-27 14:44:33 -04:00
Kasen IO
3a4fbbc0b9 Update to explore app. 2020-03-26 22:28:39 -04:00
Alezia Kurdis
e52e1bafc6
Moved tabs.css reference 
-Change the path for the new location of tabs.css
-Local "style" migrated to "class"
 2020-03-18 18:38:41 -04:00
Alezia Kurdis
022ea6c5fb
Moved tabs.css to system/html/css 
Moved tabs.css to system/html/css
with other css.
 2020-03-18 18:34:51 -04:00
Alezia Kurdis
e371823896
Move the tabs.css with other css 
Move the tabs.css with other css
 2020-03-18 18:33:09 -04:00
kasenvr
d0cea34269
Merge branch 'kasen/core' into feature/default-moreapp 2020-03-16 17:58:58 -04:00
kasenvr
474770f0f2
Merge pull request #190 from kasenvr/feature/interim-goto 
Adds interim decentralizedGoTo as a default script, adds beta channel as well.
 2020-03-16 17:52:47 -04:00
kasenvr
f7e2b277bc
Merge pull request #192 from kasenvr/feature/toggle-beta-defaults 
Adds menu toggle for beta default scripts
 2020-03-16 17:51:28 -04:00
Kasen IO
5c4078320b Undo var -> const in more.html because it doesn't work, because reasons. 2020-03-16 00:39:29 -04:00
Kasen IO
3731b64b37 DisplayApp -> displayApp function name. 2020-03-16 00:28:32 -04:00
Kasen IO
391c4975fa var -> const in more.html 
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
 2020-03-16 00:25:08 -04:00
kasenvr
c78f7a9596
Apply suggestions from code review 
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-03-16 00:22:04 -04:00
Kasen IO
6420752db1 Update code formatting and add search optimization features. 
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
 2020-03-15 23:15:20 -04:00
Kasen IO
f70a9ec4c0 Bugfixing. - authored by Keb Hellion. 2020-03-13 13:34:32 -04:00
Kasen IO
cb4407532d Type check for metadataScript.src. 2020-03-13 10:09:33 -04:00
Kasen IO
bb3da99856 Undo overwritten previous fixes to type checking. 2020-03-12 15:29:11 -04:00
Kasen IO
1f67adc6dd Fix menu unsubscribing. 2020-03-12 03:46:09 -04:00
Kasen IO
4eea4980fd Lint + fix default apps per page + fix script list loading bug. 2020-03-11 14:59:35 -04:00
David Rowe
0839d15c5a Fix button icons 2020-03-11 16:31:02 +13:00
Alezia Kurdis
8ab40e1a08
Fix the userData and materialData editor 
Fix the userData and materialData editor.
Only 2 conditions have been modified to make it works.
I have removed a significant quantity of dead code
that was trying to overlay a static text an obscure reason.
Please, retest this. In case I missed something that I don't know.
 2020-03-10 00:48:54 -04:00
kasenvr
db0bcb9b19
Merge pull request #184 from kasenvr/fix/chat-goto-json 
Updates the var name and URL for the goto JSON for use in chat
 2020-03-09 15:18:38 -04:00
David Rowe
725a06d248 Fix fix 2020-03-06 15:04:58 +13:00
David Rowe
435094ddbe Fix button label and icon 2020-03-06 14:56:03 +13:00
Alezia Kurdis
d934018c7b
Codes minor adjustments 
Codes minor adjustments.
Some formatting issues.
Use element instead of a string
 2020-03-04 18:42:57 -05:00
Alezia Kurdis
206b1b12c5
Additional fixes about the formatting. 
Additional fixes about the formatting.
 2020-03-04 18:26:23 -05:00
Kasen IO
df08f77792 Update menu name from "goTo" to "Explore". 2020-03-04 11:20:57 -05:00
Kasen IO
9b385d91a8 Remove unnecessary var and update function name. 2020-03-04 11:08:38 -05:00
Kasen IO
30b5a28f4e Remove unnecessary checks. 2020-03-04 10:46:16 -05:00
Alezia Kurdis
ed9918a537
Fix for the multiselection. 
This is the fix for the multiselection case.
(It doesn't include the solution for User Data.)
 2020-03-03 19:21:14 -05:00
Alezia Kurdis
e6a45690ba
Color Adjustments 
The color has been attenuated on those 2 icons.
It was too present compared to the others.
 2020-03-02 23:53:55 -05:00
Alezia Kurdis
d1c641de49
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:13:47 -05:00
Alezia Kurdis
4a1926a901
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:11:45 -05:00
Alezia Kurdis
124b3fe6a2
Code minor adjustments. 
Code minor adjustments to be compliant with the coding convention.
 2020-03-02 23:10:33 -05:00
Kasen IO
8092220ea4 Code housekeeping, update URL for guide to link to repo. 2020-03-02 08:51:38 -05:00
Kasen IO
df1d2f28d8 Update app icon. 2020-03-02 08:14:20 -05:00
Alezia Kurdis
f3096ae74d
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:37:44 -05:00
Alezia Kurdis
5c7e6e43c2
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:36:43 -05:00
Alezia Kurdis
fa7143c87e
Replace tabulations for spaces. 
Replace tabulations for spaces in the code.
 2020-03-01 22:35:48 -05:00
Kasen IO
95f1c5da25 Add maintenance header. 2020-03-01 16:41:02 -05:00
Kasen IO
22169d9458 Fixes apps and metadata loading locally or remotely. 2020-03-01 16:13:02 -05:00
Kasen IO
aa8d8f0aef CR revisions. 2020-02-29 17:26:20 -05:00
Alezia Kurdis
0eb6f1f183
Fix page height blocking dropdown 
Fix the page height that blocked the correct use of the shape dropdown.
The layout looks more stable now.
 2020-02-29 15:52:06 -05:00
Alezia Kurdis
29e780e3f1
Sections reorganization 
1- Section "behavior" is now split in 2 sections: "behavior" and "scripts"

2- Particles sections: "particles_acceleration" and "particles_spin" 
has been joined as a new section: "particles_behavior"

3- Particles section: "particles_alpha"  has been merged under  section: "particles_color"
 2020-02-29 14:07:15 -05:00
Alezia Kurdis
bb422a3832
Icons for sections reorganization 
behavior will be split: behavior,  scripts
particles_behavior will replace: particles_acceleration and particles_spin
 2020-02-29 14:02:57 -05:00
Alezia Kurdis
2bd0950a01
Delete particles_spin.png 
Not going to be used.
 2020-02-29 14:00:10 -05:00
Alezia Kurdis
fd0186f997
Delete particles_acceleration.png 
No going to be used.
 2020-02-29 13:59:38 -05:00
Kasen IO
d8d84004ce Update file header. 2020-02-29 13:32:01 -05:00
Kasen IO
aa2ec12d8d Add missing files required for local running of the script. 2020-02-29 13:11:55 -05:00
Alezia Kurdis
3c4e073874
Properties Editor using tabs 
Properties Editor using tabs instead of collapsible sections to avoid painful scrolling.
 2020-02-28 23:52:24 -05:00
Kasen IO
1090c8e1be Adds menu toggle for beta default scripts. 2020-02-28 10:08:54 -05:00
Kasen IO
0f5a83b970 Adds more app as default script w/ beta branch pulling from repo URL. 2020-02-28 01:44:54 -05:00
Kasen IO
4c6be03865 Adds decentralizedGoTo as a default script, adds beta channel as well. 2020-02-28 01:20:21 -05:00
Kasen IO
4455fae3de staging -> interim metaverse location & terminology. 2020-02-27 14:41:50 -05:00
David Rowe
5db58bd9b8 Add inspect.js to default scripts 2020-02-27 21:14:49 +13:00
Kasen IO
33791875cb Add app-more.js to default scripts. 2020-02-26 21:46:45 -05:00
Kasen IO
f240cb9f46 Updates the var name and URL for the goto JSON for use in chat. 2020-02-26 14:24:06 -05:00
Kasen IO
6b4080b042 Fix module check. 2020-02-25 18:08:07 -05:00
Kasen IO
5dbd294166 Remove leftover cachebust on pickRayController.js 2020-02-25 02:11:12 -05:00
kasenvr
68d9ec81d9
Merge branch 'kasen/core' into feature/default-nametag 2020-02-25 02:09:30 -05:00
Kasen IO
1636175e4a Makes simplified namtag a default script, disabled while using inspect.js (alt key) 2020-02-25 01:40:17 -05:00
kasenvr
754e57ca78
Update FloofChat.js 
Created a chat relay on the metaverse server, grid chat now works again.
 2020-02-16 20:20:04 -05:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
Fluffy Jenkins
5492759a0c Made requested changes and changed how it loads 2020-01-29 19:50:23 +00:00
Fluffy Jenkins
a66bbcb125 Made fixes 2020-01-28 22:23:01 +00:00
Fluffy Jenkins
b8e41fd244 Added basic beta default scripts feature 2020-01-28 22:06:27 +00:00
George Deac
7b97fa879d
Update FloofChat.html 2020-01-26 01:18:15 +02:00
George Deac
bbae98e194
Merge branch 'kasen/core' into kasen/core 2020-01-23 23:21:22 +02:00
George Deac
8ad8457ebe
Add files via upload 2020-01-22 21:54:31 +02:00
kasenvr
31ea9e33c7
Merge pull request #107 from FluffyJenkins/feature/communityModules 
Fixed url parsing breaking with text formatting! <3
 2020-01-21 22:53:52 -05:00
Fluffy Jenkins
f77f629cad Fixed bug caused by code review changes uwu 2020-01-22 02:56:53 +00:00
Fluffy Jenkins
553b7d1f38 Code Review Changes 2020-01-21 22:54:35 +00:00
Fluffy Jenkins
d32fc6ab86 Fixed url parsing breaking with text formatting! <3 2020-01-21 22:02:53 +00:00
kasenvr
65dde00f6c
Merge pull request #95 from FluffyJenkins/feature/communityModules 
Add goto json support (defaults to darlings goto), etc
 2020-01-17 12:13:41 -05:00
Marcus Llewellyn
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes." 2020-01-16 18:51:49 -06:00
Fluffy Jenkins
6bed25ee27 Formatting (bloody ide not doing qml) 2020-01-16 19:44:34 +00:00
Fluffy Jenkins
1e47165303 fixed minor bug, whoops 2020-01-15 21:38:25 +00:00
Fluffy Jenkins
81f8c5bab8 fixed json support if invalid json 2020-01-15 21:20:23 +00:00
Fluffy Jenkins
bc35ef5776 Add goto json support (defaults to darlings goto), gotos (gotosudo) which bypasses the popup window and added history to the main chatbar so you can press up/down on there 2020-01-15 21:17:17 +00:00
Marcus Llewellyn
2a3b117f5d
Merge pull request #64 from ctrlaltdavid/feature/inspect 
inspect.js improvements
 2020-01-14 12:35:35 -06:00
Marcus Llewellyn
653b333060
Merge pull request #85 from kasenvr/fix/obsolete-apps 
Removed obsolete default scripts + more branding changes.
 2020-01-14 12:33:30 -06:00
Fluffy Jenkins
64149af8ce Fixed goto to go to in dialog I HOPE YOU'RE HAPPY KALILA ;w; 2020-01-13 23:54:57 +00:00
Fluffy Jenkins
ae620b78af Added /l /d /g chatbar switches and /goto 2020-01-13 23:45:38 +00:00
David Rowe
681bd3cb1e Fix inspect not working after change camera mode 2020-01-14 11:34:16 +13:00
Kasen IO
336b5e275b Removed obsolete default scripts + more branding changes. 2020-01-12 23:13:01 -05:00
David Rowe
316abaeedc Fix jitter when start moving camera in edit mode focused on entity 2020-01-12 17:37:58 +13:00
David Rowe
2abbdfbfe9 Fix unnecessary "away" enabling and disabling 2020-01-12 16:32:20 +13:00
David Rowe
4ebf4e5cfd Ignore invisible 2020-01-12 16:27:03 +13:00
David Rowe
37b7a9c5f4 Use Picks API and orbit about point in space if no intersection 2020-01-12 16:26:23 +13:00
Fluffy Jenkins
b8dbb4585f Changed css 2020-01-11 21:09:21 +00:00
Fluffy Jenkins
6b77f6023f Added use strict to the inworld JS's 2020-01-11 20:41:23 +00:00
Fluffy Jenkins
49fc4df07a Made more changes but still not all <3 2020-01-11 20:34:30 +00:00
Fluffy Jenkins
227be7062b Made most of requested changes 2020-01-11 20:17:47 +00:00
Fluffy Jenkins
71b708cedc Removed nonused assets 2020-01-11 04:29:01 +00:00
Fluffy Jenkins
cb9563ab09 Fixed chat history bug 2020-01-08 04:42:00 +00:00
Fluffy Jenkins
d27d9645bd Removed some debug 2020-01-08 01:03:09 +00:00
Fluffy Jenkins
3d8283bd8e added to DefaultScripts 2020-01-08 00:54:48 +00:00
Fluffy Jenkins
9066682d32 Prevent dragging 2020-01-08 00:37:00 +00:00
Fluffy Jenkins
27d2aaa8ce Added formatting and grid chat and mute and god knows send help please 2020-01-08 00:17:54 +00:00
David Rowe
32848ef8c6 Update description of operation 2020-01-06 11:41:05 +13:00
David Rowe
3857fa1a4d Restore "away" behavior when restart script 2020-01-06 11:35:53 +13:00
David Rowe
6749239e4e Reduce the duration of the initial look-at time 2020-01-06 11:27:39 +13:00
David Rowe
31b76a0a22 Don't go "away" when press Esc key while inspecting 2020-01-06 11:25:39 +13:00
David Rowe
a1056f34ed Cope with slight avatar position and orientation jitter when stationary 2020-01-06 11:14:12 +13:00
David Rowe
81e1dd4d6a Exit inspect mode when press Esc or move avatar 2020-01-06 11:10:10 +13:00
David Rowe
ac34d49c1b Leave camera where it is after releasing Alt key 2020-01-06 11:04:23 +13:00
David Rowe
fcc1f928a1 Lint 2020-01-06 10:58:49 +13:00
Fluffy Jenkins
d57ba9a337 Added chat WIP 2019-12-21 19:25:46 +00:00
Fluffy Jenkins
7d0343966a Made some changes to hopefully pass code review 2019-12-20 01:19:04 +00:00
Fluffy Jenkins
74de0c2f2c Creating communityModules folder with notificationCore.js 2019-12-20 01:09:31 +00:00
Brad Hefta-Gaub
bb68f92d3e
Merge pull request #16562 from ctrlaltdavid/DEV-2442 
DEV-2442: Fix main gamepad (XBox controller) controls
 2019-12-13 13:36:20 -08:00
Brad Hefta-Gaub
2d56d7c026
Merge pull request #16551 from ctrlaltdavid/DEV-1943 
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
 2019-12-13 10:53:24 -08:00
Marcus Llewellyn
c08e1a227c
Revert "Adds community script directory, adds chat as default app." 2019-12-12 11:10:01 -06:00
Marcus Llewellyn
67dca7639f Adds community script directory, adds chat as default app. 
This adds a community directory under the scripts directory. George Deacon's chat app has been placed within, and is loaded as a default script.
 2019-12-11 12:25:43 -06:00
David Rowe
6060dad638 Resurrect gamepad Y teleport button 2019-12-08 12:38:48 +13:00
Howard Stearns
11aa2e829f
Merge pull request #16540 from SimonWalton-HiFi/screenshare-zone 
DEV-2700: Add screenshare property to zones and evaluate in avatar mixer
 2019-12-02 10:17:42 -08:00
David Rowe
48680a0fe2 Remove now-unnecessary getEntityProperties() call from WebTablet.js 2019-12-01 21:46:35 +13:00
luiscuenca
f17caf48ca
Add automaticLookAt.js to the developer scripts 2019-11-26 13:42:01 -07:00
Simon Walton
6e23924ed9 Add screenshare zone-property - WIP 2019-11-25 13:22:35 -08:00
DouglasWilcox
b8d7f50eaf Put away animation into resource and update script to use local resource path. 2019-11-21 14:50:05 -08:00
luiscuenca
fbd6fd8703
Add comments and connect update signal only when is necessary 2019-11-20 16:42:33 -07:00
Shannon Romano
a5943f8ac8
Merge pull request #16443 from ctrlaltdavid/DEV-2646 
DEV-2646: Use Alt to clone entities on Mac
 2019-11-19 14:02:10 -08:00
Brad Hefta-Gaub
63b21af562
Merge pull request #16506 from ctrlaltdavid/DEV-2764 
DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart
 2019-11-19 12:05:10 -08:00
David Rowe
0b98885c7f Remove the BodyMart tip from the interstitial page 2019-11-19 10:33:30 +13:00
Sam Gateau
6370059a96
Merge pull request #16483 from AndrewMeadows/debug-workload-selection 
Add tools for debugging entity workload proxies
 2019-11-18 11:02:00 -08:00
Zach Fox
3b9a8b426f
Merge pull request #16502 from MiladNazeri/dev-2718/models-brought-in-at-incorrect-dimensions 
dev-2718/models-brought-in-at-incorrect-dimensions
 2019-11-15 15:54:08 -08:00
Zach Fox
b64ce343bd
Merge pull request #16429 from MiladNazeri/screenshareElectronApp 
Screenshare in Interface!
 2019-11-15 15:32:51 -08:00
milad
2fc0f01928 added natural dimensions after loading 2019-11-15 15:16:09 -08:00
milad
87adae6c6f cr 2019-11-15 12:48:32 -08:00
MiladNazeri
481e239a37
Update scripts/system/create/edit.js 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-11-15 12:43:25 -08:00
milad
4ae3c67493 added Entities.isLoaded 2019-11-15 11:45:05 -08:00
milad
b8b7e20c1a added clickToZoom header 2019-11-14 17:17:33 -08:00
Zach Fox
ee7c539d7e Add Click to Zoom to the repo and bootstrapper 2019-11-14 17:05:47 -08:00
David Rowe
7fbc9f5c5c emove the "acceleration" entity property from the Create app 2019-11-15 12:11:15 +13:00
David Rowe
45eda40466 Enable Alt action for cloning on Mac 2019-11-13 10:48:08 +13:00
Andrew Meadows
cf08a4162a add workload job to help debug entity proxies 2019-11-12 10:35:16 -08:00
Shannon Romano
895619c71f
Merge pull request #16461 from ctrlaltdavid/DEV-2649 
DEV-2649: Fix entities list "filter to frustum" eye button
 2019-11-08 10:28:24 -08:00
Shannon Romano
79df071c23
Merge pull request #16468 from RebeccaStankus/webEntities 
Made web entities not grabbable by default
 2019-11-08 10:27:44 -08:00
Sabrina Shanman
9180a639df
Merge pull request #16440 from ctrlaltdavid/DEV-2648 
DEV-2648: Fix Cmd-click multi-select in entity list on Mac
 2019-11-07 14:06:39 -08:00
Sabrina Shanman
deceb16a9b
Merge pull request #16451 from ctrlaltdavid/DEV-2650 
DEV-2650: Remove "user" icon from Entities List
 2019-11-07 13:59:28 -08:00
Rebecca Stankus
4173cc46e2 Made web entities not grabbable by default 2019-11-06 14:11:17 -08:00
Zach Fox
a2f784d225 DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI 2019-11-06 11:26:10 -08:00
David Rowe
eeceec35d6 Fix entities list "filter to frustum" button 2019-11-06 12:22:45 +13:00
David Rowe
5fb18566fe Use Alt to clone entities on Mac 2019-11-06 09:55:16 +13:00
David Rowe
a8173e9477 Remove "user" icon from Entity List 2019-11-05 13:55:31 +13:00
David Rowe
7db99cce6b Fix Cmd-clone entities on Mac 2019-11-02 12:07:11 +13:00
David Rowe
4e12750255 Typo 2019-11-02 11:00:16 +13:00
David Rowe
3bb65edafb Fix Cmd-click multi-select in entity list on Mac 2019-11-02 09:51:21 +13:00
Sam Gateau
52e80f15af Ending a joke 2019-11-01 12:57:45 -07:00
Sam Gateau
52ac59fad3 Ending a joke 2019-11-01 12:55:34 -07:00
Sam Gateau
a3d8cb8a78 Ending a joke 2019-11-01 12:52:22 -07:00
Zach Fox
c578eb2d9b DEV-2574: Make emote shortcuts case-insensitive 2019-10-28 11:24:42 -07:00
Zach Fox
4f7028ff0f DEV-2575: Automatically lower raised hand if talking 2019-10-25 14:05:29 -07:00
Zach Fox
a6bcbe4c66 DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial 2019-10-23 14:32:03 -07:00
Sam Gateau
32b23c70e6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-22 16:25:38 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Shannon Romano
a6842b5cba
Merge pull request #16346 from dooglifeSF/change_away_animation 
New AFK "away" animation
 2019-10-16 09:17:51 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction 
First Time User Experience Project
 2019-10-15 14:56:25 -07:00
Zach Fox
9b9110e163 Remove cachebusting code 2019-10-15 12:26:18 -07:00
Zach Fox
4770008383 DEV-2426: Update Emote Indicator icon 2019-10-15 11:39:00 -07:00
dooglifeSF
e757a6fd86 Merge branch 'master' into change_away_animation 2019-10-15 10:46:24 -07:00
dooglifeSF
589d4e992c Change away anim to hosted afk_texting animation. 2019-10-14 16:48:45 -07:00
RebeccaStankus
5831eb261f Changed calculation of overlay size 2019-10-14 16:08:01 -07:00
RebeccaStankus
4720c64af8 Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay 2019-10-14 13:02:54 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867 
DEV-1867: Fix toolbarTest.js
 2019-10-14 11:50:59 -07:00
Rebecca Stankus
4ac87ef503 Moved position of settings app 2019-10-11 16:20:37 -07:00
Rebecca Stankus
377ffe9698 Fixed calculation of overlay position 2019-10-11 16:02:55 -07:00
David Rowe
5292dddc39 Rewrite toolbarTest.js 2019-10-12 10:10:41 +13:00
Zach Fox
222b1fbd20 Fix bug with debugFTUE === 1 2019-10-11 12:26:12 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Zach Fox
3f00c524fb DEV-2379: Modify Shadow-related tooltips in Create 2019-10-10 11:47:40 -07:00
Sam Gateau
597d4b1af7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-10 09:02:44 -07:00
Zach Fox
a5caa36f07
Merge pull request #16318 from MiladNazeri/dev-2082/cannont-click-yourself-in-third-person-for-nametag 
dev-2082/cannot-click-yourself-in-third-person-for-nametag
 2019-10-09 19:34:00 -04:00
Zach Fox
609f6f9a25 Fix minimize bug; fix bug where FTUE window appears behind Interface window 2019-10-09 15:46:50 -07:00
Zach Fox
bed1192d70 A bunch of fixes, plus added a debug mode Settings switch 2019-10-09 14:18:36 -07:00
Seth Alves
1ce3cebe1f force LOD to be 20-20 on android, and force lodAngleDeg to 0.248 2019-10-09 14:04:44 -07:00
milad
77d17e0ff7 removed extra disconnect function 2019-10-09 13:26:53 -07:00
Zach Fox
601f7ac5e9 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-09 13:26:21 -07:00
milad
e2fee5361d updated startup/shutdown 2019-10-09 13:09:38 -07:00
milad
06244338d6 updated nametags to work in selfie mode 2019-10-09 12:36:44 -07:00
Sam Gateau
ff36b7a390 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-09 10:00:56 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals 
Added flag to ensure mouse event signals are not connected twice
 2019-10-08 15:58:24 -07:00
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -04:00
Zach Fox
753a61ed2c More iteration with Joshua 2019-10-08 17:31:10 -04:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Zach Fox
9feab869ad DEV-2350: Prevent duplicate default scripts from running 2019-10-08 14:48:19 -04:00
Zach Fox
42bf2bf30e All windows 'done' except for final tweaks; debug mode still ON 2019-10-08 13:17:04 -04:00
Zach Fox
b0adf1ef02 Almost done with init screen 2019-10-07 20:29:18 -04:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04:00
Sam Gateau
d714cc6da6 FIxing some stuff ? 2019-10-04 17:55:37 -07:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes 
Fix for Mat4.getForward, getRight and getUp
 2019-10-04 17:00:43 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp 
It should match the results from the same methods on the Quat class.
 2019-10-04 13:59:38 -07:00
RebeccaStankus
31dcbf532f Missed a Capital letter in a function name 2019-10-04 10:10:54 -07:00
RebeccaStankus
8089653784 CR Feedback changes 2019-10-04 09:43:47 -07:00
Sam Gateau
a5ccd07347 Adding the material fields ui yeah, todo: many errors for undefined fields 2019-10-03 22:43:44 -07:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Sam Gateau
a5c10abcac Working on improving the material inspector 2019-10-03 17:04:40 -07:00
Zach Fox
0e7dff05fb Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn 2019-10-03 12:55:02 -07:00
RebeccaStankus
1dd6aebede Handle minimized window 2019-10-03 12:16:39 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -07:00
RebeccaStankus
94e71e1bdd Still trying get QML gridLayouts to work 2019-10-02 17:14:50 -07:00
RebeccaStankus
b1fd6050c7 Merged Zach's work 2019-10-02 12:55:51 -07:00
RebeccaStankus
47841d9bcd Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-02 12:42:53 -07:00
RebeccaStankus
dc15b55aa5 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-02 12:05:34 -07:00
Zach Fox
6bfca4e587 DEV-2275: Move 'input device muted' banner and make it slightly smaller 2019-10-02 11:48:50 -07:00
Zach Fox
50b06a40d7 Improved random avatar selection logic, plus local avatars 2019-10-01 17:22:24 -07:00
RebeccaStankus
d2e62749c7 Ready for Zach to add default avatar changes 2019-10-01 16:36:06 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt 
DEV-442: Implement directional blending node for point reaction
 2019-10-01 11:46:30 -07:00
RebeccaStankus
3167dc9a35 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -07:00
RebeccaStankus
6658e6377c Adding 1 simplifiedUI constant import 2019-09-30 15:06:31 -07:00
RebeccaStankus
0f1190df8b Trying to make QML UI work second launch 2019-09-30 15:03:58 -07:00
RebeccaStankus
9a03058e88 Trying to make QML UI work 2019-09-30 12:09:22 -07:00
luiscuenca
02d889ba6e
account for point target validity 2019-09-30 11:35:00 -07:00
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