Commit graph

77024 commits

Author SHA1 Message Date
unknown
cbddffd63b Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterMaterials 2019-03-07 16:19:20 -08:00
Shannon Romano
29960cfd5c
Merge pull request #15009 from ingerjm0/api-docs
Add custom JSDoc template, add @signal tag
2019-03-07 16:07:50 -08:00
Shannon Romano
343e2648bb
Merge pull request #15131 from danteruiz/destroy-modal-dialogs
Case 15127: Esc key doesn't consistently set my avatar to 'Away' mode
2019-03-07 16:06:33 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
2019-03-07 16:04:57 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo
Case 21603: Tablet x button is nearly impossible to hit with stylus
2019-03-07 16:03:13 -08:00
Shannon Romano
b567fd6cac
Merge pull request #15105 from danteruiz/disable-entity-scaling
Case 20830: Disable entity scaling while grabbing
2019-03-07 16:01:34 -08:00
Thijs Wenker
db4a33e24a
Merge pull request #14967 from dback2/avatarExporterRootName
Case 21073: Avatar Exporter v0.3 - use root bone name from skeleton list
2019-03-08 00:58:22 +01:00
Shannon Romano
9964666ec6
Merge pull request #15112 from jherico/fix/android_quest_version_code
Add the version code to the Quest android build
2019-03-07 15:55:07 -08:00
Thijs Wenker
174e9d3915
Merge pull request #14940 from dback2/fixAvatarExporterGitIgnore
Case 21273: Avatar Exporter - fix .gitignore to include all unneeded files
2019-03-08 00:48:44 +01:00
Shannon Romano
76958ffda2
Merge pull request #15102 from danteruiz/keyboard-for-web-entities
Case 21144: Can't enter text in a Web Entity with the new keyboard
2019-03-07 15:46:31 -08:00
Shannon Romano
ab08b56bd1
Merge pull request #15085 from danteruiz/keyboard-handle-scaling
Case 21500: Keyboard handle appears huge when scaling down avatar
2019-03-07 15:39:43 -08:00
Shannon Romano
37727c8b60
Merge pull request #14938 from dback2/draggableNumberDisabled
Case 20662: Entity Properties - fix disabling draggable numbers
2019-03-07 15:33:21 -08:00
Shannon Romano
8be93fd16c
Merge pull request #14891 from kencooke/glm-pack-normals-speedup
Case 21114: SIMD optimized blendshape packing
2019-03-07 15:28:40 -08:00
SamGondelman
1d6364773d fix crash on startup 2019-03-07 15:26:41 -08:00
Howard Stearns
d309995aef spell domainUnlimited right, and track challenges so that we don't reap 2019-03-07 14:48:57 -08:00
danteruiz
d1e376de0e destroy modal dialogs that prevent interface from getting input 2019-03-07 14:29:38 -08:00
Anthony Thibault
0cf8f3e5c3 Code review feed back remove NEW_VERSION ifdef 2019-03-07 14:11:01 -08:00
Roxanne Skelly
cce43357d0 Case 21315, Case 21326, Case 21370
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled

Also, a few minor font sizing and other graphics tweaks
2019-03-07 13:58:51 -08:00
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -08:00
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
John Conklin II
9a4b95faa2
Merge pull request #15111 from luiscuenca/flowDataOnFst
Load flow bone data from FST file
2019-03-07 12:48:36 -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
NissimHadar
684f9929a9 Improved error message. 2019-03-07 12:22:07 -08:00
NissimHadar
8acec5c9e9 Increased threshold to 0.9999 2019-03-07 12:21:40 -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
NissimHadar
53d682d40e Merge branch 'master' of github.com:highfidelity/hifi into 21559-increaseComparisonThreshold 2019-03-07 11:32:12 -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
danteruiz
05dc30a740 more requested changes 2019-03-07 10:49:37 -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
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -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