Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 14:13:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83473 commits 25 branches 0 tags 1.1 GiB
Commit graph

6221 commits

Author SHA1 Message Date
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