Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 21:28:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 25 branches 0 tags 1.1 GiB
Commit graph

1925 commits

Author SHA1 Message Date
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08: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
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge 
log purge
 2019-01-15 16:19:03 -08:00
Dante Ruiz
e7d3844620 making pre review requests 2019-01-14 11:14:57 -08:00
Seth Alves
6ca9ab6fba avoid shutdown crash 2019-01-11 15:53:49 -08:00
Seth Alves
36040597ba rename variable for consistency 2019-01-11 15:53:49 -08:00
Seth Alves
6589db628a fix a couple shutdown crashes and a class of asan warning 2019-01-11 15:53:49 -08:00
Howard Stearns
62ed84aa19 more log purge 2019-01-11 12:34:44 -08:00
unknown
f8f13e974d property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties 2019-01-02 11:12:10 -08:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts 
fix realod all scripts functionality broken by PR14478
 2018-12-09 17:30:36 -08:00
Dante Ruiz
177a94b9a9 fix realod all scripts functionality 2018-12-07 11:48:03 -08:00
Clement
7723261cb9 Remove deferred script loading logic 2018-12-05 14:08:30 -08:00
Wayne Chen
a2a4d2ff89 removing trailing debug 2018-12-05 08:21:11 -08:00
Wayne Chen
07599c02c8 true reversion of scrips param 2018-12-05 08:16:54 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2 2018-11-28 19:10:20 -08:00
Dante Ruiz
c4a9ca3445 fix interface crashing when reloading scripts 2018-11-27 09:32:37 -08:00
Wayne Chen
b8d8710604 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-19 09:02:16 -08:00
Wayne Chen
c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-14 14:47:56 -08:00
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
Zach Fox
e0ca535853 CR round 2 2018-11-08 10:08:42 -08:00
Wayne Chen
f683a51ef5 allowing qApp to load overlay/load default scripts if runningscripts empty 2018-11-07 16:32:06 -08:00
sabrina-shanman
2c94d1f620 Fix hfm not linking in script-engine for Android build 2018-11-07 09:24:42 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Wayne Chen
8797c40d94 cleanup unused functions 2018-11-06 15:04:51 -08:00
Clement
0ca0a6f3be Fix JSDoc arrays 2018-11-06 12:57:17 -08:00
Clement
4e802b0f3f Add JSDoc comments 2018-11-06 11:59:15 -08:00
Clement
37c69ebe62 Add audio soloing feature 2018-11-05 19:02:26 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
Wayne Chen
ed847203ea wip for getting hmd overlay 2018-10-29 11:33:28 -07:00
Kerry Ivan Kurian
e7d1c2873a Merge branch 'master' into log-resource-requests-2 2018-10-23 13:46:59 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
2f37a2b1a1 Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-18 11:12:26 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
Brad Hefta-Gaub
e5d9c0d442
Merge pull request #14083 from sethalves/fix-recording-upload-crash 
call saveRecordingToAsset callback on correct thread
 2018-10-01 16:46:36 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities 
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
 2018-10-01 16:16:48 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Seth Alves
87a67a3f0c call saveRecordingToAsset callback on correct thread 2018-09-25 15:50:47 -07:00
Seth Alves
f6e57f54b0 don't call enterEntity until script preload has finished 2018-09-21 10:26:55 -07:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02:00
SamGondelman
c522d1bc93 merge with master 2018-09-14 00:57:13 -07:00
Clement
e6b4ccef16 Add lock around _entityScripts 2018-09-13 15:10:16 -07:00
John Conklin II
558f3dc7e5
Merge pull request #13964 from dback2/reloadScriptQThreadCrash 
Destroy script thread on finish instead of on ScriptEngine destroyed
 2018-09-10 14:11:37 -07:00
David Back
3601ade8ba destroy thread from thread finished not scriptEngine destroyed 2018-09-07 18:36:36 -07:00
Ryan Huffman
22df1b3bc6 Add comment to Assets.sendFakeHandshake about excluding jsdoc 2018-09-06 17:19:41 -07:00
SamGondelman
9b75c7e07f trying to separate colors and vectors 2018-09-04 17:20:05 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3 2018-08-27 10:43:52 -07:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
Stephen Birarda
01e8fd66a3 fix script engine(s) cleanup from ESS 2018-08-22 13:52:37 -07:00
Sam Gondelman
f0986a7f5a Merge branch 'master' into scriptvec3 2018-08-20 10:56:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool 
Stack tester changes
 2018-08-08 13:40:05 -04:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3 2018-08-03 14:57:49 -07:00
