Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:19:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into head-controller

Browse source
This commit is contained in:
Seth Alves 2017-06-05 11:36:28 -07:00
commit c83549a679
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/fonts/hifi-glyphs.ttf
View file

Binary file not shown.

3
scripts/system/html/js/entityProperties.js
View file

@ -20,7 +20,8 @@ var ICON_FOR_TYPE = {
Light: "p", Light: "p",
Zone: "o", Zone: "o",
PolyVox: "", PolyVox: "",
Multiple: "" Multiple: "",
PolyLine: ""
} }
var EDITOR_TIMEOUT_DURATION = 1500; var EDITOR_TIMEOUT_DURATION = 1500;