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

1104 commits

Author SHA1 Message Date
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
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
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