Shannon Romano
b3c7ca6e8f
Merge pull request #16127 from amerhifi/master
...
case DEV-492: Ensure launcher cannot be pinned
2019-09-05 14:29:38 -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
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
milad
531dceae4d
changed status indicator to be similar to nametag and emoji
2019-09-05 10:29:25 -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
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
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
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
df0eb901a2
REverting the change in the jittering sequence length
2019-09-03 17:01:03 -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
Howard Stearns
9e5f26cf4c
Merge pull request #16130 from Atlante45/fix/avatar-mixer-crash
...
BUGZ-1405: Add context object to timer connection
2019-09-03 14:40:46 -07:00
Clement
86b635d80a
Add context object to timer connection
2019-09-03 13:40:02 -07:00
Sam Gateau
cda2943b9a
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-03 12:01:12 -07:00
Shannon Romano
5f4b2a0080
Merge pull request #16109 from sethalves/fix-saccade-override
...
apply fake eye saccades if eye joints aren't overridden
2019-09-03 11:34:02 -07:00
Zach Fox
d88c43614c
Merge pull request #16129 from RebeccaStankus/feetPosition
...
Feet position
2019-09-03 11:04:17 -07:00
amer cerkic
fe3879db4d
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-09-03 10:57:45 -07:00
Jamil Akram
a9d8f105ae
Merge pull request #16112 from dooglifeSF/Anim_memory_reduction
...
Anim memory reduced ~10mb by removing static channels
2019-09-03 10:08:02 -07:00
RebeccaStankus
a34a533c07
Added defaults for some params
2019-09-03 10:06:17 -07:00
Matt Hardcastle
cba258b8c4
Error handling for Launcher's update
...
Before this change the update helper app in the Mac version of HQ
Launcher silently ignored errors. This change adds error handling to aid
troubleshooting.
2019-09-03 09:18:32 -07:00
Shannon Romano
29b9800498
Merge pull request #16123 from MattHardcastle/dont-cache-thunder
...
Don't cache when fetching Thunder's build info
2019-09-02 22:00:34 -07:00
jennaingersoll
037ad36262
Merge pull request #16103 from ctrlaltdavid/DOC-64
...
DOC-64: ScriptDiscoveryService API JSDoc
2019-08-30 22:35:39 -07:00
RebeccaStankus
37304f57ea
Merge branch 'master' of github.com:highfidelity/hifi into feetposition
2019-08-30 14:20:58 -07:00
amerhifi
08ca702c82
remove space
2019-08-30 14:16:11 -07:00
amerhifi
a5923ac9aa
adding unpinnable options to any dlg process and main app so that user cannot accidentaly pin the launcher
2019-08-30 14:15:03 -07:00
RebeccaStankus
5fadfa5275
Updated property in MyAvatar.h
2019-08-30 13:52:02 -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
Bradley Austin Davis
29424ca971
Merge pull request #16113 from jherico/fix/bugz-1363
...
BUGZ-1363: crash when checking for web content restrictions
2019-08-30 13:09:49 -07:00
