Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 08:24:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
82150 commits 75 branches 59 tags 1.2 GiB
Commit graph

1906 commits

Author SHA1 Message Date
sabrina-shanman
67a06b3a74 Attempt to fix crash from script running too late 2019-08-28 14:28:12 -07:00
David Rowe
8c735ed6ae Fix ScriptDiscoveryService.scriptsModel.parent() crash for invalid index 2019-08-28 16:32:52 +12:00
David Rowe
757a4f908b Fix ScriptDiscoveryService.scriptsModel.data() crash for invalid row 
Also fixes unexpected data for invalid column > 1.
 2019-08-28 16:32:22 +12:00
David Rowe
3e795d9b99 Typos and improvements 2019-08-27 10:03:26 +12:00
David Rowe
c19c1c9a5d Scripts API JSDoc fixes 2019-08-27 09:24:01 +12:00
David Rowe
fff2a15960 ScriptsModel and ScriptsModelFilter classes' JSDoc 2019-08-27 09:24:01 +12:00
David Rowe
e1e74a2c34 ScriptDiscoveryService API JSDoc 2019-08-27 09:24:00 +12:00
David Rowe
2ad1d7a2a2 Fix typos 2019-08-22 10:27:17 +12:00
David Rowe
942347158a Collapse some function signatures' JSDoc 2019-08-22 10:16:56 +12:00
David Rowe
11e72c638b Assets API compression methods JSDoc 2019-08-22 09:47:25 +12:00
David Rowe
5f3081784c Assets API methods that include mappings JSDoc 2019-08-21 12:36:37 +12:00
David Rowe
817bc6cd43 Assets API base functionality JSDoc 2019-08-21 09:50:23 +12:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown 
BUGZ-984: Wait for client entity-scripts to unload when shutting down
 2019-08-16 10:12:38 -07:00
Simon Walton
9aacd136b8 Add blocking to script unload for client entity-scripts 2019-08-14 13:51:40 -07:00
Clement
90aeb636bd Delete reply after the callback is executed 2019-08-12 17:21:22 -07:00
Clement
b2704da9ef Don't manage _sendData's memory 2019-08-07 15:04:20 -07:00
Clement
0b72e4dc60 Make XML HTTP requests script owned 
This was causing them to leak every time
 2019-08-07 13:18:39 -07:00
amerhifi
a37ef7d80e adding default script location setting for defaultscriptoverride runs. Prevents the second interface run to have no ui 2019-08-02 13:00:43 -07:00
amerhifi
0ee9de7ed8 lambda space 2019-08-02 11:24:21 -07:00
amerhifi
d05f1ac87f adding ability to reload defaultOverrdie script without saving to settings: 2019-08-02 11:23:33 -07:00
Kalila R
8b6cce5889 Moved getTypeAsString function from public to protected 2019-07-30 17:26:49 -04:00
Simon Walton
2ebc6e66fe Merge remote-tracking branch 'upstream/master' into scriptaudioinjector-delete-via-signal 
Need 985 PR.
 2019-07-26 09:53:23 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
Simon Walton
a9d3413626 Delete script audio-injector wrapper when wrapped object goes 2019-07-25 17:51:01 -07:00
Simon Walton
53cf915e8d Guard for AudioInjectorManager existance; clear an audio interface pointer 2019-07-24 14:51:41 -07:00
humbletim
c5b2514e0e fix linux build warning; remove unnecessary code 2019-07-23 12:13:49 -04:00
Shannon Romano
23c7e1c0f3
Merge pull request #15843 from SamGondelman/quit 
Fix ScriptEngines::loadScript invoke call
 2019-07-15 08:32:16 -07:00
kasenvr
e9e9607a3b modkit core changes initial commit 
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
 2019-07-14 21:35:13 -04:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts 
DEV-164: Add defaultScriptsOverride option
 2019-07-10 10:16:55 -07:00
Ryan Huffman
d29cd796ca Add defaultScriptsOverride option 2019-07-01 23:51:34 -07:00
Anthony Thibault
6c66f5a37b Fix for DependencyManager crash on shutdown on Mac 
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.

However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early.  Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.

To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.

However, this is only a speculative fix, because this is so difficult to reproduce.
 2019-07-01 17:37:57 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
SamGondelman
fb4be671e7 fix invoke call 2019-06-26 10:54:50 -07:00
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
David Rowe
eb227c6b9a Document Entities entity methods 2019-06-22 11:59:07 +12:00
Shannon Romano
13615eb9ff
Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread 
(BUGZ-619) Fix potential crash when ending script on main thread
 2019-06-21 15:08:42 -07:00
sabrina-shanman
4fafa2135a Fix potential crash when ending script on main thread 2019-06-21 14:20:15 -07:00
Zach Fox
8044b33d65 This also works 2019-06-21 13:44:31 -07:00
Zach Fox
5067fd4cd2 OK this is definitely working 2019-06-21 13:41:11 -07:00
Zach Fox
d49205be74 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-20 09:45:49 -07:00
David Rowe
0945bdaac7 Remainder of Entities methods' JSDoc 2019-06-20 15:11:01 +12:00
Simon Walton
7701710aa5 Consider a NetworkClipLoader resource with null URL to be failed 2019-06-19 15:02:16 -07:00
Zach Fox
8fdfdbaae4 Another attempt, still not working 2019-06-19 13:31:21 -07:00
SamGondelman
37feb7f027 merge with master 2019-06-10 10:29:39 -07:00
jennaingersoll
677b54e240
Merge pull request #15684 from ctrlaltdavid/DOC-78 
DOC-78: Polish Vec3 JSDoc
 2019-06-05 16:26:32 -07:00