David Rowe
2270255d88 JSDoc review 2018-08-04 07:22:12 +12:00
David Rowe
32e3bb0e1d Merge branch 'master' into M08513-a 
# Conflicts:
#	libraries/audio/src/SoundCache.h
 2018-08-03 10:29:32 +12:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Clement
9c89aa9f90 Make sure the stack test interface gets cleaned up 2018-08-01 13:29:07 -07:00
John Conklin II
7a635b6a57
Merge pull request #13709 from thoys/fix/require-load-queue 
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
 2018-08-01 11:15:32 -07:00
Thijs Wenker
74343c71d8 CR fixes 2018-07-31 22:29:53 +02:00
SamGondelman
2ca217eb4a merge with master 2018-07-30 17:43:15 -07:00
Clement
949c7f8c19 Add automated test tool scripting interface 2018-07-30 17:18:32 -07:00
Thijs Wenker
ba8d445444 fix require by queueing content requests 2018-07-28 00:25:16 +02:00
Dante Ruiz
b750a005cf fix script memory issue 2018-07-24 16:31:12 -07:00
David Rowe
396382afd7 Fill in Audio API JSDoc 2018-07-19 09:31:48 +12:00
David Rowe
806228299e Stub out Audio JSDoc 2018-07-15 10:31:48 +12:00
SamGondelman
9929529f30 vec3 conversion 2018-07-11 14:18:22 -07:00
Clement
e5206a94a8 Revert "setStereoInput always returns true to not break old scripts" 
This reverts commit 2bf7db6952.
 2018-07-11 11:51:06 -07:00
SamGondelman
5bbd5b9e52 vec2 conversion 2018-07-10 16:32:49 -07:00
SamGondelman
d2699e8e5b some more attempted cleanup 2018-07-10 10:50:01 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
Anthony Thibault
a5919ee3fa
Merge pull request #13497 from hyperlogic/bug-fix/script-engine-batchloader-memory-corruption-fix 
Fix memory corruption when running scripts using Script.require().
 2018-06-28 14:18:56 -07:00
Anthony J. Thibault
ac6fcf092c Fix memory corruption via lambdas that capture local variables by reference. 
The lambdas in ScriptEngine::fetchModuleSource() were referencing local stack variables by reference.
This could lead to un-expected results including memory corruption.
To workaround this issue the QTimer and QEventLoop variables are allocated on the heap and held onto by a shared_ptr.
This shared_ptr is passed to the lambda.

This will not result in cycles and should result in the QTimer and QEventLoop being destroyed when the BatchLoader
object they are connected to is deleted.
 2018-06-28 11:15:25 -07:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve 
Fix audio device sometimes being on the wrong thread
 2018-06-28 09:59:00 -07:00
Seth Alves
01632ddd29
Merge pull request #13345 from ctrlaltdavid/21890 
Fix memory leak when reloading scripts
 2018-06-27 09:39:53 -07:00
Clement
2bf7db6952 setStereoInput always returns true to not break old scripts 2018-06-19 16:37:11 -07:00
Atlante45
4a4c0d132e Make stereo interface async 2018-06-18 17:26:29 -07:00
Atlante45
29ff47c6fb Ensure audio devices are made on the right thread 2018-06-18 16:28:52 -07:00
Seth Alves
3c081c4bf8
Merge pull request #13377 from danteruiz/fix-double-scripts-on-reload 
prevent having more than one instance of a script running after reloading the script
 2018-06-15 17:17:35 -07:00
