Seth Alves
26e01bbacd
rewrite a bunch of path/url mangling code
2016-03-30 13:33:49 -07:00
Seth Alves
7c0bb72aff
started on making ~ mean the application directory in script paths
2016-03-29 18:32:46 -07:00
Seth Alves
2ad02941e4
lowercase filenames/paths before they go into _treeNodes to avoid scripts being unstoppable
2016-03-29 15:38:11 -07:00
Seth Alves
51cf854863
cleanups
2016-03-29 13:45:09 -07:00
Seth Alves
0c72ca1be3
works on windows now
2016-03-29 13:39:35 -07:00
Seth Alves
3aa1090ced
working toward allowing local files in running-scripts window
2016-03-29 11:58:21 -07:00
Seth Alves
b88770228e
convert running-scripts window to use local script files
2016-03-29 10:40:56 -07:00
Seth Alves
de8153bd75
on windows and osx use default scripts bundled with interface
2016-03-28 12:23:23 -07:00
Andrew Meadows
5ac0640cbe
check for time machine
2016-03-27 16:33:53 -07:00
Ryan Huffman
1a2f74f43a
Add protection around ScriptEngine::runInThread being called twice
2016-03-22 11:26:10 -07:00
Stephen Birarda
29cd487f84
fixes for styling and logging from CR
2016-03-15 14:38:08 -07:00
Stephen Birarda
72c64532f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-15 09:12:49 -07:00
howard-stearns
fce8369708
Remove logging that implies a problem that isn't there.
2016-03-11 14:23:47 -08:00
Atlante45
7d7a683b18
Add uploadFile method that prompts the user
2016-03-10 14:59:20 -08:00
Stephen Birarda
b3d8b67893
remove committed debug lines
2016-03-10 14:50:21 -08:00
Stephen Birarda
c65b5b63f0
better error handling for asset browser
2016-03-10 14:48:44 -08:00
Stephen Birarda
5ad4645b47
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-10 13:28:59 -08:00
Stephen Birarda
e3cae5b026
change setMapping for new disconnected error case
2016-03-10 12:26:00 -08:00
Stephen Birarda
9c53f40fbe
remove nullptr check in AssetMappingsScriptingInterface
2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1
add consistent error handling for asset request and upload
2016-03-10 10:52:05 -08:00
Stephen Birarda
fccad7dca4
remove nullptr request checks in AssetMappingsScriptingInterface
2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e
short circuit the mapping operations for invalid path/hash
2016-03-10 10:52:05 -08:00
Brad Davis
ee017cf0a5
Make script cache thread safe
2016-03-10 08:47:11 -08:00
Ryan Huffman
3e5e2eef17
Add mapping sorting, copying, and isKnownMapping
2016-03-10 08:18:32 -08:00
Stephen Birarda
6f044e1cd3
handling for leading slashes while loading mappings
2016-03-09 17:36:04 -08:00
Stephen Birarda
ea5349f7a0
remove ctor and dtor for AssetMappingsScriptingInterface
2016-03-09 16:59:31 -08:00
Stephen Birarda
85fe1349eb
fix filename in header comment for AssetMappingsScriptingInterface
2016-03-09 16:58:53 -08:00
Ryan Huffman
738ae54e8d
Remove comment
2016-03-09 16:56:28 -08:00
Ryan Huffman
fa66c0a521
Remove old model code
2016-03-09 16:44:51 -08:00
Ryan Huffman
3467e06199
Fix bugs in mapping model update
2016-03-09 16:44:41 -08:00
Ryan Huffman
0d2ae4f3a4
Merge branch 'atp' of github.com:birarda/hifi into atp-model
2016-03-09 16:33:53 -08:00
Ryan Huffman
ebc6c8ce44
Add proper model updating to asset mapping model
2016-03-09 16:29:51 -08:00
Ryan Huffman
f5497aa1e7
Add new AssetMappingsScriptingInterface and add mappings model
2016-03-09 14:53:04 -08:00
Stephen Birarda
5a197838f4
add a deleteMapping call for single path to scripting interface
2016-03-09 13:14:39 -08:00
Anthony J. Thibault
deb17e1f93
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-08 17:45:50 -08:00
Stephen Birarda
8d5111a332
move MappingRequest and subclasses to separate file
2016-03-08 15:30:59 -08:00
Stephen Birarda
181b20f673
move the AssetScriptInterface to script-engine
2016-03-08 14:49:26 -08:00
Stephen Birarda
1ece9aac26
remove extension from asset upload task
2016-03-08 12:08:02 -08:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
Anthony J. Thibault
0d62b10a8f
Added Mat4 support to script
...
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
2016-03-07 16:16:14 -08:00
Brad Hefta-Gaub
0d48803761
Merge pull request #7236 from howard-stearns/entity-script-safety
...
entity script safety
2016-03-03 17:16:30 -08:00
Howard Stearns
05943ed353
Entity scripts keep of the which entity they are executing for. When the entity goes away, any created timers do, too. Also, loading interface scripts is not allowed from entity scripts.
2016-03-01 16:50:58 -08:00
samcake
630c61e61d
Reflection is working correctly with the PBR property, ship t
2016-02-29 18:54:43 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Brad Davis
c07f3789e4
Don't crash on script destructor
2016-02-22 14:26:33 -08:00
Brad Hefta-Gaub
1a4591db58
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
2016-02-21 09:30:41 -08:00
Howard Stearns
fcdc6dd6fa
When we don't make an audo injector (because we're at a limit), make sure the value returned to scripts is null.
2016-02-19 10:54:53 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
Seth Alves
164d5d9c7e
try, try again
2016-02-16 01:13:37 -08:00
Seth Alves
f2c9bbc32d
filenames on Linux are case-sensitive
2016-02-16 00:39:54 -08:00
Howard Stearns
874f74de04
Fix Quat.lookAt
2016-02-12 10:38:50 -08:00
Stephen Birarda
445662f5ae
clean sweep of old now unused audio files
2016-02-08 15:38:12 -08:00
Brad Davis
aa03241dd9
Make all load script dialogs QML and respect previous script location
2016-01-28 15:53:04 -08:00
David Rowe
4e9fc02af5
Fix typos noticed in passing
2016-01-27 08:03:14 +13:00
David Rowe
1bfb941057
Fix Quat.equal()
2016-01-27 08:03:13 +13:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
David Rowe
51cb9dd05e
Fix crash in Running Scripts when edit filter after highlighting script
2016-01-16 15:50:33 +13:00
Brad Davis
e8adcd9f1f
Fix inability to stop local scripts
2016-01-12 21:11:47 -08:00
Brad Davis
f352332924
Fix logging warning
2016-01-12 13:09:16 -08:00
Brad Davis
55af5eaf06
Fix crash on shutdown due to lifetime of scripts
2016-01-12 12:40:02 -08:00
Brad Davis
d1d178787c
PR comments
2016-01-11 12:55:23 -08:00
Brad Davis
d28f80aa07
Moving running scripts functionality to scripting library
2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub
553e455a53
Merge pull request #6759 from huffman/script-engine-slot-exception
...
Add logging of signal slot exceptions in ScriptEngine
2016-01-07 08:54:34 -08:00
Ryan Huffman
810da77abe
Update ScriptEngine signal exception handling to call hadUncaughtExceptions
2016-01-04 10:34:55 -08:00
Ryan Huffman
f60cd09b45
Add logging of signal slot exceptions in ScriptEngine
2016-01-03 21:12:21 -08:00
Brad Davis
07531353e4
Allow a script to set a resource override.
2015-12-30 09:06:04 -08:00
Zach Pomerantz
4df8fa4ac3
Create Render/Scene unique_ptr without C++14 make_unique
2015-12-21 15:39:49 -08:00
Zach Pomerantz
5a86f0c23f
Nest JS props in SceneScriptingInterface
2015-12-21 14:32:06 -08:00
Brad Hefta-Gaub
111a8caa3c
Merge pull request #6701 from highfidelity/graphics
...
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
2015-12-21 13:54:50 -08:00
Brad Davis
05b7fcc957
Remove script -> qt::webchannel dependency
2015-12-21 11:19:05 -08:00
samcake
6bbc94badc
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-21 10:48:55 -08:00
Brad Davis
46a4a469e9
Merge pull request #6689 from ZappoMan/rightClickMenu
...
Some early work to support hand driven reticle
2015-12-20 17:49:50 -08:00
samcake
1e8e3fec87
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-19 11:38:20 -08:00
Brad Hefta-Gaub
e929e3f789
more work on angular velocity tests
2015-12-18 19:20:32 -08:00
Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
.
2015-12-18 17:18:46 -08:00
samcake
7e66515beb
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Zach Pomerantz
919a4b6728
Split global JS Scene into Render
2015-12-18 10:33:41 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
samcake
1b1365fd40
Exposing the tone curve in the js api
2015-12-16 16:32:53 -08:00
samcake
d2ebaef69e
Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template
2015-12-15 18:18:42 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -08:00
Brad Hefta-Gaub
2815cb0fef
first cut at adding advanced and developer menu groupings
2015-12-12 18:12:36 -08:00
samcake
5d395ae54f
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-10 18:06:43 -08:00
James B. Pollack
d21e4ff5e1
Merge pull request #6592 from huffman/script-engine-fixes
...
Fix concurrency issues for bools in ScriptEngine
2015-12-10 10:48:54 -08:00
Brad Davis
978d39b7f4
Moving OpenVR to external plugin and updating to latest version
2015-12-09 16:20:24 -08:00
Ryan Huffman
5f60aeef22
Update ScriptEngine::_isUserLoaded to be atomic
2015-12-09 14:50:48 -08:00
Ryan Huffman
a21e07327d
Update ScriptEngine::stop() to always run on its thread
2015-12-09 14:50:30 -08:00
Ryan Huffman
e7a1550b64
Update ScriptEngine::finished to include
2015-12-09 14:50:09 -08:00
Ryan Huffman
4dbfd3bfd9
Fix concurrency issues for bools in ScriptEngine
...
Several member variables were unsafely being accessed from multiple threads. Making these variables std::atomic makes this safe.
2015-12-08 11:13:27 -08:00
samcake
83279489f3
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-08 09:46:29 -08:00
Atlante45
acb9e2774e
Basic implementation of debug zone resizing
2015-12-04 21:01:53 -08:00
samcake
119cc733b5
Merging with master
2015-12-04 17:17:33 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Atlante45
c27944ae28
Simple normal map debug
2015-12-04 10:44:23 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
46556b7fa5
Merge pull request #6513 from huffman/fix-script-race-condition
...
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
2015-12-03 17:17:42 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
Ryan Huffman
4d84362757
Fix ScriptEngine setting _isFinished when it shouldn't
2015-12-01 11:30:56 -08:00
Stephen Birarda
c3f3639374
more spacing adjustments in ScriptEngine.cpp
2015-11-30 15:57:10 -08:00
Stephen Birarda
b1a69bb2cf
cleanup spacing in ScriptEngine
2015-11-30 15:52:10 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Brad Hefta-Gaub
d32e500464
Merge pull request #6462 from jherico/rec5
...
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
Stephen Birarda
762709748d
Merge pull request #6473 from ZappoMan/waitForScriptThreads
...
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-24 10:39:22 -06:00
Brad Davis
3738f21936
Fix occasional deadlock in loading recordings
2015-11-23 22:34:17 -08:00
samcake
a1668cdc73
Let the AssertClient JS interface use global vars
2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub
5f88d958ab
CR feedback
2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub
ce46c30647
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-23 16:27:06 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Seth Alves
0b1fa4f60f
add interface for getters for specific joints
2015-11-21 08:21:10 -08:00
EdgarPironti
ebbed7c525
Save clip to asset - removing last fix
2015-11-20 18:23:36 -08:00
samcake
de56f698aa
Merge pull request #6444 from EdgarPironti/asset_branch
...
Save clip to asset
2015-11-20 16:28:55 -08:00
Brad Davis
336562b894
Merge pull request #6452 from ctrlaltdavid/20732
...
Make multiline strings from JavaScript's print() readably in log file
2015-11-20 16:25:17 -08:00
EdgarPironti
df2153186d
Fixes
2015-11-20 16:07:31 -08:00
EdgarPironti
e70f6855aa
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
35365f9157
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
1db6d0e3c1
Upload QByteArray
2015-11-20 16:07:29 -08:00
EdgarPironti
1b18d3656f
Save clip to asset
2015-11-20 16:07:29 -08:00
David Rowe
c72c6a0a47
Make multiline strings from JavaScript's print() readably in log file
...
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
2015-11-21 10:44:21 +13:00
Brad Davis
cc2a7cbda8
Force synchronous loading of clips in JS
2015-11-20 11:51:08 -08:00
samcake
732c911fd7
Merge pull request #6439 from ZappoMan/assetJS
...
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:56:10 -08:00
Brad Hefta-Gaub
f80a765a29
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:28:20 -08:00
Brad Davis
e187aaedcb
Load recorded clips from URLs, not file paths
2015-11-19 15:56:37 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Brad Hefta-Gaub
2f142eb088
add a receiver example
2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
James B. Pollack
39f44115be
Merge pull request #6373 from Atlante45/rotationBetween
...
Rotation between
2015-11-12 09:25:56 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Atlante45
e4897a8de7
Use new constants
2015-11-11 15:58:27 -08:00
Seth Alves
4df65e4c11
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-10 15:02:07 -08:00
Eric Levin
a2abc11df1
Merge pull request #6351 from huffman/script-path-resolution
...
Update script engine path resolution behavior to behave consistently
2015-11-10 14:10:42 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Ryan Huffman
f6df7e298e
Merge branch 'script-path-resolution' into baseball
2015-11-09 14:03:10 -08:00
Atlante45
b15054c1fb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:41:06 -08:00
Eric Levin
7700e67734
Merge pull request #6326 from imgntn/entity_params
...
Add Ability to Pass Parameters When Calling Methods on Entities
2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266
Update script engine path resolution behavior
...
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
2015-11-09 12:04:17 -08:00
Seth Alves
f3d26e163d
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
2015-11-07 07:19:27 -08:00
Atlante45
55c6706f76
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-06 13:31:39 -08:00
James B. Pollack
e928c8278b
overload a single function and cleanup, add examples
2015-11-06 11:48:51 -08:00
James B. Pollack
3cee569bae
pass parameters to entities
2015-11-05 16:57:39 -08:00
James Pollack
751d51ee72
entity call params
2015-11-05 14:19:11 -08:00