David Rowe
42cb3d9828 Polish Vec3 API JSDoc 2019-06-06 10:26:43 +12:00
Shannon Romano
a3d3190813
Merge pull request #15678 from ctrlaltdavid/DOC-75 
DOC-75: Polish Users JSDoc
 2019-06-05 14:20:19 -07:00
David Rowe
eac7d298dc Change "privacy bubble" to "privacy shield" 2019-06-06 08:21:22 +12:00
David Rowe
ef56cba71b Polish Uuid API JSDoc 2019-06-05 14:39:27 +12:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
David Rowe
0bdca38644 Polish Users JSDoc 2019-06-05 11:46:14 +12:00
Anthony J. Thibault
e1534b34b4 Workaround crash in reportAdditionalMemoryCost other platforms 2019-06-04 08:56:07 -07:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh 2019-05-23 09:35:14 -07:00
David Rowe
5227b35c6b Revise changes 2019-05-21 10:32:12 +12:00
David Rowe
ca7ddece8b Add missing Script JSDoc 2019-05-21 10:32:12 +12:00
David Rowe
0a0a25139c Deprecate items that shouldn't be in the Script API 2019-05-21 10:32:12 +12:00
David Rowe
d196e35701 Polish existing Script JSDoc 2019-05-21 10:32:12 +12:00
David Rowe
0e478de1a2 Stub out missing Script JSDoc 2019-05-21 10:32:12 +12:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
Shannon Romano
72d000a76d
Merge pull request #15521 from ctrlaltdavid/M22489 
Case 22489: Scene JSDoc
 2019-05-13 15:49:44 -07:00
David Rowe
71f7132a6b Scene JSDoc 2019-05-08 09:17:11 +12:00
David Rowe
638e040e17 Quat JSDoc update 2019-04-30 12:13:08 +12:00
David Rowe
fbe49bbfd4 Doc review 2019-04-27 10:20:35 +12:00
David Rowe
311826c04d Merge branch 'master' into M22215 2019-04-27 10:03:24 +12:00
David Rowe
7dde764907 Merge branch 'master' into M21956 
# Conflicts:
#	libraries/audio/src/Sound.h
 2019-04-23 14:58:23 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12:00
David Rowe
60298245da Menu JSDoc update 2019-04-16 11:24:24 +12:00
David Rowe
28dfac64ba Merge branch 'master' into M21460 
# Conflicts:
#	libraries/image/src/image/Image.h
 2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd Updates per doc review 2019-04-05 17:10:52 +13:00
Ryan Huffman
cf3a9b1d48 Fix ScriptEngine not being destroyed on its own thread 2019-04-04 13:28:13 -07:00
David Rowe
dff013128e Text improvements and typos 2019-03-30 10:09:48 +13:00
David Rowe
da45b4db38 Add further Audio API examples 2019-03-30 09:51:02 +13:00
David Rowe
5c8d89fb12 Fill in and tidy Audio API JSDoc 2019-03-29 18:53:30 +13:00
David Rowe
9a1bb27034 AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc 2019-03-26 13:58:43 +13:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio 
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
 2019-03-21 18:03:58 -07:00
danteruiz
2ab8eb98e8 better implementation 2019-03-17 14:00:41 -07:00
danteruiz
5f3e31b119 add ui to kick api 2019-03-15 18:15:18 -07:00
SamGondelman
300dd39abf fix script engine shutdown 2019-03-13 12:23:31 -07:00
David Rowe
7445d73857 Merge branch 'master' into M21222 
# Conflicts:
#	libraries/avatars/src/AvatarData.h
 2019-03-13 16:14:14 +13:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00
David Rowe
5068075645 Fill in MyAvatar animation JSDoc 2019-03-09 07:42:55 +13:00
SamGondelman
f2c248c0a2 disable href and entity script events when in edit mode 2019-03-04 17:10:20 -08:00
Seth Alves
9614216006 don't disable server echo when audio qml page is closed 2019-03-04 13:47:55 -08:00
Seth Alves
d5e8cba1ee make server-audio-loopback button work in HMDs 2019-03-04 13:47:55 -08:00
David Rowe
aa53ab7492 Distinguish between Mat4 type and Mat4 API in JSDoc 2019-02-27 09:54:11 +13:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
danteruiz
30bd9774b2 script engine to load platform specific files 2019-02-05 13:11:54 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2 
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
 2019-01-29 13:12:51 -08:00
Ken Cooke
fa08e42da6 Restore legacy attenuation behavior for system sounds and scripts that do not set position. 
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
 2019-01-29 11:21:02 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities 
case 20595: case 20563: Do not delete local entities when switching domains.
 2019-01-17 11:25:58 -08:00