Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 08:48:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

2086 commits

Author SHA1 Message Date
David Rowe
2c84478dc1 Register metatype 2020-09-20 01:29:32 +02:00
Dale Glass
89aa89e9d3 Review fixes (non-working) 
Trouble with:

> Script.getExternalPath(Script.ExternalPaths.Assets, "hi")

[UncaughtException evaluate] Error: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType()) in about:console:1 [Backtrace] <global>() at about:console:1
TypeError: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType())
 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
26bcaa420d Better enum registration 2020-09-20 01:29:32 +02:00
Kalila L
bcd5f242b9 Added type and filename doc for Script API. 2020-09-18 18:52:49 -04:00
Kalila L
9f3978d3d5 Update system to use a checkbox + setting instead. 2020-09-17 18:40:01 -04:00
Kalila L
8eb12a873b Revert forceRedownload functionality. 2020-09-17 14:14:32 -04:00
kasenvr
8a007a4edf
Apply suggestions from code review 
Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-07 01:38:44 -04:00
Kalila L
ab46b1fc9e Update ScriptEngine.cpp 
Just some revisions...
 2020-09-03 01:41:31 -04:00
Kalila L
4096d75bb4 Add checkbox for showing extra source logs. 2020-09-01 16:46:22 -04:00
Heather Anderson
ee43cfd892 add more details to messages logged in entity scripts 2020-08-30 23:47:54 -07:00
Kalila L
2645547f48 Add forceRedownload parameter to Script.require 2020-08-27 05:57:28 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -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
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
David Rowe
5a91de016e Fix scripts not running at Interface start after reloading all scripts 2020-02-08 16:50:46 +13:00
Kasen IO
428a5b65ff Lint 2020-01-27 13:13:36 -05:00
Kasen IO
8b03d1bd19 Removed unnecessary var. 2020-01-25 19:08:56 -05:00
kasenvr
fe48427d38
Update libraries/script-engine/src/ScriptEngine.cpp 
Co-Authored-By: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
 2020-01-25 19:02:12 -05:00
Kasen IO
d6cf4db930 Fixed bug 2020-01-25 12:48:43 -05:00
Kasen IO
aa0c225809 Merge branch 'kasen/core' into fix/whitelist-qml-adds 2020-01-24 19:55:23 -05:00
David Rowe
7ed117dfcb Replace links to docs.highfidelity.com 2020-01-24 10:18:55 +13:00
Kasen IO
c121a8ef2a Housekeeping. 2020-01-23 03:06:58 -05:00
Kasen IO
7a985b445e removed extra debug, added debug for user awareness. 2020-01-22 14:53:55 -05:00
Kasen IO
fd5ee3e1a7 Whitelist toggle now works. 2020-01-22 14:48:15 -05:00
Kasen IO
98473abbb4 QML works, C++ works but does a manual set to true, does not see updates from QML set setting. 2020-01-22 11:29:37 -05:00
Kasen IO
61943d0edb non-working state 2020-01-21 22:51:30 -05:00
Kasen IO
bd066adbf6 Whitelist toggle not working c++ side. 2020-01-20 16:03:48 -05:00
Marcus Llewellyn
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching 
Ability to change Metaverse API from setting
 2020-01-14 18:40:04 -06:00
David Rowe
ec1e6bc7d3 Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
David Rowe
050c6e2cc5 Merge branch 'DOC-212' into api-docs 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2020-01-14 18:04:17 +13:00
David Rowe
b9a1b78531 Merge branch 'DOC-68' into api-docs 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2020-01-14 18:02:23 +13:00
kasenvr
5fdd563bfa
Merge pull request #65 from kasenvr/fix/whitelist-server 
Whitelist Quality of Life Updates
 2020-01-09 17:55:45 -05:00
