Shannon Romano
|
95bdf29f35
|
Merge pull request #15151 from roxanneskelly/Case20622
Case 20622 - Qml Marketplace - Fix categories dropdown UI issues
|
2019-03-12 17:42:47 -07:00 |
|
Shannon Romano
|
88da09c2ab
|
Merge pull request #15029 from FlameSoulis/fix/Linux-Build-Guide
Resolve Linux Build Guide's Cmake issue
|
2019-03-12 12:29:46 -07:00 |
|
Sabrina Shanman
|
ff67cd652e
|
Merge pull request #15158 from SamGondelman/unrigged
Case 7295: Fix rendering of unrigged vertices
|
2019-03-12 10:59:29 -07:00 |
|
John Conklin II
|
2cf7462fbc
|
Merge pull request #15159 from dback2/jointOffset2RenamingFix
Case 21669: Fix joint renaming with jointRotationOffset2
|
2019-03-12 10:32:02 -07:00 |
|
David Back
|
f0bf87b3c3
|
fix joint out not being renamed with jointRotationOffset2
|
2019-03-11 18:53:35 -07:00 |
|
Shannon Romano
|
44fa00606a
|
Merge pull request #15153 from danteruiz/fix-soft-entity-popping
Case 21618: menithal's avatar is constantly flashing
|
2019-03-11 18:09:44 -07:00 |
|
Jason Najera
|
2423cd8b9e
|
Merge pull request #15109 from r3tk0n/ptt
Case 21658: Push-To-Talk
|
2019-03-11 17:59:01 -07:00 |
|
SamGondelman
|
2b32b77bed
|
handle case when clusterMatrices.size() == 0
|
2019-03-11 17:32:40 -07:00 |
|
Wayne Chen
|
0279373d11
|
Merge branch 'master' into ptt
|
2019-03-11 17:09:37 -07:00 |
|
Wayne Chen
|
4add8c1777
|
Merge pull request #15098 from wayne-chen/muteWarningModified
Case 21564: Warn When Muted
|
2019-03-11 16:53:00 -07:00 |
|
Wayne Chen
|
db368338b8
|
Merge pull request #22 from wayne-chen/pushToTalk
removing dead code
|
2019-03-11 16:44:12 -07:00 |
|
Wayne Chen
|
84b177996b
|
removing dead code
|
2019-03-11 16:43:26 -07:00 |
|
Jason Najera
|
3c5fd06959
|
Remove useless comment.
Comment was not helpful.
|
2019-03-11 16:16:58 -07:00 |
|
Wayne Chen
|
97e375e004
|
Merge pull request #21 from wayne-chen/pushToTalk
changing mic bar indicator + PTT setting placement
|
2019-03-11 16:16:52 -07:00 |
|
Wayne Chen
|
80821e8b7e
|
changing mic bar indicator when muted in PTT
|
2019-03-11 16:15:47 -07:00 |
|
Wayne Chen
|
ca5ff3381b
|
changing position of the mute warning setting
|
2019-03-11 16:02:18 -07:00 |
|
SamGondelman
|
b24b7fed3d
|
the root node isn't the first onegit add ../.git add ../.
|
2019-03-11 15:34:41 -07:00 |
|
Shannon Romano
|
c0240d2431
|
Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh
Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes
|
2019-03-11 15:33:32 -07:00 |
|
Wayne Chen
|
36c2358dc0
|
Merge branch 'master' into muteWarningModified
|
2019-03-11 14:35:13 -07:00 |
|
Wayne Chen
|
4eefd1389f
|
Merge pull request #20 from wayne-chen/pushToTalk
moving key press detection to JSON
|
2019-03-11 14:29:16 -07:00 |
|
Wayne Chen
|
07ddd4e1dd
|
moving key press detection to JSON
|
2019-03-11 14:27:47 -07:00 |
|
Shannon Romano
|
864c37d310
|
Merge pull request #15155 from sethalves/fix-clonables
Fix cloneables
|
2019-03-11 14:17:20 -07:00 |
|
Shannon Romano
|
801306364a
|
Merge pull request #15148 from samcake/rc81-hero
Case 21639: RC81: Adding Hero support in simulation of avatars
|
2019-03-11 14:13:49 -07:00 |
|
Seth Alves
|
e515e9cc66
|
fix cloneEntity function
|
2019-03-11 12:38:54 -07:00 |
|
Seth Alves
|
2fb5e1ebc2
|
quiet some logging
|
2019-03-11 12:36:29 -07:00 |
|
Shannon Romano
|
a7e3495cfb
|
Merge pull request #15152 from roxanneskelly/Case21326
Case 21326 - missing marketplaceInject.js
|
2019-03-11 12:22:03 -07:00 |
|
SamGondelman
|
b7e1798d1b
|
better handling of unrigged vertices on skinned mesh
|
2019-03-11 11:28:30 -07:00 |
|
danteruiz
|
4371723145
|
fix soft entity popping
|
2019-03-11 11:27:12 -07:00 |
|
r3tk0n
|
8aedc98a58
|
Fix QML formatting issue.
|
2019-03-11 10:54:48 -07:00 |
|
Roxanne Skelly
|
e4e8a61328
|
Case 21326 - missing marketplaceInject.js
The re-addition of marketplaceInject.js didn't merge from 80
for some reason.
|
2019-03-11 10:46:51 -07:00 |
|
r3tk0n
|
c1ed01115d
|
Fix logic for HMD vs Desktop.
|
2019-03-11 09:58:35 -07:00 |
|
r3tk0n
|
ec0cf3ee3a
|
Fix typo.
|
2019-03-11 09:58:20 -07:00 |
|
Wayne Chen
|
1b628bc8e5
|
Merge pull request #19 from wayne-chen/pushToTalk
fixing initialization in switch statement
|
2019-03-10 19:46:50 -07:00 |
|
Wayne Chen
|
7b51061b5f
|
fixing initialization in switch statement
|
2019-03-10 19:46:01 -07:00 |
|
Wayne Chen
|
a794da83da
|
Merge pull request #18 from wayne-chen/pushToTalk
connecting pushingToTalkChanged with handlePushedToTalk
|
2019-03-10 19:41:13 -07:00 |
|
Wayne Chen
|
20487b2ad1
|
connecting pushingToTalkChanged with handlePushedToTalk
|
2019-03-10 19:39:45 -07:00 |
|
Wayne Chen
|
584342e4ed
|
Merge pull request #17 from wayne-chen/pushToTalk
fixing error in master + getting ptt to show up
|
2019-03-10 19:01:23 -07:00 |
|
Wayne Chen
|
cf3694e8e3
|
fixing error in master + getting ptt to show up
|
2019-03-10 19:00:41 -07:00 |
|
Wayne Chen
|
15eb90f634
|
Merge pull request #16 from wayne-chen/pttSwitchToItem
fixng ptt checkbox
|
2019-03-10 17:18:47 -07:00 |
|
Wayne Chen
|
54973375a4
|
fixng ptt checkbox
|
2019-03-10 17:18:18 -07:00 |
|
Wayne Chen
|
3dcc53a945
|
Merge branch 'master' into ptt
|
2019-03-10 17:14:54 -07:00 |
|
Wayne Chen
|
118ada2888
|
Merge pull request #15 from wayne-chen/pttSwitchToItem
switch from column layout to item
|
2019-03-10 17:07:53 -07:00 |
|
Wayne Chen
|
2eaa1e63d3
|
switch from column layout to item
|
2019-03-10 17:07:02 -07:00 |
|
r3tk0n
|
04c6c42512
|
Fix build error from merge.
|
2019-03-10 14:28:31 -07:00 |
|
Bradley Austin Davis
|
0e46007d84
|
Merge pull request #15116 from jherico/fix/oculus_sdk_update
Case 21595: Oculus SDK Update
|
2019-03-08 23:53:06 -08:00 |
|
Sam Gateau
|
3464fe09c1
|
Applying the hero changes to master soon to be rc81
|
2019-03-08 18:13:20 -08:00 |
|
Anthony Thibault
|
c36d752b6b
|
Merge pull request #15141 from luiscuenca/flowAPIExtra
add getFlowData method to MyAvatar
|
2019-03-08 17:45:11 -08:00 |
|
Roxanne Skelly
|
74320fe7be
|
Case 20622 - Qml Marketplace - Fix categories dropdown UI issues
|
2019-03-08 17:24:43 -08:00 |
|
Wayne Chen
|
cad00c21ac
|
Merge pull request #14 from wayne-chen/pushToTalk
fixing compile error
|
2019-03-08 16:39:46 -08:00 |
|
Wayne Chen
|
e0fe11056e
|
fixing compile error
|
2019-03-08 16:37:41 -08:00 |
|