Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
Anthony J. Thibault
5441d33a25
Support for the ablity to change button properties from js.
2016-12-15 18:17:14 -08:00
Anthony J. Thibault
5d1ccfbccc
Tablet#removeButton now works properly
2016-12-15 15:49:37 -08:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -08:00
David Rowe
dbd00e39a8
Handle unzip failure
2016-12-15 11:52:34 +13:00
Anthony J. Thibault
d4f9d21ce8
Pass tablet QQuickItem to TabletScriptingInterface
...
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
David Kelly
8719d36cd9
Merge pull request #9125 from kencooke/audio-ambisonics
...
First-order Ambisonic renderer
2016-12-12 11:36:12 -08:00
Ken Cooke
a4cbf6be8a
Fix to preserve localOnly from script when not ambisonic
2016-12-09 16:55:53 -08:00
David Rowe
460d332c6f
Delete redundant code
2016-12-07 10:06:32 +13:00
David Rowe
8e30674069
Tidying
2016-12-07 09:28:35 +13:00
David Rowe
2f42f4cfa5
Merge branch 'master' into 21089
2016-12-05 18:33:38 +13:00
Ken Cooke
e93e1a7c4f
Preliminary support for Ambisonic audio injectors.
...
Supports 4-channel WAV files, presumed to be B-format (FuMa) first-order Ambisonic.
Supports WAV with arbitrary sample rate (needs optimization).
Supports soundfield volume and orientation set via script.
Supports localOnly client-side injection using simple (non-spatialized) test renderer.
2016-12-02 18:20:57 -08:00
Ryan Jones
7b0756c745
remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions
2016-11-30 16:37:04 -08:00
Atlante45
1d8c97b337
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-30 10:22:16 -08:00
David Rowe
a75d0b3fe8
Merge branch 'master' into 21089
2016-11-30 14:50:51 +13:00
Ryan Jones
fe774a8530
adjust whitespace
2016-11-29 15:41:50 -08:00
Ryan Jones
3ccc493871
add helpers for v3 and shaders
2016-11-29 15:40:20 -08:00
howard-stearns
8b9efb461e
bubble state
2016-11-23 10:22:24 -08:00
Atlante45
3035d43772
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-21 13:05:08 -08:00
Brad Hefta-Gaub
fe709f51de
personal space feature
2016-11-19 16:30:15 -08:00
Ryan Huffman
179eed5d11
Add Vec2 and Vec3 defiitions to jsdoc
2016-11-16 11:56:42 -08:00
Ryan Huffman
7e9df928f4
Add jsdoc comments to Menu
2016-11-16 10:49:50 -08:00
David Rowe
9b270834dd
Merge branch 'master' into 21089
2016-11-16 08:51:48 +13:00
Seth Alves
43b73f0380
Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race
2016-11-14 10:00:46 -08:00
Ryan Huffman
51586ae0a3
Fix log typo in SpatiallyNestable
2016-11-14 09:06:11 -08:00
Brad Hefta-Gaub
cc6d68ffdf
Merge pull request #8973 from humbletim/fix-batched-script-keys
...
Use matching hash keys for input/output when batch-loading scripts.
2016-11-14 08:13:32 -08:00
Seth Alves
5133ce0548
print a debug message when skipping evaluation of a previously included url
2016-11-12 10:50:21 -08:00
Seth Alves
55d894bd6f
Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race
2016-11-12 07:38:07 -08:00
Ryan Huffman
4df9302af9
Disable access to deleteLater in ScriptEngine
2016-11-11 16:23:23 -08:00
Seth Alves
576eed9941
use a mutex to avoid a smaller race
2016-11-10 17:12:06 -08:00
David Kelly
285520dff7
Initial cut
...
No script work yet, just first stab at underpinnings
2016-11-10 16:24:35 -08:00
Seth Alves
aef39ce6fa
block until follow-on includes are finished but still avoid multiple evaluation of included urls
2016-11-10 16:06:53 -08:00
Anthony J. Thibault
839b1a3c5e
Added some jsdoc comments to the C++ source
2016-11-09 18:09:10 -08:00
David Rowe
d33ac21aaa
Merge branch 'master' into 21089
2016-11-08 08:23:10 +13:00
humbletim
28eadc149f
switch to apply normalizeURL only and move to top of for loop
2016-11-06 16:08:42 -05:00
humbletim
144983a943
Merge remote-tracking branch 'upstream/master' into script-retry-improvements
2016-11-06 11:36:50 -05:00
humbletim
61452c21a2
bail early from irrecoverable retry situations
2016-11-06 10:31:28 -05:00
Ryan Huffman
1a704f8d0a
Fix ScriptCacheSignalProxy not being properly cleaned up
2016-11-05 10:16:35 -07:00
Ryan Huffman
5287ec1eee
Fix includes hitting max retries locking the script up
2016-11-05 10:15:56 -07:00
Andrew Meadows
b7c6922545
proper corner case check for Quat::lookAtSimple()
2016-11-03 09:17:22 -07:00
humbletim
d749f243c6
revert f9747d8a (rawURL) + apply alternative approach for aligning batch-loaded script URLs
2016-11-02 14:58:50 -04:00
humbletim
f9747d8a44
match requested hash key url when populating batch-loaded script contents
2016-11-01 11:46:09 -04:00
David Rowe
3ca2c19075
Delete temporary directory after content has been used
2016-11-01 12:31:35 +13:00
David Rowe
12747d26e0
Add parameter that enables automatically adding download model to world
2016-10-30 13:58:17 +13:00
Clément Brisset
95c175ae74
Merge pull request #8950 from huffman/tutorial/gotoentrystep
...
Add tutorial tracking for going through the welcome portal
2016-10-28 16:26:40 -07:00
Ryan Huffman
dd1a23ea01
Add Script.generateUUID
2016-10-28 13:42:03 -07:00
Ryan Huffman
52c74f776c
Fix race condition in BatchLoader
2016-10-28 11:40:50 -07:00
Ryan Huffman
946f3782f3
Fix indentation in BatchLoader
2016-10-27 09:59:17 -07:00
Ryan Huffman
10e6157ab9
Fix race condition in BatchLoader
2016-10-26 15:16:29 -07:00
Anthony J. Thibault
2193c5faad
Integrated controller display from tutorial scripts + assets
2016-10-20 18:24:58 -07:00
Stephen Birarda
9f2627d31d
Merge pull request #8828 from birarda/web-engine-interceptor
...
move HF access token to authorization header
2016-10-18 17:24:58 -07:00
Ryan Huffman
73a0266edb
Fix case in Script.include where urls is empty
2016-10-18 11:41:15 -07:00
Stephen Birarda
81cb33574d
check for HTTPS scheme in bearer add in XMLHttpRequest
2016-10-18 10:04:43 -07:00
Ryan Huffman
9ef6aee3d1
Fix race condition in BatchLoader
2016-10-17 13:10:19 -07:00
Stephen Birarda
08dc9e0c4d
use HTTP header for access token added for XMLHttpRequest
2016-10-17 11:34:37 -07:00
Stephen Birarda
b81eaa649f
make faked handshake request usable in dev/PR
2016-10-14 14:46:58 -07:00
Ryan Huffman
7626f49ddc
Replace qDebug with qCDebug in ScriptCache
2016-10-13 15:43:28 -07:00
Ryan Huffman
decb94b719
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 14:05:53 -07:00
Atlante45
e5d54fc6bc
Move helpers to their own file
2016-10-12 10:20:19 -07:00
Ryan Huffman
03c01bb9b0
Add exception handling to callEntityMethod calls
2016-10-07 10:30:18 -07:00
howard-stearns
6cae62f584
init the accumulator for script elapsed time
2016-10-07 09:38:30 -07:00
Ryan Huffman
bbd7174d06
Fix script paths not resolving correctly
2016-10-06 17:37:47 -07:00
Chris Collins
8310a9fe8a
Merge pull request #8730 from huffman/feat/script-req-retry
...
Add retrying of script requests
2016-10-06 16:09:04 -07:00
Chris Collins
aecf71a0d0
Merge pull request #8729 from huffman/feat/atp-set-mapping
...
Add setMapping to ATP scripting interface and fix threading bug
2016-10-06 11:46:19 -07:00
Ryan Huffman
4901f386ca
Remove unused property in ScriptCache
2016-10-05 19:25:41 -07:00
Ryan Huffman
42b0d8230c
Move extract/encode enitty functions in ScriptEngine
2016-10-05 19:14:42 -07:00
Ryan Huffman
df09254437
Fix EntityItemID not being converted to string in ScriptEngine
2016-10-05 15:45:54 -07:00
Ryan Huffman
82aa1bafad
Update BatchLoader to use ScriptCache
2016-10-04 16:43:13 -07:00
Ryan Huffman
ca4022814e
Add extra logging to asset client
2016-10-04 16:43:13 -07:00
Ryan Huffman
c6485cc50c
Fix scriptcache only serving empty strings
2016-10-04 16:43:12 -07:00
Ryan Huffman
3c374e8ee2
Add retry logic to ScriptCache
2016-10-04 16:43:12 -07:00
howard-stearns
c806f6cad2
better shutdown check for timer firings
2016-09-30 16:05:39 -07:00
Thijs Wenker
7e3073e163
fix spelling bugs
2016-09-29 22:13:27 +02:00
Thijs Wenker
3d14a32d17
fix controller::ScriptingInterface not found warning in AC
2016-09-29 22:11:12 +02:00
Zach Pomerantz
84ba3223bb
Merge pull request #8650 from zzmp/fix/reload-qml-with-js
...
reload qml with scripts
2016-09-26 11:00:13 -07:00
Zach Pomerantz
aeaae4ccc8
reload qml with scripts
2016-09-23 14:27:47 -07:00
Zach Pomerantz
9e2ec27b29
always play audio injectors locally
2016-09-21 17:20:51 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Andrew Meadows
0a55afda69
Merge pull request #8554 from elisa-lj11/marketplaces_html
...
Include a marketplace status bar and access to "marketplace" of marketplaces
2016-09-02 17:12:05 -07:00
elisa-lj11
2f07ba87af
Renamed isZipped for more clarity on checking for non-fbx files
2016-09-02 16:48:55 -07:00
elisa-lj11
6721cc8dfb
fixed return statement formatting
2016-09-02 15:48:47 -07:00
elisa-lj11
18700d6397
narrowed filters for Clara website check
2016-09-02 15:18:13 -07:00
elisa-lj11
bebf9c5890
Added error feature when user tries to download a non fbx file
2016-08-31 17:46:35 -07:00
elisa-lj11
b131338dd0
Injected script to remove other file types from download options
2016-08-31 14:13:26 -07:00
Stephen Birarda
51085350f1
remove quazip targeting from android build
2016-08-31 11:06:01 -07:00
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
elisa-lj11
8bc9a92429
removed extraneous debug prints
2016-08-19 11:32:13 -07:00
elisa-lj11
4c434e875e
fixed merge conflicts in Application.cpp
2016-08-19 09:46:22 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
elisa-lj11
5d19267d00
Safeguard against file corruption
...
This is what could be a temporary (or permanent) fix to users trying to
delete important files on their computer through JS
2016-08-17 11:10:38 -07:00
elisa-lj11
5d2fb68924
Fixed temp dir access
2016-08-16 15:47:57 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
elisa-lj11
9ea9baeadf
Making JS/QML safer (DOES NOT WORK)
2016-08-16 14:12:19 -07:00
Anthony J. Thibault
1be434342b
Work In Progress snapshot
...
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
2016-08-12 17:11:59 -07:00
Zander Otavka
246a8457e1
Add some asserts
2016-08-08 15:12:17 -07:00
elisa-lj11
a9a8710689
Switched saving download/upload to temporary directory
2016-08-04 17:01:19 -07:00
elisa-lj11
b1b2ea48b2
Made code more QA; extra browser and download widget close upon download
2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700
Downloads from Clara.io and uploads to asset server
2016-08-04 16:59:38 -07:00
elisa-lj11
615627e981
Working download and unpackage from Clara.io
2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed
switching to the main site progress
2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363
Zip download works
2016-08-04 16:59:03 -07:00
elisa-lj11
6152fa28b7
Download through QML
...
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
2016-08-04 16:58:31 -07:00
elisa-lj11
9833ba1987
No errors upon build
2016-08-04 16:51:14 -07:00
elisa-lj11
212e4f9cca
making quazip work
2016-08-04 16:48:14 -07:00
elisa-lj11
0e79aa9dbe
Added quazip for unzipping functions
2016-08-04 16:46:56 -07:00
elisa-lj11
f277a019bf
FileScriptingInterface
...
Created new .cpp and .h for the download and unzipping of a model
2016-08-04 16:46:56 -07:00
Zander Otavka
a826f4eca1
Fix console errors for javascript: urls
2016-08-03 15:55:51 -07:00
Zander Otavka
f9b6db12e3
Fix parsing of embedded entity scripts
...
Now correctly identifies when scripts are not urls as well as
javascript: urls.
2016-08-03 13:48:27 -07:00
Stephen Birarda
4cdc98287b
add canKick to USI, revert constants to production
2016-08-02 14:35:51 -07:00
Stephen Birarda
7e6dbf2d1a
add a kick request packet and send from NL
2016-08-02 14:35:11 -07:00
Brad Hefta-Gaub
74a3835a1e
CR feedback
2016-07-28 15:15:33 -07:00
Brad Hefta-Gaub
22619a66ba
process events also
2016-07-28 10:51:17 -07:00
Brad Hefta-Gaub
755989b8ff
don't allow punished scripts to slow stop or shutdown
2016-07-28 10:01:05 -07:00
Brad Hefta-Gaub
2d199fe3d0
rename function for better clarity
2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
a12034cb45
fix unix warning, added comments
2016-07-26 07:54:55 -07:00
Brad Hefta-Gaub
83dc9ea6bb
punish slow scripts and don't send updates while physics is still loading
2016-07-25 21:46:30 -07:00
Stephen Birarda
609900f246
move ignore set handling to NodeList
2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9
immediately fade out ignored avatars
2016-07-13 15:06:31 -07:00
Stephen Birarda
d5af323057
don't self-ignore from UsersScriptingInterface
2016-07-13 15:06:31 -07:00
Stephen Birarda
095bd7e6c8
cleanup logging, move packet parsing to mixers
2016-07-13 15:06:31 -07:00
Stephen Birarda
441b6d2813
fix recursive mutex lock, conditional, logging
2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6
add a scripting interface to ignore users
2016-07-13 15:06:31 -07:00
Ryan Huffman
2a18c7a297
Remove forcefully moving AssetScriptingInterface to ScriptEngine thread
2016-07-09 04:16:16 -07:00
Ryan Huffman
7d491c2b1e
Fix ScriptEngine not moving AssetScriptingInterface to correct thread
2016-10-04 16:39:46 -07:00
Ryan Huffman
ac888733f5
Add setMapping to AssetScriptingInterface
2016-10-04 16:39:24 -07:00
Ryan Huffman
8e3f4b705f
Add entity url back into entity script filenames
2016-07-09 03:57:29 -07:00
Ryan Huffman
e3be333144
Remove 'EntityID' from entity script filename
2016-10-05 09:28:12 -07:00
Ryan Huffman
667a737018
Fix ScriptEngine not properly resolving paths
2016-10-05 09:28:12 -07:00
Seth Alves
6786a07ac2
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-07 09:53:24 -07:00
humbletim
b7874116b9
fix TypedArray byte ordering and .subarray end indexing
2016-07-02 23:36:08 -04:00
Seth Alves
4e70e8ed42
js call to ray-pick against avatars
2016-06-28 09:55:49 -07:00
Bradley Austin Davis
34c8d257d2
Fixing issues with unclosed groups in settings persistence
2016-06-14 09:49:38 -07:00
Brad Hefta-Gaub
8ec425106a
Merge pull request #7968 from birarda/audio-is-playing
...
fix collision of isPlaying property and slot for AudioInjectors
2016-05-26 12:06:00 -07:00
Seth Alves
49769f7d29
trying again -- frantic clicking on reload no longer appears to wedge things
2016-05-25 13:39:13 -07:00
Seth Alves
b0ce65ec01
trying to mimic previous behavior more closely
2016-05-25 11:42:06 -07:00
Stephen Birarda
ba77aaf7ef
remove collision of isPlaying property and slot
2016-05-25 11:06:08 -07:00
Seth Alves
ef709c09d0
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
2016-05-25 09:46:30 -07:00
Seth Alves
00336f4860
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
2016-05-23 09:58:20 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Seth Alves
1ef0f8055b
fix grammar in comment
2016-05-20 10:12:59 -07:00
Seth Alves
35065ab05e
remove unused setter
2016-05-20 10:12:38 -07:00
Seth Alves
aa58cad93e
code review
2016-05-20 09:54:54 -07:00
Zach Pomerantz
4c8ff557db
Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash
2016-05-20 09:31:30 -07:00
Brad Hefta-Gaub
8760cd0807
Merge pull request #7929 from zzmp/fix/script-downloaded-shutdown
...
fix crash on shutdown from scriptDownloaded callback
2016-05-20 09:31:04 -07:00
Brad Hefta-Gaub
d521cd82a0
Merge pull request #7908 from Atlante45/fix/settings
...
fix settings getting reset
2016-05-19 17:53:15 -07:00
Seth Alves
3f5ed4bef8
set isStopping on other calls to stop
2016-05-19 16:15:33 -07:00
Seth Alves
9ad488ba7b
fix method name to match coding standard
2016-05-19 16:08:44 -07:00
Seth Alves
4e862941cb
fix a race when restarting scripts -- avoid the old not-yet-stopped script from being considered the restart script
2016-05-19 14:51:56 -07:00
Brad Hefta-Gaub
ac15097f47
Merge pull request #7834 from huffman/feat/user-agent-plugins
...
Add system information to UserAgent in AccountManager requests
2016-05-19 11:53:14 -07:00
Zach Pomerantz
107b1b830e
Stop ScriptCache callbacks when scripts are stopped
2016-05-18 17:46:12 -07:00
Zach Pomerantz
8025a3f14c
Prevent crash from script timers on shutdown
2016-05-18 17:30:34 -07:00
Zach Pomerantz
c480dcfddd
Check thread validity after event processing
2016-05-18 16:26:54 -07:00
Ryan Huffman
dd093e3fcd
Make AccountManager a DependencyManager singleton
2016-05-18 15:38:54 -07:00
Atlante45
de36cd150e
Move runnings scripts setting storage
...
So that it doesn't conflict with the "Settings" menu setting
storage.
Running script would clear those settings while storing its data
This adds some backward compatible code to move the scripts
settings to the new location.
2016-05-18 11:36:14 -07:00
Zach Pomerantz
7d4276d15f
Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor
2016-05-16 10:51:23 -07:00
Zach Pomerantz
4e62d7ff61
Define ScriptEngines::isStopped inline
2016-05-13 17:28:21 -07:00
Zach Pomerantz
2140dc77b3
Rename wait and unload in best thread
2016-05-13 16:14:22 -07:00
Zach Pomerantz
36565598a7
Hide script stop behind accessor and fix friendship
2016-05-13 15:52:53 -07:00
Zach Pomerantz
59e4b9c356
Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown
2016-05-13 15:28:12 -07:00
Zach Pomerantz
13610b1220
Delete late-added script engines
2016-05-13 15:24:31 -07:00
Zach Pomerantz
70d0ebb91c
Consolidate stoppingAllScripts to ScriptEngines::_stopped
2016-05-13 15:24:15 -07:00
Zach Pomerantz
806d06b552
Wait on old entity script engines in threadpool
2016-05-12 17:51:40 -07:00
Zach Pomerantz
e1c130d02f
Timeout long sandbox scripts
2016-05-12 17:51:39 -07:00
Zach Pomerantz
1107882be2
Throw to stop non-evaluating scripts
2016-05-12 17:51:38 -07:00
Zach Pomerantz
7e82494a66
Add cap on entities scripting thread stop time
2016-05-12 17:51:37 -07:00
Zach Pomerantz
f2f89ca062
Add logging to ScriptEngine lifetime
2016-05-12 17:51:36 -07:00
Zach Pomerantz
f40fe88ee7
Clean up entity script engine deletion
2016-05-12 17:51:36 -07:00
Zach Pomerantz
2cc788f98d
Rename ScriptEngine::wait to match std threading
2016-05-12 17:51:35 -07:00
Zach Pomerantz
edf82c57ba
Clean scripting thread deletion
2016-05-12 12:45:02 -07:00
Zach Pomerantz
13d602487f
Remove guard over atomic in ScriptEngine::stop
2016-05-12 12:43:16 -07:00
Zach Pomerantz
820fdf09e2
Remove unused ScriptEngine::_wantSignals
2016-05-12 12:42:29 -07:00
Brad Hefta-Gaub
e01681eb52
Merge pull request #7856 from ZappoMan/NUEtweaks
...
don't show help or login on first run
2016-05-11 10:53:09 -07:00
Brad Hefta-Gaub
af6be7f5f3
Merge pull request #7845 from jherico/script_debug
...
Enable script debugging
2016-05-10 15:56:38 -07:00
Brad Davis
b117a4b8d7
Debugging menu destruction
2016-05-10 12:21:19 -07:00
Brad Hefta-Gaub
33c5cb519a
cleanup firstRun with a common setting
2016-05-10 11:32:29 -07:00
Seth Alves
68201746aa
Merge branch 'master' of github.com:highfidelity/hifi into fix-stanard-library-include-some-more
2016-05-09 18:39:37 -07:00
Zach Pomerantz
68731973d8
Keep locker when adding script engine
2016-05-09 18:04:38 -07:00
Zach Pomerantz
a0d80b9508
Fix hang on new script on shutdown
2016-05-09 17:32:25 -07:00
Brad Davis
40316498a4
Enable script debugging
2016-05-09 17:02:40 -07:00
Zach Pomerantz
7db082b915
Amend comment that was not a busy wait
2016-05-09 15:05:13 -07:00
Seth Alves
b0a5d8b719
make Script.include(/~/system/libraries/utils.js) work from web again
2016-05-08 08:45:58 -07:00
Zach Pomerantz
173d2a590c
Use sleep_until for ScriptEngine
2016-05-06 19:30:37 -07:00
Zach Pomerantz
56ec0e5db0
Abort infinite JS loops on quit
2016-05-04 12:02:08 -07:00
Zach Pomerantz
284feaf5d4
Properly shut down scripting thread
2016-05-03 20:29:31 -07:00
Brad Hefta-Gaub
754ef071eb
Merge pull request #7786 from sethalves/web-scripts-use-local-libs
...
allow scripts on the web to refer to local libraries with /~/
2016-05-03 11:10:48 -07:00
Brad Hefta-Gaub
ad285ff9a1
Merge pull request #7769 from ZappoMan/abortForInfiniteLoops
...
add support to abort evaluation of long running scripts on shutdown
2016-05-02 20:44:12 -07:00
Brad Hefta-Gaub
2b54813075
Merge pull request #7783 from zzmp/fix/script-engine-deletion
...
Fix script engine deletion
2016-05-02 18:16:07 -07:00
Brad Hefta-Gaub
49d02b802a
Merge pull request #7719 from zzmp/feat/resource-prefetch
...
Add prefetching to exposed caches
2016-05-02 18:04:26 -07:00
Brad Hefta-Gaub
b98419e537
add units to debug message
2016-05-02 14:58:38 -07:00
Brad Hefta-Gaub
4569032314
more CR feedback
2016-05-02 12:44:07 -07:00
ZappoMan
6026e055aa
more CR feedback removed redundant abort code
2016-04-30 15:45:42 -07:00
ZappoMan
00838d1e1e
more CR feedback removed redundant abort code
2016-04-30 15:38:37 -07:00
ZappoMan
ee4748fee9
CR Feedback
2016-04-30 15:31:09 -07:00
