David Back
|
84b2a7d474
|
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
|
2019-01-07 15:42:02 -08:00 |
|
Sam Gondelman
|
1fe62ecb10
|
Merge pull request #14657 from SamGondelman/propFix
Case 20504: Trying to fix avatar entity issue
|
2019-01-07 15:37:52 -08:00 |
|
David Back
|
3aa245036b
|
Merge branch 'master' into propertyRangeAudit
|
2019-01-07 15:36:18 -08:00 |
|
John Conklin II
|
edd329c601
|
Merge pull request #14663 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch
MS20142 - CreateApp - Fix active colorPicker to update on selection update
|
2019-01-07 15:00:36 -08:00 |
|
Sam Gondelman
|
db3187ec6c
|
Merge branch 'master' into propFix
|
2019-01-07 14:57:38 -08:00 |
|
Adam Smith
|
7e75ed5daa
|
Merge pull request #14586 from SamGondelman/NOverlays8
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
|
2019-01-07 14:53:27 -08:00 |
|
SamGondelman
|
791257bd0a
|
convert old created to quint
|
2019-01-07 14:17:01 -08:00 |
|
SamGondelman
|
4210d4a7cd
|
write created as quint64
|
2019-01-07 13:24:38 -08:00 |
|
SamGondelman
|
fa66ed766d
|
one more try
|
2019-01-07 12:31:52 -08:00 |
|
Thijs Wenker
|
7823b3d4a3
|
clarifying comments
|
2019-01-07 21:08:41 +01:00 |
|
SamGondelman
|
5cded6938b
|
possible fix for texture path
|
2019-01-07 11:55:34 -08:00 |
|
Thijs Wenker
|
7d9cad3e8e
|
CreateApp - Fix active colorPicker to update on selection update
|
2019-01-07 20:35:09 +01:00 |
|
David Back
|
5aa5b997fe
|
remove logs
|
2019-01-07 11:33:08 -08:00 |
|
David Back
|
2f99729905
|
add rect case, fix step rounding
|
2019-01-07 11:31:04 -08:00 |
|
SamGondelman
|
d57e3b57aa
|
possible fix for created to/from string
|
2019-01-07 11:10:36 -08:00 |
|
David Back
|
56007c8512
|
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
|
2019-01-07 10:50:45 -08:00 |
|
Shannon Romano
|
8acae02203
|
Merge pull request #14660 from thoys/feat/create/newFirstClassImageProperties
MS20170: Update Image/Text Entity properties in Create with new properties
|
2019-01-07 10:45:15 -08:00 |
|
David Back
|
d25948fbd3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
|
2019-01-07 10:36:27 -08:00 |
|
Shannon Romano
|
963bbbad19
|
Merge pull request #14661 from danteruiz/grabbing-web-entites
allow mouse pointer to pick against collidable entities
|
2019-01-07 10:24:48 -08:00 |
|
Shannon Romano
|
6eaec12df7
|
Merge pull request #14658 from Atlante45/feat/stats
Only keep aggregated thread stats for Avatar Mixer
|
2019-01-07 10:17:26 -08:00 |
|
Dante Ruiz
|
4b99a795dd
|
code review changes
|
2019-01-07 09:09:35 -08:00 |
|
Jeff Clinton
|
75d26dc45f
|
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
Add menu checkbox to toggle collisions with other avatars
|
2019-01-07 08:58:09 -08:00 |
|
NissimHadar
|
e134e0dd3f
|
Merge pull request #14644 from NissimHadar/20339_nitpick_v1.3
Case 20339 - nitpick v1.3.1
|
2019-01-07 08:53:37 -08:00 |
|
Dante Ruiz
|
0dc5e7743f
|
allow mouse pointer to pick against collidable entities
|
2019-01-04 17:49:38 -08:00 |
|
Thijs Wenker
|
26f46e87a3
|
new property tooltips
|
2019-01-05 02:16:12 +01:00 |
|
luiscuenca
|
2a367509cd
|
Fix warnings
|
2019-01-04 18:02:18 -07:00 |
|
Thijs Wenker
|
48dc7ee938
|
New color/text entity properties
|
2019-01-05 01:56:28 +01:00 |
|
SamGondelman
|
b5b7574c48
|
set created
|
2019-01-04 16:52:11 -08:00 |
|
Shannon Romano
|
4e5d275768
|
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager
MS19925: Avatar Packager
|
2019-01-04 16:22:06 -08:00 |
|
David Back
|
5ea84fb952
|
CR fixes
|
2019-01-04 15:39:27 -08:00 |
|
luiscuenca
|
d630fe9dbd
|
Add menu checkbox to toggle collisions with other avatars
|
2019-01-04 16:38:48 -07:00 |
|
Jamil Akram
|
81b770e9f2
|
Merge pull request #14641 from jherico/fix/android_build_master
Fix version code for android APKs
|
2019-01-04 15:28:34 -08:00 |
|
Thijs Wenker
|
b0db81b861
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-05 00:01:25 +01:00 |
|
Thijs Wenker
|
94146ab997
|
CR fixes
|
2019-01-04 23:59:22 +01:00 |
|
Clement
|
cfbb4e29d1
|
Only keep aggregated thread stats
|
2019-01-04 14:51:58 -08:00 |
|
Ryan Huffman
|
7433870c2f
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-04 14:43:46 -08:00 |
|
David Back
|
1d3006028a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
|
2019-01-04 14:43:03 -08:00 |
|
Thijs Wenker
|
5d40e1e480
|
- CR/style fixes
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
|
2019-01-04 23:39:04 +01:00 |
|
Shannon Romano
|
9855e9bee8
|
Merge pull request #14650 from NissimHadar/20301-addPlatformInfo
Case 20301 - add platform info
|
2019-01-04 14:37:17 -08:00 |
|
SamGondelman
|
1452d237e2
|
trying to fix avatar entity issue
|
2019-01-04 14:34:46 -08:00 |
|
Shannon Romano
|
10e969f790
|
Merge pull request #14653 from dback2/avatarExporterUpdates
Avatar Exporter - reference thumb rotations
|
2019-01-04 14:34:08 -08:00 |
|
Shannon Romano
|
3faf12b141
|
Merge pull request #14637 from howard-stearns/data-url-for-web-entity
data url for web entity
|
2019-01-04 14:21:55 -08:00 |
|
Ryan Huffman
|
63172ec87b
|
Fix marketplace item update failing on submitted items
|
2019-01-04 14:21:10 -08:00 |
|
Thijs Wenker
|
b105607cb2
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-04 21:13:29 +01:00 |
|
Thijs Wenker
|
a3f72a7a08
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-04 21:10:35 +01:00 |
|
Ryan Huffman
|
51ce19e026
|
Fix modified const var in MarketplaceItemUploader
|
2019-01-04 12:08:23 -08:00 |
|
David Back
|
ad25d50934
|
follow-up merge from PR 14585
|
2019-01-04 12:01:13 -08:00 |
|
Ryan Huffman
|
6d5b9a88e4
|
Remove dead code in AvatarUploadStatusItem
|
2019-01-04 11:29:07 -08:00 |
|
David Back
|
eff9d11437
|
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
|
2019-01-04 11:07:28 -08:00 |
|
Seth Alves
|
b9217e2767
|
Merge pull request #14655 from danteruiz/unknown-steamvr-headsets
omit unknown device names from clear-story data
|
2019-01-04 10:09:20 -08:00 |
|