Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 01:32:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
82863 commits 67 branches 56 tags 1.2 GiB
Commit graph

8316 commits

Author SHA1 Message Date
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
35da6721ea Do not cache newly installed scripts in the more app. 2020-04-13 00:24:35 -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
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
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
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
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
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
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
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
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