Commit graph

1973 commits

Author SHA1 Message Date
Kasen IO
edfce861a8 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:56:19 -05:00
Kasen IO
07d706d681 Removed all hardcoded whitelist rules 2019-12-01 22:55:51 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
David Rowe
777f969919 Typo 2019-10-24 09:00:29 +13:00
David Rowe
fffb81b474 Merge branch 'master' into DOC-191 2019-10-24 08:23:27 +13:00
David Rowe
185d6990eb Add missing threading checks to Recording API methods 2019-10-16 09:17:29 +13:00
David Rowe
e708cb98bb Fix crash in Recorder.stopRecording() when no recording is being made 2019-10-15 11:29:49 +13:00
David Rowe
1715a86dba Fix typo in Assets JSDoc 2019-10-12 07:58:26 +13:00
David Rowe
e4bc3a7d9d Recording JSDoc 2019-10-12 07:58:13 +13:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
jennaingersoll
8d8449d8d7
Merge pull request #16166 from ctrlaltdavid/DOC-159
DOC-159: File JSDoc
2019-10-07 16:37:11 -07:00
Shannon Romano
5bbe271c7a
Merge pull request #16299 from ctrlaltdavid/DOC-187
DOC-187: Mat4 JSDoc
2019-10-07 09:11:32 -07:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes
Fix for Mat4.getForward, getRight and getUp
2019-10-04 17:00:43 -07:00
David Rowe
70577b8f34 Remove "not working" warnings in anticipation of fix 2019-10-05 12:13:57 +13:00
Anthony J. Thibault
521f64f152 normalize axes returned by Mat4.getForward getUp and getRight 2019-10-04 14:10:28 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp
It should match the results from the same methods on the Quat class.
2019-10-04 13:59:38 -07:00
David Rowe
6e6d438d36 Tidying 2019-10-05 09:34:31 +13:00
David Rowe
a56f82c1ba Mat4 JSDoc 2019-10-05 09:27:31 +13:00
Simon Walton
95248c7ccd Add <future> header for Android 2019-09-30 23:43:06 -07:00
Simon Walton
595b473be7 Make AssetScriptingInterface::initializeCache() blocking 2019-09-30 17:55:24 -07:00
David Rowe
b174e002a9 Implement Recording.setPlayerVolume() 2019-09-24 12:52:51 +12:00
David Rowe
9d9317c50d Miscellaneous fixes and typos 2019-09-20 10:19:45 +12:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
David Rowe
7bbca94d43 Doc review 2019-09-12 14:41:43 +12:00
Shannon Romano
fa8c959699
Merge pull request #16133 from ctrlaltdavid/DOC-59
DOC-59: Assets JSDoc
2019-09-11 17:19:45 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
David Rowe
04203b1425 File JSDoc 2019-09-10 12:01:38 +12:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398
BUGZ-1398: Tablet access to local HTML
2019-09-06 09:59:22 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
David Rowe
49ab504226 Make placement of callback JSDoc consistent 2019-09-05 12:23:56 +12:00
David Rowe
06ebba554e Doc review 2019-09-05 12:23:12 +12:00
David Rowe
6474705ca2 Reformat "supported script types" in Entities and Scripts signals 2019-09-04 21:06:30 +12:00
David Rowe
cf01d9f1af Script.require() JSDoc fixes 2019-09-04 21:04:03 +12:00
David Rowe
f384b79bf5 Merge branch 'master' into DOC-59 2019-09-04 15:47:23 +12:00
David Rowe
9457aed631 Tidying and polishing Assets JSDoc 2019-09-04 15:43:18 +12:00
David Rowe
8820d1d76b Assets API cache methods 2019-09-04 13:48:06 +12:00
jennaingersoll
037ad36262
Merge pull request #16103 from ctrlaltdavid/DOC-64
DOC-64: ScriptDiscoveryService API JSDoc
2019-08-30 22:35:39 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
2019-08-30 13:10:09 -07:00
Brad Davis
428a58710d BUGZ-1365: Ensure that by default web views can't access local content 2019-08-29 13:44:49 -07:00
Shannon Romano
b4d0c87654
Merge pull request #16117 from ctrlaltdavid/BUGZ-1316
BUGZ-1316: Fix crashes in Assets API
2019-08-29 09:07:37 -07:00
David Rowe
fb818c0726 Fix crash in Assets.setBakingEnabled() when callback undefined 2019-08-29 13:33:22 +12:00
David Rowe
746f97a0e0 Fix crash in Assets.getAsset() when callback undefined 2019-08-29 13:33:04 +12:00
Shannon Romano
f63fc15d4f
Merge pull request #16115 from sabrina-shanman/crash_shutdown_running-script
Attempt to fix crash from script running too late
2019-08-28 15:54:10 -07:00
sabrina-shanman
437f6b4096 Only say we're throwing a script error when we mean it 2019-08-28 14:58:57 -07:00
David Rowe
d52bb66048 Add missing JSDoc 2019-08-29 09:38:43 +12:00