Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 12:56:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
47341 commits 71 branches 56 tags 1.2 GiB
Commit graph

1087 commits

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