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 |
|