Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-23 19:43:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85900 commits 23 branches 28 tags 1.2 GiB
Commit graph

6597 commits

Author SHA1 Message Date
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' 
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
 2020-06-10 02:49:13 +02:00
David Rowe
6df34d2a89 Reduce minimum inspect distance 2020-06-08 08:10:19 +12:00
Kasen IO
f1aa7391ec Fix test data. 2020-06-01 16:43:04 -04:00
Kasen IO
100bf3a91e Add .glb item type. 2020-06-01 15:41:09 -04:00
kasenvr
079c0c022e
Merge pull request #406 from kasenvr/fix/entity-size-on-create 
Bugfix: Create app now uses proper dimensions on create
 2020-06-01 12:40:50 -04:00
Kasen IO
778276bb43 Adjust how check is performed. 2020-05-30 20:56:28 -04:00
Kasen IO
3c21a4d3f6 Fix Create app using naturalDimensions for all entity types. 2020-05-30 19:58:54 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1 
Merge K2.1 into Master
 2020-05-30 18:49:38 -04:00
kasenvr
41c961198c
Merge pull request #369 from AleziaKurdis/feature/zonesSelectorSorted 
Zones Selector sorted by zone names
 2020-05-29 20:44:45 -04:00
Alezia Kurdis
0b330dfcd6
Zone selector sorting vs uppercases 
This makes the sorting of the Zone in the Zone selector
with the uppercase grouped with the lowercase for a same letter
but uppercase always first.
(Note: Accented char are considered as a different letter. We would need to support exception cases for all the existing charsets. These are only entities descriptors, not really for literature.)
 2020-05-28 23:32:44 -04:00
Kasen IO
83bbbbb8b1 Add distance display to share items menu. 2020-05-26 00:50:26 -04:00
David Rowe
b32bdba111 Reinstate controller module priorities per master 2020-05-26 14:58:27 +12:00
David Rowe
c05225ca2f Reinstate nearParentGrabOverlay controller module 
Fixes regression where tablet becomes large when grabbed if avatar is
small.
 2020-05-26 14:58:13 +12:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
Alezia Kurdis
b7393b2398
Make the zones sort as case insensitive 
Make the sort of the zone selector to be case insensitive.
 2020-05-23 22:54:45 -04:00
Kasen IO
623857c0de Bump version number, add distance notice to receiving item. 2020-05-23 19:13:06 -04:00
humbletim
cb80c6be1a +app icon 2020-05-23 14:01:07 -04:00
Kasen IO
7e09b4c6a2 Styling of send item display name. 2020-05-23 12:09:40 -04:00
Kasen IO
172cfa9527 Fix send item display name. 2020-05-22 23:37:07 -04:00
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02:00
Alezia Kurdis
e6d092aefe
Code Adjustment 
Code Adjustment

{
    ...
    listExistingZones.sort(zoneSortOrder());
    return listExistingZones;
}

function zoneSortOrder() {
    return function(a, b) {
        if (a.name > b.name) {
            return 1;    
        } else if (a.name < b.name) {
            return -1;
        }
        return 0;
    }
}
 2020-05-21 22:13:33 -04:00
Kasen IO
5d75c177be Fix item inbox. 2020-05-21 21:17:11 -04:00
Kasen IO
301bc58e64 Fix folder finder. 2020-05-21 20:04:57 -04:00
Kasen IO
49cdfd7711 Update folder finder. 2020-05-21 19:52:43 -04:00
Kasen IO
259203dd9b Inbox now shows message if empty. 2020-05-21 19:21:11 -04:00
Kasen IO
a16e122c44 Comment out console.info's 2020-05-21 19:01:12 -04:00
Kasen IO
205830c383 Created event bus, fixed use item, receivingItemDialog non-working. 2020-05-21 18:50:53 -04:00
David Rowe
7634478aba Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-22 08:52:08 +12:00
Kasen IO
bb1f26d581 Update sorting for folders. 2020-05-20 18:39:52 -04:00
Kasen IO
42b82884b3 Update main sorting. 2020-05-20 18:32:59 -04:00
Alezia Kurdis
3023924cf1
Minor code adjustments 
Minor code adjustments
 2020-05-20 16:11:48 -04:00
Kasen IO
203095a999 Fix pushing management. 2020-05-20 15:38:36 -04:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -04:00
Kasen IO
8d9ad0aed4 Update More App to latest revision. 
More app now links to cdn.vircadia.com and also has a developer mode.
 2020-05-19 18:22:20 -04:00
