Commit graph

80699 commits

Author SHA1 Message Date
ingerjm0
2322a9ea7f Making sure ctrlaltdavid's changes made it into my repository 2019-09-05 13:58:59 -07:00
ingerjm0
55bdc7d2a6 Made sure ctrlaltdavid's changes made it into my repo 2019-09-05 13:54:55 -07:00
amerhifi
9e69b79e2a adding the space back 2019-09-05 13:41:51 -07:00
amerhifi
2a3b99daa6 removing flags 2019-09-05 13:40:29 -07:00
ingerjm0
b8b7dbf681 DOC-148: Increase size of monospace type 2019-09-05 13:39:06 -07:00
Matt Hardcastle
43237e1409 Check macOS Launcher's zip size before unzipping
The Launcher can download an error page rather than the full Launcher.
When this happens, the error page file is passed directly to unzip,
which promptly fails with the following message:

  End-of-central-directory signature not found.  Either this file is not
  a zipfile, or it constitutes one disk of a multi-part archive.  In the
  latter case the central directory and zipfile comment will be found on
  the last disk(s) of this archive.
  unzip:  cannot find zipfile directory in one of NewHQLauncher.zip or
          NewHQLauncher.zip.zip, and cannot find NewHQLauncher.zip.ZIP, period.

This change improves the error message by checking the size of the
Launcher download and failing if the Launcher is smaller than the
smallest Launcher we've released. The smallest Launcher we've had is
308KB, so I picked 250KB as the limit because it's a nice rounder number
below that.
2019-09-05 12:35:24 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
ingerjm0
d8c655a151 Fixed spacing issues in navigation caused by fix to to DOC-156 2019-09-05 11:42:34 -07:00
ingerjm0
af7e68786a DOC-156 (comment): Fixed spacing on non-paragraph text 2019-09-05 11:29:13 -07:00
MiladNazeri
21b8e268c1
Merge pull request #16135 from MiladNazeri/bugz-1395/emoji-stuck-on-start
[bugz-1415] :: Emoji App trying to shut down twice
2019-09-05 11:14:11 -07:00
Anthony J. Thibault
29de8a8d9f remove ajt comment 2019-09-05 11:11:10 -07:00
Anthony J. Thibault
b6f28a6732 Switch additive animation deltas from a pre multiply to a post multiply. 2019-09-05 11:09:03 -07:00
Anthony J. Thibault
92df5cccdc AnimBlendDirectional node 2019-09-05 11:09:02 -07:00
Anthony J. Thibault
6274ab4aa7 3x3 blend wip 2019-09-05 11:09:00 -07:00
ingerjm0
9bf579d878 DOC-156: Fix font size issues on non-paragraph text 2019-09-05 11:08:25 -07:00
ingerjm0
5ebf141d73 DOC-67: Incorrect location of example code for Avatar API 2019-09-05 10:39:18 -07:00
milad
531dceae4d changed status indicator to be similar to nametag and emoji 2019-09-05 10:29:25 -07:00
ingerjm0
2502abe963 Merge branch 'master' of https://github.com/highfidelity/hifi into api-docs 2019-09-05 10:17:38 -07:00
ingerjm0
5aef2d674a DOC-69: Move Supported Script Types section to top of JSDoc pages 2019-09-05 10:12:59 -07:00
Shannon Romano
ef9b81ca0d
Merge pull request #16032 from sethalves/fix-polyvox-state-machine
BUGZ-1176: rework polyvox state-machine
2019-09-05 10:04:47 -07:00
Seth Alves
404b42c41e remove unneeded call to tellNeighborsToRecopyEdges 2019-09-05 08:04:09 -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
milad
57a309db53 small formatting changes 2019-09-04 20:58:20 -07:00
Seth Alves
d86944baf4 rework polyvox state-machine 2019-09-04 20:14:11 -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
milad
408656f6ec added line break 2019-09-04 17:06:00 -07:00
milad
c73ea11b37 lowecase object 2019-09-04 17:00:30 -07:00
milad
3f2d2996a0 removed comment region sections 2019-09-04 16:59:14 -07:00
Shannon Romano
96f6793a87
Merge pull request #16118 from hyperlogic/feature/aim-offset-blend
Additive animation support
2019-09-04 16:55:50 -07:00
milad
1a8d005220 Merge branch 'master' of github.com:highfidelity/hifi into bugz-1395/emoji-stuck-on-start 2019-09-04 16:49:58 -07:00
milad
252e8a2ed6 removed commented out code 2019-09-04 16:49:46 -07:00
milad
79b7271729 removed startup/unload apis from the 3 main modules 2019-09-04 16:48:24 -07:00
milad
d316f014eb fixed double scriptEnding being called 2019-09-04 15:51:07 -07:00
jennaingersoll
afad148894
Merge pull request #16134 from ctrlaltdavid/DOC-134
DOC-134: Fix some miscellaneous JSDoc issues
2019-09-04 15:21:14 -07:00
Zach Fox
df3f7fcb72
Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix
Dev-486 : emote indicator should still be showing
2019-09-04 13:11:24 -07:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -07:00
Shannon Romano
6fda12583b
Merge pull request #16128 from MattHardcastle/err-handling
Error handling for Launcher's update
2019-09-04 09:53:16 -07:00
Shannon Romano
ffc6d4a1e2
Merge pull request #16131 from samcake/yellow
BUGZ-1114: Fixing Luci issues related to zone not rendering and other minor clean up
2019-09-04 09:43:55 -07:00
Shannon Romano
24faa4a7cb
Merge pull request #16124 from MattHardcastle/call-interface-highfidelity
Call Interface "High Fidelity" on macOS
2019-09-04 09:34:35 -07:00
David Rowe
672e61c49d Fix typo in Entities.EntityProperties-Material example 2019-09-04 21:06:49 +12:00
David Rowe
6474705ca2 Reformat "supported script types" in Entities and Scripts signals 2019-09-04 21:06:30 +12:00
David Rowe
4e274347b4 Fix typo in Entities.getAbsoluteJointRotationInObjectFrame() JSDoc 2019-09-04 21:05:36 +12:00
David Rowe
5624ba6e14 Fix JSDoc for some Controller.Hardware.Vive property names 2019-09-04 21:05:06 +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
milad
6c9c22a5fb removed old code 2019-09-03 18:14:15 -07:00
milad
669fef763a removed logs 2019-09-03 18:11:56 -07:00