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

1161 commits

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