Alezia Kurdis
3a0c4e1477
Zones Selector sorted by zone names 
This change makes the Zones Selector sorted by zone names.
To address issue: renderWithZones: zone list incorrectly sorted. #354
(But this doesn't fix the problem with the scrolling)
 2020-05-18 23:48:02 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
3c43207b0f Fix general folder movement. 2020-05-17 01:16:57 -04:00
Kasen IO
1b965dfc14 Latest not-working-state. 2020-05-16 23:35:24 -04:00
David Rowe
63ba8400f7 Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-16 11:23:38 +12:00
MotoFufu9k
dd9728a09f
Change standard grabbable setting to false 2020-05-13 23:06:36 +02:00
Alezia Kurdis
5d00341662
Correct value to ENTIRE_DOMAIN_SCAN_RADIUS 
Set the correct value to constant: ENTIRE_DOMAIN_SCAN_RADIUS

var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
to reach all the entities of a domain from the center,(including in the corners) the radius must be:
sqr((16000 ^2) + (16000) ^2 + (16000 ^2))
which is once rounded = to 27713.
 2020-05-09 15:24:18 -04:00
Alezia Kurdis
d575616a6d
Code Adjustments. 
Constant used for ENTIRE_DOMAIN_SCAN_RADIUS instead of 17000
Missing spaces,
and line too long being adjusted.
 2020-05-09 15:08:38 -04:00
Alezia Kurdis
6357dd91f5
Fix EOL from Windows to Unix 
Fix EOL from Windows to Unix
 2020-05-09 02:50:16 -04:00
Alezia Kurdis
c96591367b
Fix the wrong merge 2020-05-08 23:41:52 -04:00
Alezia Kurdis
74f7b324b8
Reconvert EOL to Unix style. 
Reconvert EOL to Unix style.
 2020-05-08 23:36:05 -04:00
Alezia Kurdis
637352052b
Merge branch 'master' into feature/renderWithZones-Create-UI 2020-05-08 15:20:31 -04:00
Alezia Kurdis
096bc40aa3
Merge the "screenshare" modifs 
Merge the "screenshare" modifs with renderWithZones update
 2020-05-08 15:16:38 -04:00
David Rowe
c6774016b5 Further fixes 2020-05-08 15:12:09 +12:00
David Rowe
395f950cb3 Fix whitespace and line endings in tabs.css 2020-05-08 14:59:01 +12:00
Alezia Kurdis
95562f7e23
Merged of "screenshare" and requested changes. 
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611

2- Include merge for conflict (not detected by Github) for "screenshare" attribute
 2020-05-07 22:46:35 -04:00
Alezia Kurdis
91d234589e
Minor Code Adjustment 
Minor Code Adjustment
and uncommented the new property renderWithZones
 2020-05-06 23:39:11 -04:00
Alezia Kurdis
5180c9b247
Minor Code Adjustment 2020-05-06 23:36:39 -04:00
Alezia Kurdis
f43b0f52f5
Minor code adjustments 
Add missing space between ":" and the value for many class attributes.
 2020-05-06 23:16:56 -04:00
Alezia Kurdis
cc308c11b6
Minor Code Adjustment 
Line 50: removed extra space char.
 2020-05-06 23:06:33 -04:00
Alezia Kurdis
1671887602
Merge branch 'master' into kasen/core 2020-04-29 12:02:12 -04:00
Alezia Kurdis
962d4671eb
To avoid a regression at some point 2020-04-27 22:49:42 -04:00
Alezia Kurdis
c42734cba8
adding screenshare with the real file 2020-04-27 22:47:49 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -04:00
Alezia Kurdis
e850e6fe22
Adding field screenshare 
Adding field screenshare
to avoid conflict
 2020-04-27 22:05:24 -04:00
Seth Alves
3f249dfcd8 fix controller-module run order so that equip works again 2020-04-26 12:25:19 -07:00
Seth Alves
07034721c7 adjust when stylus input is active 2020-04-26 12:23:43 -07:00
Seth Alves
4f7252a0d8 enable and disable TranslateZ mapping, as needed 2020-04-26 12:23:43 -07:00
Seth Alves
a799d305ee don't mess with TranslateZ unless module is active 2020-04-26 12:23:43 -07:00
Seth Alves
600c2c3947 double OK to open/close tablet. touch thumb-tips to walk backwards 2020-04-26 12:23:43 -07:00
Seth Alves
865584e7e3 put tracked hand walk into a controller-dispatcher module 2020-04-26 12:23:40 -07:00
Seth Alves
63dcf0e1c9 use same near-grab module to grab entities and overlays 2020-04-26 12:22:53 -07:00
Seth Alves
17ceda0d3e quiet jshint 2020-04-26 12:22:53 -07:00
Seth Alves
5511b18432 don't allow the hand with the mini-tablet to trigger opening the tablet 2020-04-26 12:22:53 -07:00
Seth Alves
fa4d055ab1 disable far-trigger and grab if using hand tracker 2020-04-26 12:22:53 -07:00
Seth Alves
1c926db2db if hands are tracked, make mini-tablet be just a big open-tablet button (remove mute and goto buttons) 2020-04-26 12:22:53 -07:00
Seth Alves
296617977c get near-grab working with camera-tracked hands 2020-04-26 12:22:52 -07:00
Seth Alves
2c535fa204 touching tips of index-fingers together means walk forward 2020-04-26 12:22:50 -07:00
Seth Alves
3d4de67c49 allow thumb+index finger pinch to mean same as trigger click 2020-04-26 12:20:05 -07:00
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core 
Update master with kasen/core's latest changes
 2020-04-25 14:46:01 -04:00
Kasen IO
d343589d16 Folder recursion safeguards established. 2020-04-24 03:16:31 -04:00
Kasen IO
3197ec12a5 Basic folder moving functionality, missing safeguards. 2020-04-24 02:52:05 -04:00
Kasen IO
35fe561ceb Fix deep iteration. 2020-04-24 01:14:11 -04:00
Kasen IO
14689bea87 Folder sort and folder list generation fixed. 2020-04-23 23:23:53 -04:00
Kasen IO
14823d84d6 Begin fixing functionality for deep iteration. 2020-04-23 04:04:16 -04:00
Kasen IO
c9961226b6 Correctly use mutations, fix functions missing from component. 2020-04-20 23:38:12 -04:00
Kasen IO
633c7e4515 Nesting works correctly now... 2020-04-20 00:41:03 -04:00
Kasen IO
f5f49ec3ae Now properly using mutations. 2020-04-16 23:05:33 -04:00
Kasen IO
d7f1fd4fe3 Switching to use Vuex, need to use mutations to set. 2020-04-16 18:16:37 -04:00
Kasen IO
55ff5a92bf Further conversion state, functions not fully transferred/synced. 2020-04-16 02:17:21 -04:00
Kasen IO
ff333d120f Save state of conversion... too tired. 2020-04-13 22:25:14 -04:00
Kasen IO
35da6721ea Do not cache newly installed scripts in the more app. 2020-04-13 00:24:35 -04:00
Kasen IO
c783a68387 Account for unknown item types, add version number. 2020-04-11 20:48:39 -04:00
Kasen IO
f5d9fe0f50 Fix code. 2020-04-11 19:58:48 -04:00
Kasen IO
44d4097b47 Add extra folder selection functionality. 2020-04-11 19:55:25 -04:00
Kasen IO
79851c801a Working type checking & folder state, need to optimize. 2020-04-11 19:23:37 -04:00
Kasen IO
705c3dd404 "Serverless" -> "Place", cut item spawn distance from you in half. 2020-04-11 18:10:47 -04:00
Kasen IO
e7f5b333db Version number + improved URL file type detection. 2020-04-11 18:05:35 -04:00
Kasen IO
c809089203 Idk. 2020-04-11 02:49:41 -04:00
Kasen IO
cc3b893d74 Remove old inventory. 2020-04-11 02:48:51 -04:00
Kasen IO
05feab6bc1 Remove extra console.log. 2020-04-10 03:23:46 -04:00
Kasen IO
d5cbcbffcc Resize buttons to fit. 2020-04-10 03:22:51 -04:00
Kasen IO
318faa3119 Fix the rest of the functions, folder checking needs rework. 2020-04-10 03:01:49 -04:00
Kasen IO
8a216d88ad Fix item copying... (fml) 2020-04-10 01:40:59 -04:00
Kasen IO
362c807948 Work in progress item moving. 2020-04-09 23:57:01 -04:00
Kasen IO
2ef8586477 Better search iteration and handling. 2020-04-09 19:31:09 -04:00
Kasen IO
c6917cae3b Convert to uppercase to allow for case insensitive entry. 2020-04-09 03:51:47 -04:00
Kasen IO
4b7f92f1d1 Add JSON file loading support. 2020-04-09 03:39:33 -04:00
Kasen IO
3ebdc59071 Add serverless item support. 2020-04-09 03:12:51 -04:00
Kasen IO
aa526445a6 Optimize folder actions. 2020-04-09 02:37:04 -04:00
Kasen IO
5440508254 Fix items in folders deletion, editing, optimize process. Add folder sort. 2020-04-09 02:36:53 -04:00
Kasen IO
32c06299bb Formatting, folder settings and remove system added. 2020-04-09 01:48:13 -04:00
Kasen IO
d86033dfbf Fix drag and drop. 2020-04-09 00:59:52 -04:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
Kasen IO
bf5caa26b5 Sizing is universal now. 2020-04-08 21:58:05 -04:00
Kasen IO
2e77393b93 Semi working drag-between state... 2020-04-08 03:19:52 -04:00
Kasen IO
7d1bcc9cb9 Add draggable v0.5, fix some formatting. 2020-04-08 00:55:46 -04:00
Kasen IO
b78b8e753e Relocated inventory.js script to correct spot. 2020-04-07 22:01:07 -04:00
Kasen IO
825cf0a21c Fix directories of deployment. 2020-04-07 21:08:12 -04:00
Kasen IO
e794091824 Serve working, build not working. 2020-04-07 19:55:51 -04:00
Kasen IO
30b0735358 Added Vuetify. 2020-04-07 19:30:56 -04:00
Kasen IO
1d235b7d5a Converting to full Vue app. 2020-04-07 19:01:29 -04:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
Kasen IO
46959e6446 Moved Vue and JS out of main .html file. 2020-04-06 20:14:35 -04:00
Kasen IO
1dc9c5b5a7 Create folder functionality added. 2020-04-06 19:54:40 -04:00
Kasen IO
3c405a7066 Add basic folder functionality, not implemented yet. 2020-04-06 05:14:40 -04:00
Alezia Kurdis
9c5f8fc946
Typo 
missing dot.
 2020-04-05 02:18:51 -04:00
Kasen IO
30b8497430 Add compact slider and full settings persistence. 2020-04-05 02:16:48 -04:00
Alezia Kurdis
6d33713e35
Better tooltip for renderWithZones property 
Better tooltip for renderWithZones property
 2020-04-05 02:14:10 -04:00
Alezia Kurdis
cdef49d633
Fix tooltip text for particles alpha properties 
Fix the tooltip's text for particle alpha properties.
 2020-04-04 22:18:59 -04:00
Kasen IO
1bea2870f0 Enable dev and compact basic mode. 2020-04-04 21:24:06 -04:00
Kasen IO
70a0d50ede Switch to UUID system. 2020-04-04 20:27:21 -04:00
Kasen IO
4fd69061be Check itemTypeBug. 2020-04-04 06:46:38 -04:00
Kasen IO
13d48fb0a7 Comma.. 2020-04-04 06:45:16 -04:00
Kasen IO
7e414d47c7 Add sending and receiving items. 2020-04-04 06:42:19 -04:00
Kasen IO
f1ff399225 Nearby user loading functionality enabled. 2020-04-04 05:13:11 -04:00
Kasen IO
c0df50de3c Event bridge + use item functionality enabled. 2020-04-04 04:45:02 -04:00
Kasen IO
118ccbdbe5 Fix share dialog. 2020-04-04 03:30:55 -04:00
Kasen IO
1a348d02f9 Form validation functionality enabled. 2020-04-04 03:16:47 -04:00
Kasen IO
d6793f79ba Share functionality enabled. 2020-04-04 01:55:45 -04:00
Kasen IO
00d388d94d Receive functionality enabled. 2020-04-04 01:04:10 -04:00
Kasen IO
e8027ac6a2 Edit functionality enabled. 2020-04-04 00:22:41 -04:00
Kasen IO
c89f07d508 Add and remove functionality enabled. 2020-04-04 00:03:03 -04:00
Alezia Kurdis
4a3405484c
Add new property "renderWithZones" 
Add the new property "renderWithZones" to the Create App.
For this, a new type of renderer type has been added: "Multiple Zones Selector".
(Required for the PR#78)
 2020-04-03 23:43:36 -04:00
Alezia Kurdis
16c5d8c051
Support for "Multiple Zones Selector" Renderer 
Add the code to expose the Zones list to the entityProperty.
as support for the new "Multiple Zones Selector" Renderer type.
(Required to support the new property "renderWithZones" for PR #78)
 2020-04-03 23:37:18 -04:00
Alezia Kurdis
0afca55e18
Add the new property "renderWithZones" 
This adds the Tooltip for new property "renderWithZones"
(Required for PR#78)
 2020-04-03 23:32:45 -04:00
Alezia Kurdis
0338d8a9f4
New classes for the "Multiple Zones Selector" Renderer 
Added:
New CSS classes for the "Multiple Zones Selector" Renderer
(Required for  the new property "renderWithZones" for PR#78)
 2020-04-03 23:27:01 -04:00
Alezia Kurdis
4b4a1bd8c0
Icons for "Multiple Zones Selector" Renderer 
2 new icon added for the "Multiple Zones Selector" Renderer
(required for the new property "renderWithZones" for PR#78):
"Add" and "Remove".
 2020-04-03 23:23:20 -04:00
Kasen IO
d8693d4d43 License headers. 2020-04-03 02:12:27 -04:00
Kasen IO
42ab992397 Even *further* progress. 2020-04-03 01:46:14 -04:00
Kasen IO
e138278ebc Further progress. 2020-04-02 21:12:40 -04:00
Kasen IO
3f4b3c4b36 First prototype styling and layout. 2020-04-02 19:29:33 -04:00
David Rowe
0bef98fd96 Relabel "GOTO" app's button to "OLD GOTO" 2020-03-29 13:34:26 +13: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
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
4eea4980fd Lint + fix default apps per page + fix script list loading bug. 2020-03-11 14:59:35 -04: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
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
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
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
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
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
0f5a83b970 Adds more app as default script w/ beta branch pulling from repo URL. 2020-02-28 01:44:54 -05:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
Marcus Llewellyn
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes." 2020-01-16 18:51:49 -06:00
Marcus Llewellyn
2a3b117f5d
Merge pull request #64 from ctrlaltdavid/feature/inspect 
inspect.js improvements
 2020-01-14 12:35:35 -06: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
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
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
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
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
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
David Rowe
0b98885c7f Remove the BodyMart tip from the interstitial page 2019-11-19 10:33:30 +13: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
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
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
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
dooglifeSF
589d4e992c Change away anim to hosted afk_texting animation. 2019-10-14 16:48:45 -07:00
Zach Fox
3f00c524fb DEV-2379: Modify Shadow-related tooltips in Create 2019-10-10 11:47:40 -07:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
Ryan Huffman
609b533cf2 Fix create duplication key conflicting with camera orbit 2019-08-06 17:23:13 -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
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
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
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
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
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
RebeccaStankus
352f9590b1 Fixed Qt.resolvedUrl format 2019-07-05 16:23:29 -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
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
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -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
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Sam Gondelman
1540c5d203
Merge pull request #15401 from SamGondelman/grid 
Case 22229: Create Grid ignorePickIntersection
 2019-04-24 12:24:27 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -07:00
Thijs Wenker
386d392144 The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = > 2019-04-18 19:05:40 +02:00
Thijs Wenker
dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2019-04-18 00:21:11 +02:00
SamGondelman
54d7bde91a grid ignorePickIntersection 2019-04-17 10:56:55 -07:00
unknown
2839879657 Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix 2019-04-16 15:26:47 -07:00
Shannon Romano
ec22f7847e
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster 
Case 22130: PR 15366 changes from v82 to Master
 2019-04-16 15:17:08 -07:00
Thijs Wenker
ef7c34eadd addressed more CR feedback 2019-04-15 19:04:24 +02:00
unknown
d342d93ec9 fix material targets when re-opening properties to same entity 2019-04-12 14:49:59 -07:00
Thijs Wenker
00a024fde2 fixing materialTargets, after the rebase 2019-04-12 20:06:32 +02:00
Thijs Wenker
c283c062c1 CR changes 2019-04-12 19:32:05 +02:00
Thijs Wenker
8b24cf51de enhance the multi editing experience 2019-04-12 19:32:05 +02:00
Thijs Wenker
8e97c4f3f2 multi-editing support for properties 2019-04-12 19:30:12 +02:00
Thijs Wenker
71770e3f4e move entity selection update code to its own function 2019-04-12 19:29:36 +02:00
Thijs Wenker
aef4f28194 unused variables / missing semi-colon 2019-04-12 19:26:03 +02:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
Shannon Romano
13fb3148a5
Merge pull request #15352 from dback2/materialTargetMasterFollowup 
Case 22082, 22101: PR 15325 follow up and PR 15351 RC82 > Master
 2019-04-11 17:53:05 -07:00
Ryan Huffman
f2474b4d2b Fix lack of ranges on numerical types in Create 2019-04-11 14:20:52 -07:00
unknown
ca7cfc0240 only call onMove on lastMouseEvent change 2019-04-10 09:56:35 -07:00
unknown
d63c733b85 move undo edits after creates/deletes 2019-04-08 16:05:13 -07:00
unknown
1537d4351d CR changes from PR 15325 2019-04-08 14:07:25 -07:00
unknown
b8b9035f9d fix avatar/shape material targets, refresh material target when parent changes 2019-04-08 13:43:22 -07:00
Thijs Wenker
98e0164964
Merge pull request #15281 from kitely/copy-grandchild-entities 
case 21980: Allow copying grandchild entities
 2019-04-08 19:59:46 +02:00
Ryan Huffman
aff80dec26
Merge pull request #15325 from dback2/dynamicMaterialTargetProperties 
Case 20738: add dynamic multiselect for material target property
 2019-04-05 17:55:26 -07:00
Shannon Romano
7e354a953b
Merge pull request #15276 from huffman/fix/new-properties-in-create 
Case 20739: Add new web and base properties to Create
 2019-04-05 16:55:19 -07:00
Ryan Huffman
a4919320b3
Merge pull request #15277 from dback2/editHandleContinualTranslateFix 
Case 20896: Fix continual edit handle translation when moving
 2019-04-05 15:40:57 -07:00
unknown
f2aa155e1e tweak style, add scrolling 2019-04-05 15:35:37 -07:00
unknown
4f4ec064e4 add dynamic multiselect for material targets 2019-04-05 15:35:37 -07:00
Ryan Huffman
9c4b3f017f
Remove min/max on web entity maxFPS 
Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.
 2019-04-05 15:08:48 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes 
Case 21859: Particle Entity emitter shapes, including model
 2019-04-03 11:03:33 -07:00
unknown
8dbdee4262 better fix for trailing key events 2019-04-03 09:08:29 -07:00
David Back
93fc8e2e18 fix continual translation when moving 2019-04-02 15:11:32 -07:00
Ryan Huffman
ea2e62c1ca
Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities 
Case 20826: Add damping to new dynamic entities in Create
 2019-04-02 14:28:35 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Saracen
90e979bda7 Add option to disable triggering an away state when interface 
focus is lost.
 2019-03-31 18:44:16 +01:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables 
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
 2019-03-29 10:41:21 -07:00
Wayne Chen
3c65b92ff5 moving text position higher 2019-03-29 10:41:16 -07:00
Wayne Chen
248f9ba375 adding mute overlay back into HMD and have warn when muted disable in desktop 2019-03-29 10:32:13 -07:00
Ryan Huffman
bcb38b6626 Add damping to new dynamic entities in Create 2019-03-29 09:01:42 -07:00
Roxanne Skelly
73cf51182e
Merge pull request #15262 from roxanneskelly/Case20832 
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
 2019-03-28 12:01:24 -07:00
Oren Hurvitz
69ebf1629d Allow copying grandchild entities. 
Using Copy/Paste on entities only worked for one level of children, but not for grandchildren.
 2019-03-28 11:00:09 +02:00
Ryan Huffman
9abd0943ff Add new web and other properties to Create 2019-03-27 16:29:04 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
Seth Alves
e085a00256 cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open 2019-03-27 10:12:58 -07:00
Seth Alves
d25d290394 refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term 2019-03-27 10:12:58 -07:00
Seth Alves
e6c279ee5b unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers 2019-03-27 10:12:58 -07:00
Seth Alves
fa36f12145 lock wearables when adjust-wearables page is opened 2019-03-27 10:12:57 -07:00
Seth Alves
4fe94a4b32 when new wearables are added or removed, rerun getWearablesLocked() and update UI 2019-03-27 10:12:57 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables. 
allow grabbing / adjusting others' wearables if they are unlocked.
 2019-03-27 10:12:57 -07:00
Seth Alves
84385e6061 work around fb-21767 with a timer 2019-03-26 09:40:22 -07:00
Seth Alves
4303dd589f make sure equip attachment-points pulled from settings are reasonable before using them 2019-03-26 09:40:22 -07:00
Seth Alves
195472bd43 make equipping of clonables more reliable 2019-03-26 09:40:22 -07:00
Wayne Chen
c54e8f5569 showing ptt text always + hmd mode switch fix 2019-03-25 17:32:03 -07:00
Roxanne Skelly
90b9de8623 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832 2019-03-25 14:48:26 -07:00
Roxanne Skelly
1608b24be1 ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
r3tk0n
3ac42e69e3 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-25 11:27:31 -07:00
Wayne Chen
390ce9bb26 wip for getting AvatarInputsBar to switch accordingly 2019-03-22 15:34:06 -07:00
Wayne Chen
7b5deb692c fixing x value change 2019-03-22 14:54:18 -07:00
Wayne Chen
1f71a291a5 displaying offset values 2019-03-22 14:54:18 -07:00
Wayne Chen
554a144b0e adding tool to change avatar inputs properties 2019-03-22 14:54:17 -07:00
Wayne Chen
584fa1f17b more wip 2019-03-22 14:54:17 -07:00
Wayne Chen
6cf8b06c6d more wip on adding qml to adjusting ui position 2019-03-22 14:54:16 -07:00
Wayne Chen
cb715c3e55 fixing typos 2019-03-22 14:54:16 -07:00
Wayne Chen
b6ebdb5315 alpha to max value of detecting transparency 2019-03-22 14:54:16 -07:00
Wayne Chen
4cbe8cd4d1 Adding alpha to entities to enable transparency 2019-03-22 14:54:15 -07:00
Wayne Chen
ee1a14505a adding constants, removing entity creation in cpp 2019-03-22 14:54:15 -07:00
Wayne Chen
44ed9e607b cancelling out roll and pitch 2019-03-22 14:54:15 -07:00
Wayne Chen
d834c5aca1 adding test script for creating avatar input bar 2019-03-22 14:16:29 -07:00
Wayne Chen
d382893e75 staging avatar inputs for ignore radius 2019-03-22 14:16:28 -07:00
Roxanne Skelly
efffb8b819
Merge pull request #15239 from roxanneskelly/Case20617 
Case 20617 - People app filter bar breaks when deleting connections
 2019-03-22 11:31:46 -07:00
r3tk0n
86ffa44771 Swap flying binding to other hand. 2019-03-21 17:05:20 -07:00
Thijs Wenker
9a14cfc7df make sure that onWebEventReceived has the correct context in VR 2019-03-21 23:46:33 +01:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
08bc47d722 Disable tablet button on off hand (translation hand). 2019-03-21 15:06:03 -07:00
r3tk0n
8f5a8d0caa Fix typo that broke fargrab. Grip or Trigger on off hand will now manipulate. 2019-03-21 14:38:11 -07:00
Roxanne Skelly
87d75ec75c Case 20617 - People app filter bar breaks when deleting connections 2019-03-21 12:08:42 -07:00
John Conklin II
4483e3c069
Merge pull request #15168 from danteruiz/fix-notifications-scaling 
Case 21501: Notification bar text fails to render when avatar is scaled very small
 2019-03-21 09:47:55 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
Thijs Wenker
20c3a36308
Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed 
Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]
 2019-03-20 19:43:37 +01:00
Roxanne Skelly
640b05304a Case 21392 - Excise unneeded code from marketplacesInject.js 2019-03-19 16:24:07 -07:00
Thijs Wenker
19c51b25d1 don't ignore updates that originate from entityPropertiesTool itself 2019-03-20 00:18:21 +01:00
r3tk0n
c9ade7ccb8 Add grip to fargrab. 2019-03-15 16:09:01 -07:00
danteruiz
5dab4c0010 remove white-space 2019-03-15 10:47:48 -07:00
Thijs Wenker
aeb56ff22a EntityList -> re-focus the rename field rather then re-selecting the text fully 
EntityProperties -> ignore selection updates when nothing is changed and window is focused
 2019-03-14 01:26:06 +01:00
danteruiz
1e354fb280 fix notications scaling 2019-03-12 17:18:15 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Wayne Chen
84b177996b removing dead code 2019-03-11 16:43:26 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Shannon Romano
864c37d310
Merge pull request #15155 from sethalves/fix-clonables 
Fix cloneables
 2019-03-11 14:17:20 -07:00
Seth Alves
e515e9cc66 fix cloneEntity function 2019-03-11 12:38:54 -07:00
Seth Alves
2fb5e1ebc2 quiet some logging 2019-03-11 12:36:29 -07:00
Roxanne Skelly
e4e8a61328 Case 21326 - missing marketplaceInject.js 
The re-addition of marketplaceInject.js didn't merge from 80
for some reason.
 2019-03-11 10:46:51 -07:00
r3tk0n
ec0cf3ee3a Fix typo. 2019-03-11 09:58:20 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
r3tk0n
5f48a6d104 Fix typo. 2019-03-08 16:07:47 -08:00
r3tk0n
24d6646e8d Fix activation / deactivation criteria for PTT controller module. 2019-03-08 16:07:47 -08:00
r3tk0n
3b274c2b6e Enable pushToTalk.js controller module. 2019-03-08 16:02:16 -08:00
r3tk0n
f6add9cafd Add pushToTalk.js controllerModule. 2019-03-08 16:02:15 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
Roxanne Skelly
e94d248ac5
Merge pull request #15126 from howard-stearns/domainUnlimited 
unlimited certified copies in a domain
 2019-03-08 10:23:42 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module 
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
 2019-03-07 16:04:57 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Shannon Romano
b567fd6cac
Merge pull request #15105 from danteruiz/disable-entity-scaling 
Case 20830: Disable entity scaling while grabbing
 2019-03-07 16:01:34 -08:00
Shannon Romano
37727c8b60
Merge pull request #14938 from dback2/draggableNumberDisabled 
Case 20662: Entity Properties - fix disabling draggable numbers
 2019-03-07 15:33:21 -08:00
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -08:00
danteruiz
05dc30a740 more requested changes 2019-03-07 10:49:37 -08:00
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -08:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master 
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
 2019-03-06 13:06:45 -08:00
Shannon Romano
fc2f1ff994
Merge pull request #14955 from thoys/fix/create/reloadCrash 
Case 18299: Remove workaround for Interactive window crash now that it is fixed
 2019-03-06 12:46:00 -08:00
danteruiz
272ca5dc1c disable entity scaling 2019-03-05 16:23:40 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
216b53dcb0 attempt to take background noise into account when triggering mute warning 2019-03-04 13:47:55 -08:00
Seth Alves
f83f2b8226 keep muted warning in center of view for HMD 2019-03-04 13:47:55 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Seth Alves
d54d0280c2 rework audioMuteOverlay.js 2019-03-04 13:47:54 -08:00
Wayne Chen
90a6e0d9b0 changing mute warning position 2019-03-04 11:42:43 -08:00
Seth Alves
bbad6af0d6 attempt to take background noise into account when triggering mute warning 2019-03-04 11:08:07 -08:00
Seth Alves
76aa6fb1b9 keep muted warning in center of view for HMD 2019-03-04 11:08:06 -08:00
Seth Alves
38256df0f2 add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 11:08:06 -08:00
Seth Alves
3f52361753 rework audioMuteOverlay.js 2019-03-04 11:08:06 -08:00
Shannon Romano
6d297d91f6
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation 
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
 2019-03-04 10:49:16 -08:00
r3tk0n
12ffa41984 Prevent HUD and Web Surface lasers from interrupting FarGrab. 2019-03-02 13:55:06 -08:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero) 
Also tweaks from original reviewer comments.
 2019-03-01 17:25:46 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo 
case 21485: removing quest-demo specific changes
 2019-03-01 15:03:44 -08:00
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation 
FarGrab Entity Rotation with Off-Hand
 2019-03-01 14:42:59 -08:00
danteruiz
618a1d5b83 fix tablet button and gizmos rotation 2019-03-01 14:31:12 -08:00
Jason Najera
6346df54af
Merge pull request #15061 from r3tk0n/away_bubble_protection 
[MS#21495] Enable Bubble/Shield on Away
 2019-03-01 11:17:48 -08:00
amer cerkic
6ebc57994b Merge branch 'master' into quest-demo 2019-03-01 10:23:41 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling 
Case 21424: Tablet does not properly resize when scaling avatar.
 2019-03-01 09:37:47 -08:00