Commit graph

8070 commits

Author SHA1 Message Date
milad
531dceae4d changed status indicator to be similar to nametag and emoji 2019-09-05 10:29:25 -07:00
milad
57a309db53 small formatting changes 2019-09-04 20:58:20 -07: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
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
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
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
milad
44e518f5a1 working fix 2019-09-03 18:06:25 -07:00
Sam Gateau
03c5dfad3d propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version 2019-09-03 16:28:32 -07:00
Sam Gateau
cda2943b9a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-03 12:01:12 -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
Zach Fox
c561bca79c BUGZ-1386: Update simplifiedStatusIndicator to use domainID as org name instead of location.hostname 2019-08-30 11:37:52 -07:00
Brad Davis
6aa967f29f fixing test code 2019-08-29 14:11:22 -07:00
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -07:00
Zach Fox
4098dd9999 BUGZ-1342: Add lock icon to Emote tray when it's locked open; Make tray close when unlocking it 2019-08-27 12:59:57 -07:00
RebeccaStankus
abd4f24770 Added unload check that timeout is not running 2019-08-26 15:15:25 -07:00
RebeccaStankus
96dbd4620d pull clear timeout into a separate function 2019-08-26 15:08:18 -07:00
RebeccaStankus
f66b696721 Clear timeout on selecting a different emote 2019-08-26 14:39:38 -07:00
RebeccaStankus
c3dfc4e8d8 Restore emote indicator after reaction emote 2019-08-26 14:23:27 -07:00
Zach Fox
701dd679c7 Change the icons' 2019-08-23 15:18:45 -07:00
Zach Fox
27574dd3f3 Prepare for new emote indicator icon 2019-08-23 14:48:49 -07:00
Zach Fox
98626b564c Couple more changes 2019-08-23 14:40:39 -07:00
Zach Fox
dfcf70b9b5 Tons of Emote/Emoji changes 2019-08-23 14:14:53 -07:00
Zach Fox
44ac3f3a7a Don't use entity creation library (reduce risk); use remote URL for broadcast image entity URLs 2019-08-22 13:58:35 -07:00
Zach Fox
a086d6fe6d Fix triggered reactions not showing their icon in the emote indicator 2019-08-22 11:54:28 -07:00
Zach Fox
177590614e Fix emote bar always visible on MacOS; small logic cleanup 2019-08-22 11:44:09 -07:00
Zach Fox
63d27fb002 Much smaller emoji wrt filesize; Fix emoji toolbar not sticking to window on MacOS 2019-08-22 11:00:15 -07:00
Zach Fox
3766ca8660 Add help/attributions popup to emoji popup window 2019-08-21 11:05:55 -07:00
Sam Gateau
e1e4d9ac6c Exposing the AA mode of the AA job 2019-08-20 18:15:35 -07:00
Zach Fox
5869ed3f20 Remove Emote App bar when in HMD mode and re-enable conditionally; don't allow keyboard shortcuts to work in HMD 2019-08-20 15:21:12 -07:00
Zach Fox
7f45a7b45c Show a not found message when the user searches for nonexistent emoji 2019-08-20 15:11:17 -07:00
Zach Fox
1cb4a31e09 Reticle update rate limiter; end reactions on shutdown 2019-08-20 15:02:36 -07:00
Zach Fox
cc9c9ec443 Fixup signal handling causing app errors; add keyboard navigation to emoji window 2019-08-20 14:52:19 -07:00
Zach Fox
8b79dc3020 Fix clapping silence issue 2019-08-20 14:22:13 -07:00
RebeccaStankus
0be3f133de Removed some Milad notes 2019-08-20 14:17:00 -07:00
RebeccaStankus
a78284871e more CR feedback changes 2019-08-20 13:59:41 -07:00
RebeccaStankus
cc22386f06 CR feedback changes 2019-08-20 13:29:02 -07:00
Sam Gateau
6cd37ef73c Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-20 09:41:08 -07:00
Sam Gateau
c5bd9ecf4f REfreshing the antialiasing qml na dconfig of the Jitter Job 2019-08-19 18:14:29 -07:00
RebeccaStankus
022d1aee8e Added check to remove persisting reticle entities on script startup 2019-08-19 15:36:21 -07:00
Zach Fox
b40d5658e3 Moved a timer from JS to QML; progress circle on Emote Indicator 2019-08-19 15:12:48 -07:00
Zach Fox
fd287654f4 Fixup keyboard shortcuts; Modify tooltips 2019-08-19 14:19:25 -07:00
Zach Fox
14a04dfb1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 13:52:35 -07:00
RebeccaStankus
e690d4f7ef Limited distance to rez a point reticle 2019-08-19 13:40:50 -07:00
RebeccaStankus
4787785660 first version of pointing reticle 2019-08-19 13:19:01 -07:00