sabrina-shanman
|
76b1f551b1
|
Merge branch 'master' into instancing
|
2019-09-16 10:17:59 -07:00 |
|
sabrina-shanman
|
46616b4efd
|
Fix more integer conversion warnings
|
2019-09-16 09:55:25 -07:00 |
|
sabrina-shanman
|
a166b41216
|
Fix build warnings/errors
|
2019-09-13 15:39:29 -07:00 |
|
Shannon Romano
|
79d845d127
|
Merge pull request #16190 from danteruiz/fix-html
BUGZ-1398: HMD Tablet Apps blocked by Web access error
|
2019-09-13 12:35:29 -07:00 |
|
danteruiz
|
8491a37923
|
fixing WebEntities html
|
2019-09-13 09:57:51 -07:00 |
|
sabrina-shanman
|
b944db3e79
|
std::vector-ize joints and materials in hfm::Model
|
2019-09-11 16:54:07 -07:00 |
|
MiladNazeri
|
fb9a6a3c78
|
Merge pull request #16175 from MiladNazeri/dev-551/hide-crash-menu-behind-enviornment-variables
DEV-551/hide-crash-menu-behind-environment-variable
|
2019-09-11 15:47:40 -07:00 |
|
Zach Fox
|
a5504c3780
|
Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
|
2019-09-11 15:05:44 -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 |
|
MiladNazeri
|
a9da5b8f16
|
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
|
2019-09-11 12:45:18 -07:00 |
|
MiladNazeri
|
d95a803324
|
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
|
2019-09-11 12:44:59 -07:00 |
|
milad
|
3cf56210b2
|
modified Audio.qml to handle desktop audio level meter visible
|
2019-09-11 12:30:24 -07:00 |
|
milad
|
f9c5d00efa
|
remove source from variable name
|
2019-09-11 12:10:47 -07:00 |
|
milad
|
5ec8b0d589
|
added environment variable check for crash menu
|
2019-09-11 11:39:19 -07:00 |
|
Zach Fox
|
50ba55a988
|
Protect against engine not returning a valid CPU/GPU object
|
2019-09-10 13:03:40 -07:00 |
|
Zach Fox
|
e52d65a7bc
|
BUGZ-1451: Update links in controller reference
|
2019-09-10 11:31:51 -07:00 |
|
Zach Fox
|
eb286d992e
|
Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound
Emoji app duplicates sound on opening from toolbar
|
2019-09-09 11:27:26 -07:00 |
|
Shannon Romano
|
e1dac580b6
|
Merge pull request #16121 from luiscuenca/audioPosesSyncFix
BUGZ-1234: Mitigate the effect of audio noise on talking animations
|
2019-09-09 10:37:07 -07:00 |
|
RebeccaStankus
|
33b78bea4f
|
Changed textField module sounds
|
2019-09-09 10:36:35 -07:00 |
|
Shannon Romano
|
ca190f9932
|
Merge pull request #16143 from dooglifeSF/Sitting_emote_variants
Sitting emote variants, revisions on stand emote agree anims, point bug fix
|
2019-09-09 10:12:56 -07:00 |
|
Shannon Romano
|
4017a4f937
|
Merge pull request #16156 from sethalves/wtf-audio-devices
BUGZ-1434: use existing audio settings on startup
|
2019-09-09 10:09:34 -07:00 |
|
Shannon Romano
|
c7db287458
|
Merge pull request #16146 from AndrewMeadows/ess-with-simulation
BUGZ-1385: allow entity-script-server to move entities kinematically
|
2019-09-09 07:51:28 -07:00 |
|
Seth Alves
|
4eb88fb396
|
use existing audio settings on startup
|
2019-09-07 15:55:31 -07:00 |
|
Matt Hardcastle
|
3074ff96e0
|
Merge pull request #16150 from MattHardcastle/add-signing-2.0-rebase
Add signing 2.0 rebase
|
2019-09-07 09:09:11 -07:00 |
|
Andrew Meadows
|
227b99859d
|
fix api for checking EntityItem grab status
|
2019-09-06 17:23:38 -07:00 |
|
dooglifeSF
|
932093bead
|
Merge branch 'master' into Sitting_emote_variants
|
2019-09-06 15:06:52 -07:00 |
|
dooglifeSF
|
422ad52a87
|
Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges
|
2019-09-06 13:57:33 -07:00 |
|
dante ruiz
|
768ac08d11
|
Add entitlements for Launcher and Interface
|
2019-09-06 11:20:16 -07:00 |
|
dante ruiz
|
c2e0e6a976
|
Change Launcher config.json location
Launcher `config.json` can not be inside Interface's app bundle, as it
will break signing.
|
2019-09-06 11:20:06 -07:00 |
|
dooglifeSF
|
b5d2675a05
|
Merge branch 'master' into Sitting_emote_variants
|
2019-09-05 16:45:24 -07:00 |
|
dooglifeSF
|
5061aca487
|
Update sitting_emote_raisehand03_all.fbx
|
2019-09-05 16:44:13 -07:00 |
|
dooglifeSF
|
9cfa4753d9
|
sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit
|
2019-09-05 15:31:07 -07:00 |
|
Anthony J. Thibault
|
c35640f739
|
Warning fixes and small bug fix to anim stats
|
2019-09-05 14:54:19 -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 |
|
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
|
24faa4a7cb
|
Merge pull request #16124 from MattHardcastle/call-interface-highfidelity
Call Interface "High Fidelity" on macOS
|
2019-09-04 09:34:35 -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 |
|
dooglifeSF
|
6b3dfd6d56
|
sitting emote raised hand 03 wip
|
2019-09-03 16:53:36 -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 |
|
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 |
|
RebeccaStankus
|
37304f57ea
|
Merge branch 'master' of github.com:highfidelity/hifi into feetposition
|
2019-08-30 14:20:58 -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 |
|
Matt Hardcastle
|
f91ec8fbf5
|
Call Interface "High Fidelity" on macOS
|
2019-08-30 09:18:36 -07:00 |
|
Brad Davis
|
82a49d4641
|
Fix android build
|
2019-08-29 20:19:49 -07:00 |
|