Dante Ruiz
8b4b95f890 prevent have more than one instance of a script after reloading script 2018-06-14 14:00:40 -07:00
Zach Fox
3c681554de Fix MS13202: Don't save incomplete list of scripts to Settings while reloading scripts 2018-06-14 13:50:30 -07:00
David Rowe
9338c217cd Fix memory leak when reloading scripts 2018-06-09 16:58:49 +12:00
Alexander Ivash
5897c9948d terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME 2018-06-06 03:52:22 +03:00
Gabriel Calero
bb73af7230 Show stats button only in debug mode. Add isDebugMode to Script public interface 2018-05-29 17:21:44 -03:00
David Rowe
ebeee51581 Update image links 2018-05-23 17:20:24 +12:00
David Rowe
e44e7ca35f Fix up Resource and resource cache APIs' JSDoc 2018-05-21 11:57:16 +12:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
David Rowe
f571e90ef5 Merge branch 'master' into 21872-b 2018-05-16 10:20:53 +12:00
David Rowe
6e1a091447 Mat4 API JSDoc stubs 2018-05-12 14:44:38 +12:00
David Rowe
496154fdbe File API JSDoc stubs 2018-05-11 21:07:12 +12:00
David Rowe
fab85c3f6d Fix JSDoc function definitions specifying properties instead of params 2018-05-11 09:52:48 +12:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression 
more suppression of logging
 2018-05-09 17:36:12 -07:00
MiladNazeri
bc03fb398f
Merge pull request #13102 from ctrlaltdavid/21856-h 
Fix JSDoc for Users.requestUsernameFromID
 2018-05-09 13:35:06 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
NissimHadar
7f9f9d769a Corrected bug causing Interface not to exit at end of test. 2018-05-08 15:51:52 -07:00
NissimHadar
c3ef6aab1c Don't save test scripts 2018-05-07 12:51:41 -07:00
NissimHadar
481eddb2a3 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 08:24:03 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
David Rowe
a35517d985 Fix JSDoc for Users.requestUsernameFromID 2018-05-05 07:05:10 +12:00
NissimHadar
3b566332c6 Shutdown interface when test script finishes. 2018-05-03 14:34:12 -07:00
NissimHadar
3a5425122b Shutdown interface when test script finishes. 2018-05-03 14:31:01 -07:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript 
Avatar Scripts
 2018-05-02 12:23:13 -07:00
David Rowe
1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d 
# Conflicts:
#	interface/src/LODManager.h
 2018-05-02 07:50:55 +12:00
David Rowe
a1fc1c4810 Add JSDoc for Entity preload and unload signals 2018-05-01 21:55:14 +12:00
luiscuenca
50ca09b3b4 minor fixes 2018-04-30 16:26:04 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging 
Quiet logging
 2018-04-27 14:59:38 -07:00
John Conklin II
ddedfce8a3
Merge pull request #12932 from ZappoMan/fixBug349 
fix bug 349
 2018-04-27 12:48:17 -07:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
milad nazeri
4c736b2d62 Fixed defaults 2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
David Rowe
941e9360dd JSDoc fixes 2018-04-23 16:09:56 +12:00
David Rowe
d65f66a73d Interim JSDoc for Recording 2018-04-23 14:13:29 +12:00
David Rowe
4fb55ec2af Interim JSDoc for Users 2018-04-23 09:59:14 +12:00
David Rowe
2c39f2dbad Interim JSDoc for Scene 2018-04-22 17:37:06 +12:00
David Rowe
62930eb576 Interim JSDoc for Script 2018-04-22 15:26:39 +12:00
David Rowe
01870af624 Interim JSDoc for ScriptDiscoveryService 2018-04-22 11:32:46 +12:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815 
Controller API JSDoc
 2018-04-21 10:44:05 -07:00
Seth Alves
bec39369f7 remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
David Rowe
8173ac87a8 Minor improvement to Quat.IDENTITY JSDoc 2018-04-20 16:41:10 +12:00
David Rowe
b1e214de5a Vec3 API JSDoc 2018-04-20 16:40:15 +12:00
David Rowe
0a7cccc3f7 Move Vec2 and Vec4 JSDoc 2018-04-20 12:47:53 +12:00
milad
42471c539b initial fixes from ctralt david's comments 2018-04-19 13:40:57 -07:00
milad
3f129bda13 More done on audio 2018-04-18 20:04:41 -07:00
ZappoMan
1a82101360 fix bug 349 2018-04-18 09:27:09 -07:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api 
use correct scripting api  for audio in Audio.qml
 2018-03-09 13:41:20 -08:00
Dante Ruiz
3a39fca268 made requested changes 2018-03-09 10:09:51 -08:00
Dante Ruiz
c49d0557fc fixing check box issues 2018-03-09 09:29:37 -08:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00