Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-13 16:47:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67858 commits 25 branches 0 tags 1.1 GiB
Commit graph

1671 commits

Author SHA1 Message Date
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
humbletim
8c7a8f0df3 expanded Assets scripting interface 2017-12-21 12:04:47 -05:00
Brad Davis
26291e0a75 PR feedback 2017-12-21 07:29:29 -08:00
Brad Davis
c6bc6f6ef2 Merge remote-tracking branch 'upstream/master' into android_nov 2017-12-16 16:20:16 -08:00
Brad Davis
6cff86b0f3 Fix polyvox archive, correct build errors, add additional libraries 2017-12-12 18:29:36 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Bradley Austin Davis
282ae7b6f9 Small fixes 2017-12-11 14:42:37 -08:00
Bradley Austin Davis
9df9cf7a47 Adding more libs, ifdefs for android incompatible code 2017-12-11 13:18:23 -08:00
David Rowe
f5b12a0a9d Fix typo 2017-11-30 19:16:51 +13:00
David Rowe
a01d118c57 Documentation review 2017-11-30 16:03:57 +13:00
David Rowe
07a7cb412a Merge branch '21602' into 21603 2017-11-28 16:43:12 +13:00
David Rowe
de49fefc61 Merge branch 'master' into 21602 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2017-11-25 17:06:36 +13:00
Elisa Lupin-Jimenez
b6e75d1222 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez
3aa7cb440d file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url 2017-11-20 10:01:33 -08:00
David Rowe
27e3e0bf0b Merge branch 'master' into 21602 2017-11-20 08:12:19 +13:00
David Rowe
d3c33b1aaf Quat API JSDoc 2017-11-16 16:20:54 +13:00
David Rowe
a35316913e Uuid API JSDoc fixes 2017-11-16 12:58:33 +13:00
David Rowe
41e929c8a2 Add missing types to typedefs 2017-11-16 10:58:03 +13:00
David Rowe
bde3dbc2fd Uuid JSDoc 2017-11-13 11:25:11 +13:00
David Rowe
a2ece7a3ad Initial, placeholder JSDoc for Uuid 2017-11-12 12:02:58 +13:00
David Rowe
9d9f684af5 Tidying 2017-11-12 11:44:51 +13:00
David Rowe
f5e155bf94 Expand Menu's JSDoc 2017-11-11 17:01:55 +13:00
David Rowe
c8734ccd63 Menu JSDoc improvements 2017-11-11 16:18:05 +13:00
David Rowe
c77a12f5fa Update Clipboard and Menu JSDoc to use JavaScript type names 2017-11-11 07:55:57 +13:00
David Rowe
036ac8de6d Update JSDoc for Menu JavaScript API 2017-11-10 21:55:42 +13:00
Ken Cooke
82d9827571 Merge branch 'master' into audio-louder-mastergain 2017-11-01 08:10:55 -07:00
Nissim Hadar
d6b3fa4cb1 Removed references to Haze from Stage. 2017-10-30 10:49:08 -07:00
Ken Cooke
6ba2a83bbe Send and receive Avatar MASTER Gain packets, signaled using null nodeID. 
Packet protocol change is not needed (existing audio-mixer will ignore).
 2017-10-29 10:47:56 -07:00
David Rowe
da33c4fcf2 Fix script reload icon not working in Windows developer builds 2017-10-26 11:41:52 +13:00
ZappoMan
44f8bf00bc move remoteCallerID to Script.remoteCallerID 2017-10-22 17:14:11 -07:00
ZappoMan
a7e21d7e76 add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod() 2017-10-22 14:30:58 -07:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568 
Add some Quat and Uuid JavaScript helper properties
 2017-10-18 22:07:06 -07:00
Nissim
fe286aff83 Andrew's corrections (per coding standard). 2017-10-18 08:42:07 -07:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
David Rowe
ed1c974f75 Use MyAvatar.SELF_ID instead of Uuid.SELF 2017-10-17 15:58:51 +13:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
David Rowe
949ed3b33d Add some Quat and Uuid JavaScript helper properties 2017-10-14 07:17:23 +13:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
SamGondelman
403b18977b remove unused HFMetaEvents 2017-10-11 14:37:23 -07:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Brad Hefta-Gaub
80f0bd3b79 Merge pull request #11494 from humbletim/add-console-output-basenames 
[experiment/feedback] Include script name with all JS/QML debug output
 2017-10-06 17:58:19 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
2ce86ebfae WIP - working on byte order in server messages. 2017-10-04 11:56:35 -07:00
Nissim Hadar
999c3201c3 Merge branch 'master' into hazeZone 2017-10-02 16:54:45 -07:00
beholder
cc8f1352da 7951 Reload button in Running Scripts dialog stops script 2017-10-02 22:18:03 +03:00
Nissim Hadar
f26345a3f0 Working on adding zone to haze. 2017-09-29 15:15:49 -07:00
humbletim
fd917917c4 include the source basename in Script.print() && QML/Script console.*() debug output 2017-09-29 14:48:01 -04:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
 2017-09-27 17:50:51 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Nissim Hadar
