kasenvr
4b2c71cf61
Update libraries/script-engine/src/ScriptEngine.cpp
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-10-25 19:49:59 -04:00
Kalila L
50067e3361
Prevent crash on entity-script-server for due to logging interface.
2020-10-25 18:36:20 -04:00
kasenvr
b182a7b371
Merge pull request #669 from odysseus654/pr/script-logging
...
add more details to messages logged in entity scripts
2020-10-06 04:35:11 -04:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs
2020-10-02 15:33:28 -04:00
kasenvr
c975d1acec
Update libraries/script-engine/src/ScriptEngine.h
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-10-02 15:32:05 -04:00
Kalila L
853c8052f4
Merge branch 'master' into pr/669
2020-10-02 15:29:51 -04:00
Dale Glass
1d58ac4d79
Sanitize the URL further by removing leading slashes and any duplicated ones
2020-09-23 23:33:22 +02:00
Dale Glass
b243d382fc
Fix warning due to multiline comment
2020-09-23 22:34:01 +02:00
David Rowe
c6ba42b7d6
Fix calculating external resource paths
2020-09-23 22:15:13 +12:00
David Rowe
ba7242f4dc
Script.getExternalPath() and related JSDoc
2020-09-23 17:23:40 +12:00
Kalila L
7b7038fae1
Bunch of URL updates later...
2020-09-21 00:54:49 -04:00
kasenvr
88fc213644
Apply suggestions from code review
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-19 23:53:04 -04:00
Dale Glass
25a9716642
Fix crash due to incorrect assert
2020-09-20 02:08:22 +02:00
Dale Glass
2de0934598
Some missed review fixes
2020-09-20 01:57:44 +02:00
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
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
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
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