Kasen IO
2c7911acb8 more housekeeping 2020-01-09 16:15:41 -05:00
Fluffy Jenkins
672ac8066b Made changes 2020-01-08 04:38:33 +00:00
Kasen IO
a6dc494d7c housekeeping 2020-01-07 19:40:42 -05:00
Kasen IO
13d79fec8b Fixes bools and tab. 2020-01-07 13:04:28 -05:00
Kasen IO
d87cd01129 Adds major QOL updates to whitelist 2020-01-07 03:03:08 -05:00
Fluffy Jenkins
3c4d56bc50 Fixed whitespace 2020-01-07 04:10:15 +00:00
Fluffy Jenkins
b33ad80992 Init push 2020-01-07 04:00:13 +00:00
Kasen IO
20f5439fa8 Hard tabs converted to 4 length soft tabs. 2020-01-06 08:58:09 -05:00
Kasen IO
8124b7d4a1 Fixed tabs and spaces. 2020-01-06 08:29:01 -05:00
Kasen IO
fb5dbfc52a Disable whitelist on entity_server scripts. 2020-01-05 23:32:28 -05:00
David Rowe
2dd981493e Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
David Rowe
a92830f2c1 Miscellaneous JSDoc fixes 2019-12-23 09:09:27 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
David Rowe
1ebc6a575e Model API JSDoc 2019-12-20 13:33:48 +13:00
David Rowe
5256f58520 Document callback function signatures for Script.addEventHandler() 2019-12-17 16:17:45 +13:00
David Rowe
3aaeba76a9 Fix typos in WebSocket JSDoc 2019-12-17 09:20:18 +13:00
David Rowe
025c136561 XMLHttpRequest API JSDoc 2019-12-17 09:19:47 +13:00
David Rowe
ea72036757 Typos 2019-12-14 12:36:36 +13:00
David Rowe
5359efead8 Add JSDoc missing for callback parameter 2019-12-14 12:33:51 +13:00
David Rowe
13abf7f016 WebSocket and WebSocketServer JSDoc 2019-12-14 11:59:18 +13:00
David Rowe
bbd16d7544 Fix global print function's JSDoc 2019-12-11 07:42:58 +13:00
David Rowe
5caa21e5d9 Update Script JSDoc accordingly 2019-12-11 07:42:40 +13:00
David Rowe
7d2e818ab1 console JSDoc 2019-12-11 07:41:37 +13:00
Kasen IO
3e6660b633 Updated whitelist debugs for clarity in dev log 2019-12-09 08:30:02 -05:00
Kasen IO
2de388ab3b Fixes bug where empty "" whitespace allows all scripts. 2019-12-09 01:20:04 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
Kasen IO
edfce861a8 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:56:19 -05:00
Kasen IO
07d706d681 Removed all hardcoded whitelist rules 2019-12-01 22:55:51 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
Brad Davis
d4b3a9ba49 Github actions 2019-11-18 15:20:37 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
David Rowe
777f969919 Typo 2019-10-24 09:00:29 +13:00
David Rowe
fffb81b474 Merge branch 'master' into DOC-191 2019-10-24 08:23:27 +13:00
David Rowe
185d6990eb Add missing threading checks to Recording API methods 2019-10-16 09:17:29 +13:00
David Rowe
e708cb98bb Fix crash in Recorder.stopRecording() when no recording is being made 2019-10-15 11:29:49 +13:00
David Rowe
1715a86dba Fix typo in Assets JSDoc 2019-10-12 07:58:26 +13:00
David Rowe
e4bc3a7d9d Recording JSDoc 2019-10-12 07:58:13 +13:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
jennaingersoll
8d8449d8d7
Merge pull request #16166 from ctrlaltdavid/DOC-159 
DOC-159: File JSDoc
 2019-10-07 16:37:11 -07:00
Shannon Romano
5bbe271c7a
Merge pull request #16299 from ctrlaltdavid/DOC-187 
DOC-187: Mat4 JSDoc
 2019-10-07 09:11:32 -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
David Rowe
70577b8f34 Remove "not working" warnings in anticipation of fix 2019-10-05 12:13:57 +13:00
Anthony J. Thibault
521f64f152 normalize axes returned by Mat4.getForward getUp and getRight 2019-10-04 14:10:28 -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
David Rowe
6e6d438d36 Tidying 2019-10-05 09:34:31 +13:00
David Rowe
a56f82c1ba Mat4 JSDoc 2019-10-05 09:27:31 +13:00
Simon Walton
95248c7ccd Add <future> header for Android 2019-09-30 23:43:06 -07:00
Simon Walton
595b473be7 Make AssetScriptingInterface::initializeCache() blocking 2019-09-30 17:55:24 -07:00
David Rowe
b174e002a9 Implement Recording.setPlayerVolume() 2019-09-24 12:52:51 +12:00
David Rowe
9d9317c50d Miscellaneous fixes and typos 2019-09-20 10:19:45 +12:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
David Rowe
7bbca94d43 Doc review 2019-09-12 14:41:43 +12:00
Shannon Romano
fa8c959699
Merge pull request #16133 from ctrlaltdavid/DOC-59 
DOC-59: Assets JSDoc
 2019-09-11 17:19:45 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
David Rowe
04203b1425 File JSDoc 2019-09-10 12:01:38 +12:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398 
BUGZ-1398: Tablet access to local HTML
 2019-09-06 09:59:22 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
David Rowe
49ab504226 Make placement of callback JSDoc consistent 2019-09-05 12:23:56 +12:00
David Rowe
06ebba554e Doc review 2019-09-05 12:23:12 +12:00
David Rowe
6474705ca2 Reformat "supported script types" in Entities and Scripts signals 2019-09-04 21:06:30 +12:00