678b4e35b1 Before replacing "Haze Active" checkbox with "Haze Mode" combo. 2017-09-24 14:06:00 -07:00
Ken Cooke
84786ac8e3 Merge pull request #11424 from ctrlaltdavid/21548 
Fix recording just made not playing back if reload it
 2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a Coding standard 2017-09-22 07:13:32 +12:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
David Rowe
4ce5e4ac46 Fix recording just made not playing back if reload it 2017-09-21 12:19:32 +12:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Stephen Birarda
100ac65975 store relative path URL in resource request on redirect 2017-08-15 15:27:44 -07:00
Elisa Lupin-Jimenez
072f3dfb03 removed commented out code, removed blocks from default scripts 2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez
1ac9536f95 Downloading blocks from marketplace in own asset folder 2017-08-09 15:56:07 -07:00
Elisa Lupin-Jimenez
17acf0520d Download from blocks in marketplace working 2017-08-09 11:08:14 -07:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
Elisa Lupin-Jimenez
1102b27ba1 Fixed merge conflicts with master 2017-08-08 11:47:08 -07:00
Elisa Lupin-Jimenez
af432087e3 small revisions to bracketing/variable name 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557 Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6 Removed extraneous print statements 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0 Blocks drag does not work yet 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
310a0eeecc Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-02 12:24:14 -07:00
Elisa Lupin-Jimenez
b2161e433c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-07-31 09:54:21 -07:00
Elisa Lupin-Jimenez
d4a7e9188a Removed extraneous print statements 2017-07-27 13:33:53 -07:00
Elisa Lupin-Jimenez
acb088b263 Blocks drag does not work yet 2017-07-26 16:58:23 -07:00
Elisa Lupin-Jimenez
9cfc4dc91b Can drag blocks zip folder into hifi and upload the .obj 2017-07-26 15:21:39 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Seth Alves
47ea32f4d3 vertex color support in ModelScriptingInterface 2017-07-23 08:06:26 -07:00
Seth Alves
72e5fecb4e do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex 2017-07-20 16:34:34 -07:00
Seth Alves
084a989a7a stopAndDeleteLater is now just stop 2017-07-11 21:21:42 -07:00
Seth Alves
972dc4d1b2 more const ref 2017-07-11 19:56:34 -07:00
Seth Alves
3670a04d8e switch bare pointers to AudioInjector objects to be QSharedPointers 2017-07-11 14:24:58 -07:00
Brad Davis
7f1bc07d04 Trying to fix overlay crashes again 2017-07-05 14:30:01 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Clément Brisset
a2c15c9794 Merge pull request #10770 from jherico/fix_deps_1 
Cleanup entity dependencies
 2017-06-28 10:48:58 -07:00
Seth Alves
e4a9674614 Merge pull request #10824 from sethalves/fix-script-sleep-busyloop 
use QEventLoop and a timer for a less CPU using sleep + event-processing
 2017-06-27 21:00:40 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Seth Alves
4f672f93d2 avoid cast that isn't always available 2017-06-26 16:03:39 -07:00
Seth Alves
bf7da71eaf use QEventLoop and a timer for a less CPU using sleep + event-processing 2017-06-26 15:07:22 -07:00
Sam Gateau
619b357ad0 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-26 10:03:53 +02:00
David Rowe
3de1c0a312 Make and save recording 2017-06-24 15:57:57 +12:00
samcake
c0e8b6c8bc clean up 2017-06-23 14:18:56 -07:00
samcake
b7b520a6e8 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-23 13:50:31 -07:00
Brad Hefta-Gaub
dc649e84df Merge pull request #10792 from jherico/qml_crashes 
Trying to fix QtQml/QtScript crashes
 2017-06-23 12:41:43 -07:00
samcake
c24e254257 Add support for profiling from scripts 2017-06-22 18:10:20 -07:00
Brad Davis
4439de240a Trying to fix QtQml/QtScript crashes 2017-06-22 16:39:57 -07:00
samcake
bda52c33e6 Adding the function source when profiling, to explore perf issues 2017-06-22 15:35:00 -07:00
David Kelly
06d1ac8bf7 Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch 2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785 new --scripts switch overrides default scripts location 2017-06-22 14:09:05 -07:00
Brad Hefta-Gaub
7668fbb7a0 Merge pull request #10755 from seefo/fb5278 
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
 2017-06-22 13:35:05 -07:00
Sam Cake
c35be446e6 adding profiling on the script engine call back to timer event 2017-06-21 00:06:45 -07:00
Sam Cake
189ad9c706 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-20 22:42:40 -07:00
samcake
d853a76376 Fixing the scripts and investigating the scripting 2017-06-20 17:23:44 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level 
Update chrome for the audio input level meter
 2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391 Merge pull request #10744 from zzmp/audio/output-sample 
