Commit graph

6257 commits

Author SHA1 Message Date
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
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes." 2020-01-16 18:51:49 -06:00
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