Wayne Chen
|
2b51f19d70
|
Merge pull request #12 from wayne-chen/pushToTalk
removing debug print statement
|
2019-03-07 12:55:20 -08:00 |
|
Wayne Chen
|
44674d4baf
|
Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk
|
2019-03-07 12:54:49 -08:00 |
|
Wayne Chen
|
472c7ffab4
|
removing debug statement
|
2019-03-07 12:54:32 -08:00 |
|
Wayne Chen
|
13f23a57bf
|
Merge pull request #11 from wayne-chen/pushToTalk
adding Controller.Actions.TogglePushToTalk + rebase with master
|
2019-03-07 12:39:18 -08:00 |
|
Wayne Chen
|
b94b6d06a2
|
Merge branch 'ptt' into pushToTalk
|
2019-03-07 12:38:59 -08:00 |
|
Wayne Chen
|
b4f16daa29
|
Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk
|
2019-03-07 12:37:25 -08:00 |
|
Wayne Chen
|
b83e9f70e6
|
adding PushToTalk action
|
2019-03-07 12:36:56 -08:00 |
|
r3tk0n
|
a62cadc541
|
Fix typo.
|
2019-03-07 12:35:04 -08:00 |
|
r3tk0n
|
55efc315f1
|
Fix activation / deactivation criteria for PTT controller module.
|
2019-03-07 11:45:59 -08:00 |
|
r3tk0n
|
9d59e68d45
|
Enable pushToTalk.js controller module.
|
2019-03-07 11:41:20 -08:00 |
|
r3tk0n
|
2536fcaa17
|
Add pushToTalk.js controllerModule.
|
2019-03-07 11:41:19 -08:00 |
|
Wayne Chen
|
7b197c975c
|
updating compile failure + icons/settings update
|
2019-03-07 11:41:19 -08:00 |
|
Wayne Chen
|
0cb9e7eb36
|
exposing setting pushingToTalk
|
2019-03-07 11:41:19 -08:00 |
|
Wayne Chen
|
9613cfb6b9
|
changing text display
|
2019-03-07 11:41:19 -08:00 |
|
Wayne Chen
|
066d1797cf
|
Push to talk changes + rebased with master (#7)
Push to talk changes + rebased with master
|
2019-03-07 11:41:19 -08:00 |
|
Wayne Chen
|
eeb900b761
|
laying groundwork for audio app + fixing deadlocks
|
2019-03-07 11:41:19 -08:00 |
|
r3tk0n
|
d8478e0b17
|
Initial implementation (deadlocks still occurring in Audio.cpp)
|
2019-03-07 11:41:18 -08:00 |
|
r3tk0n
|
f444f383eb
|
Enable pushToTalk.js controller module.
|
2019-03-07 11:31:48 -08:00 |
|
r3tk0n
|
36f62f05d1
|
Add pushToTalk.js controllerModule.
|
2019-03-07 11:31:28 -08:00 |
|
John Conklin II
|
abb61b7e90
|
Merge pull request #15124 from SamGondelman/shapes
Case 21605: Fix shapes app and debugAvatarMixer
|
2019-03-07 11:07:45 -08:00 |
|
Howard Stearns
|
ab8f6273ad
|
Merge pull request #15113 from howard-stearns/stock-to-master
Stock to master
|
2019-03-07 11:02:53 -08:00 |
|
Anthony Thibault
|
96a696203c
|
Merge pull request #15101 from amantley/bugAvatarHovers
Fixed: Avatar hovers off ground while running
|
2019-03-07 10:52:20 -08:00 |
|
Shannon Romano
|
d11c04a19d
|
Merge pull request #15117 from SamGondelman/wearables
Case 21596: Fix wearable scale on position change
|
2019-03-07 10:29:47 -08:00 |
|
Sam Gateau
|
6841668040
|
Merge pull request #15071 from NissimHadar/21507-replaceQNetworkAccessManagerWithPython
Case 21507: replace Qt network access manager with python
|
2019-03-07 10:04:26 -08:00 |
|
Sam Gondelman
|
dc4e2645da
|
even better!
|
2019-03-07 08:05:32 -08:00 |
|
SamGondelman
|
380df059ff
|
fix shapes app
|
2019-03-06 18:18:39 -08:00 |
|
Wayne Chen
|
aabdb98d2f
|
Merge pull request #10 from wayne-chen/pushToTalk
updating compile failure + icons/settings update
|
2019-03-06 17:30:15 -08:00 |
|
amantley
|
fcf1e34175
|
Merge pull request #15114 from amantley/ikEnabledFix
Ik enabled fix
|
2019-03-06 20:29:38 -05:00 |
|
Wayne Chen
|
e218e4bead
|
updating compile failure + icons/settings update
|
2019-03-06 17:29:32 -08:00 |
|
Shannon Romano
|
d068630728
|
Merge pull request #15108 from sabrina-shanman/crash_physics-fst
(case 21585) Fix crash when FST model used as both graphics and physics model
|
2019-03-06 17:06:38 -08:00 |
|
SamGondelman
|
96eb137df2
|
fix debugAvatarMixer.js
|
2019-03-06 15:53:25 -08:00 |
|
amantley
|
474a97d0fc
|
now update the ikOverlayAlpha every frame
|
2019-03-06 15:15:30 -08:00 |
|
SamGondelman
|
0f3e1b9157
|
fix wearable scale on position change
|
2019-03-06 14:53:21 -08:00 |
|
Howard Stearns
|
c6b2697b44
|
cleanup
|
2019-03-06 13:28:55 -08:00 |
|
Howard Stearns
|
8ebab88613
|
Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master
|
2019-03-06 13:08:19 -08:00 |
|
Roxanne Skelly
|
a54171d60c
|
Merge pull request #15104 from roxanneskelly/79hero-master
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
|
2019-03-06 13:06:45 -08:00 |
|
NissimHadar
|
4e7f558af8
|
Merge branch 'master' of github.com:highfidelity/hifi into 21507-replaceQNetworkAccessManagerWithPython
|
2019-03-06 13:02:36 -08:00 |
|
Shannon Romano
|
fc2f1ff994
|
Merge pull request #14955 from thoys/fix/create/reloadCrash
Case 18299: Remove workaround for Interactive window crash now that it is fixed
|
2019-03-06 12:46:00 -08:00 |
|
Shannon Romano
|
bde6ced7c8
|
Merge pull request #15049 from thoys/fix/fst/materialRelativePaths
Case 21474: relative paths in FST material parsing
|
2019-03-06 12:38:13 -08:00 |
|
Shannon Romano
|
3600b98bd0
|
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
Case 21340: avatar doctor project page status
|
2019-03-06 12:36:18 -08:00 |
|
amantley
|
e72cc8b16e
|
put the ik optimized part of the conditional inside a android build define statement
|
2019-03-06 12:09:53 -08:00 |
|
Sam Gateau
|
f203d71159
|
Merge pull request #15069 from NissimHadar/21482-addSSIMResultsImage
Case 21482: add SSIM results image
|
2019-03-06 12:01:33 -08:00 |
|
Wayne Chen
|
0d3c13517c
|
Merge pull request #9 from wayne-chen/pushToTalk
exposing pushingToTalk setter
|
2019-03-06 11:46:42 -08:00 |
|
Wayne Chen
|
96a5cc5563
|
Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk
|
2019-03-06 11:45:59 -08:00 |
|
Wayne Chen
|
a318b715c3
|
exposing setting pushingToTalk
|
2019-03-06 11:45:43 -08:00 |
|
Howard Stearns
|
ddfd437696
|
ensure error message when marketplace update fails
|
2019-03-06 11:37:17 -08:00 |
|
Howard Stearns
|
366dd935dd
|
trading in has nothing to do with whether you own the new item
|
2019-03-06 11:36:34 -08:00 |
|
Howard Stearns
|
416cde4c1f
|
fix uses of updated_item_id that got lost
|
2019-03-06 11:36:08 -08:00 |
|
Howard Stearns
|
f5afc2033f
|
work through stocking vs update issues, and cleanup
|
2019-03-06 11:35:36 -08:00 |
|
Wayne Chen
|
2dd939c85f
|
Merge pull request #8 from wayne-chen/pushToTalk
changing micbar display
|
2019-03-06 11:22:18 -08:00 |
|