Add "Play sample sound" to audio setting
 2017-06-20 15:32:57 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1 Fixed an issue where toolbar buttons duplicated themselves when reloading scripts 2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub
cbded766b1 Merge pull request #10676 from NeetBhagat/21369 
WL 21369 - Implement parts of the JS "console" object
 2017-06-20 11:06:34 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
NeetBhagat
2909aa9ac8 Resolve comments of @zappoman. 
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
 2017-06-17 01:00:32 +05:30
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Burt Sloane
4f7a1a6e2e got rid of tabs 2017-06-15 16:35:53 -07:00
Burt Sloane
fbc28c0e2f pedantic PR 2017-06-15 16:16:29 -07:00
Burt Sloane
7022c4009f midi in and out 2017-06-15 15:18:06 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
NeetBhagat
9646eba873 Complete console.trace and added a testcases for all 13 functions. 2017-06-13 23:52:48 +05:30
NeetBhagat
5c324264a2 Complete the functionality of console.trace(). 2017-06-13 14:12:29 +05:30
NeetBhagat
b0e9c62c12 Merge branch 'master' of https://github.com/highfidelity/hifi into 21369 2017-06-13 10:10:44 +05:30
NeetBhagat
e8fc766c2b Complete Console Exception. 2017-06-12 20:24:59 +05:30
NeetBhagat
71bff04ce0 Update group functionality by removing consoleLog method from consoleScriptingInterfaceClass. 2017-06-12 12:38:56 +05:30
NeetBhagat
2bd2804d0b complete Group Functionality i.e Group,GroupCollapsed,GroupEnd 2017-06-09 20:31:58 +05:30
NeetBhagat
dd91346c18 Started group functions. 2017-06-09 11:43:16 +05:30
NeetBhagat
ead0d42cf3 Merge branch 'master' into 21369 
# Conflicts:
#	libraries/gl/src/gl/OffscreenQmlSurface.cpp
#	libraries/gl/src/gl/OffscreenQmlSurface.h
 2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3 intial commit #21369 Working on clear method of console 2017-06-07 14:37:18 +05:30
Bradley Austin Davis
30c86ff321 Attempt to resolve Tablet scripting interface deadlocks 2017-06-06 14:58:56 -07:00
NeetBhagat
0f9cd5d0c7 intial commit hifi: #21369 Implement parts of the JS "console" object 2017-06-06 15:20:08 +05:30
Zach Pomerantz
4a3f2e1d09 use subclass for interface's Audio interface 2017-05-28 19:25:37 -04:00
Zach Pomerantz
297993b358 report success on tablet->pushOntoStack 2017-05-26 17:09:39 -04:00
Clément Brisset
efe72e1b85 Merge pull request #10530 from Atlante45/fix/default-scripts 
Ensure user never loses its running scripts
 2017-05-25 18:33:11 -07:00
Chris Collins
f8b92b6666 Merge pull request #10536 from misslivirose/fix/check-extension-running-scripts 
Fix/check extension running scripts
 2017-05-23 22:15:50 -07:00
Liv
b2bbf21fb0 style fixes 2017-05-23 15:21:21 -07:00
Liv
09c7a61599 Fix from string equals to contains to account for working formats not correctly detected with suffix 2017-05-23 14:42:07 -07:00
Liv
3340211455 Cleanup and better error handling 2017-05-23 13:54:38 -07:00
Liv
e9fac38bbb Add function hasValidScriptSuffix and check if script extensions are JavaScript or JSON files 2017-05-23 13:08:50 -07:00
Atlante45
10eb353126 Ensure user never loses its running scripts 2017-05-22 18:55:58 -07:00
Liv
1fa3e6bda2 Revert "Initial check that the script url has a supported extension, currently JS only" 
This reverts commit d50bdd6aa9.
 2017-05-22 17:47:16 -07:00
Liv
d50bdd6aa9 Initial check that the script url has a supported extension, currently JS only 2017-05-22 16:53:41 -07:00
Ryan Huffman
3c9205d0b2 Remove invalid comment and unnecessary check from ScriptEngine 
This removes an invalid comment - waitTillDoneRunning is not only called
from the main thread - and remove a check to make sure thread() is not
null because it should no longer be deleted before ScriptEngine.
 2017-05-22 15:46:43 -07:00
Ryan Huffman
09c98b3ac3 Fix ScriptEngine thread being deleted too early 
The thread appeared to be deleted before waitTillDoneRunning was
finished. This is a speculative fix. This ensures that the QThread isn't
deleted until after the ScriptEngine is deleted.
 2017-05-22 15:31:11 -07:00
Brad Hefta-Gaub
ee6bed5c1c Merge pull request #10189 from Atlante45/fix/memory-leak 
Set max packet per second on the agent
 2017-05-16 21:03:05 -07:00