John Conklin II
|
dda310c0b9
|
Merge pull request #14835 from SamGondelman/textures
Case 20944: Fix Model textures property
|
2019-02-07 14:19:01 -08:00 |
|
NissimHadar
|
03ad14caaf
|
Removed unneeded step.
|
2019-02-07 14:17:18 -08:00 |
|
NissimHadar
|
f9396fe597
|
Corrected error message.
|
2019-02-07 14:11:59 -08:00 |
|
SamGondelman
|
e601f6c59f
|
move material mapping to hfm prep step
|
2019-02-07 14:10:09 -08:00 |
|
Brad Davis
|
070fb25b80
|
Cleaning up differnces from master
|
2019-02-07 13:33:28 -08:00 |
|
Roxanne Skelly
|
c775a9b23f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-02-07 13:23:59 -08:00 |
|
Roxanne Skelly
|
d04445c244
|
Qml Marketplace - remove some quest incompatibilities and disable
links for quest
|
2019-02-07 13:22:49 -08:00 |
|
SamGondelman
|
3addcb630c
|
Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping
|
2019-02-07 11:45:59 -08:00 |
|
Anthony Thibault
|
f8608464fa
|
warning fixes
|
2019-02-07 11:33:44 -08:00 |
|
sabrina-shanman
|
ef529ed309
|
Do not use continues in logic checking if we should calculate mesh tangents
|
2019-02-07 11:27:08 -08:00 |
|
sabrina-shanman
|
985f6dcb75
|
Fix normal textures not being visible
|
2019-02-07 11:22:33 -08:00 |
|
Bradley Austin Davis
|
23d7c0fb70
|
Merge pull request #14869 from danteruiz/feature/quest
Master into Feature/quest
|
2019-02-07 11:04:49 -08:00 |
|
danteruiz
|
95d30e5cbf
|
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
|
2019-02-07 10:41:44 -08:00 |
|
SamGondelman
|
7fe0e5909e
|
fix black albedo coloring
|
2019-02-07 10:14:10 -08:00 |
|
SamGondelman
|
e74ff18bef
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:49:27 -08:00 |
|
SamGondelman
|
25ca52d892
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:48:13 -08:00 |
|
Sam Gateau
|
632d6e8a73
|
Merge pull request #14863 from danteruiz/android-apps-directories
Case 20877: Support CMake time configuration of QmlFileSelectors
|
2019-02-07 09:30:49 -08:00 |
|
Ken Cooke
|
ba00f95f72
|
Expose clipping status to audio scripting interface
|
2019-02-06 18:23:50 -08:00 |
|
Sam Gateau
|
4648c47af8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-06 18:13:26 -08:00 |
|
Bradley Austin Davis
|
b8906c3c40
|
Merge pull request #14867 from samcake/quest6
Quest addressing the low resolution
|
2019-02-06 17:19:42 -08:00 |
|
Sam Gateau
|
29573aaa83
|
fix the half resoolution problem
|
2019-02-06 16:41:23 -08:00 |
|
SamGondelman
|
a665664fd5
|
fix double lasers
|
2019-02-06 16:13:40 -08:00 |
|
Ken Cooke
|
918e2fc7ab
|
Proper detection of digital clipping on the unprocessed audio input.
Triggered when 3+ consecutive samples > -0.1 dBFS.
|
2019-02-06 16:08:30 -08:00 |
|
SamGondelman
|
b1e7c3d4fd
|
allow negative dimensions for planar overlays via HACK, set default texture for line overlays to white pixel
|
2019-02-06 16:04:40 -08:00 |
|
Shannon Romano
|
6fd480e51d
|
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
|
2019-02-06 15:52:31 -08:00 |
|
Jeff Clinton
|
2c666aed5e
|
Merge pull request #14821 from SamGondelman/owningAvatarID
Case 20932: Fix getEntityProperties
|
2019-02-06 14:43:31 -08:00 |
|
Simon Walton
|
58d8945aa5
|
Limit re-sort rate to 2 Hz.
|
2019-02-06 14:41:27 -08:00 |
|
NissimHadar
|
89eff9171e
|
Merge branch '20816-installOnAndroid' of github.com:NissimHadar/hifi into 20816-installOnAndroid
|
2019-02-06 14:29:30 -08:00 |
|
NissimHadar
|
8f09c5b689
|
Updated readme.
|
2019-02-06 14:28:19 -08:00 |
|
Dante Ruiz
|
f07b5c8490
|
update urls
|
2019-02-06 14:25:25 -08:00 |
|
Sam Gateau
|
db30857b87
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-06 13:21:34 -08:00 |
|
Brad Davis
|
8b70f1771e
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-06 13:16:22 -08:00 |
|
Sam Gateau
|
9ff9117a34
|
Merge pull request #14811 from jherico/feature/quest_frame_player
Case 20884: Quest frame player and Oculus libraries
|
2019-02-06 13:15:39 -08:00 |
|
Brad Davis
|
b40595b14f
|
Fix merge issue
|
2019-02-06 13:06:04 -08:00 |
|
Brad Davis
|
3331a8ad43
|
Removing signing configs for frame player apps
|
2019-02-06 13:00:49 -08:00 |
|
Sam Gateau
|
8ec9c8502d
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-06 12:09:38 -08:00 |
|
Shannon Romano
|
6a91b54261
|
Merge pull request #14856 from AndrewMeadows/fix-crash-on-early-shutdown-redux
case 21042: fix interface crash on early shutdown, 0.80.0 redux
|
2019-02-06 11:53:49 -08:00 |
|
Shannon Romano
|
30a6f25b69
|
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor
case 20048: don't allow MyAvatar to move until physics enabled
|
2019-02-06 11:52:42 -08:00 |
|
SamGondelman
|
9193704173
|
trying to get hashes working
|
2019-02-06 11:47:38 -08:00 |
|
Simon Walton
|
a2da59271d
|
If sorting PAL by loudness re-sort upon loudness updates
|
2019-02-06 11:38:48 -08:00 |
|
danteruiz
|
d0fecac0d8
|
+android -> +android_interface
|
2019-02-06 11:37:52 -08:00 |
|
Shannon Romano
|
61459d5756
|
Merge pull request #14775 from roxanneskelly/QmlMarketplace
Qml marketplace
|
2019-02-06 11:20:49 -08:00 |
|
Shannon Romano
|
26927aaec6
|
Merge pull request #14847 from AndrewMeadows/trust-the-packet
Case 20959: fix crash for incorrect parsing of AvatarEntity data
|
2019-02-06 11:15:13 -08:00 |
|
SamGondelman
|
4c9fb168c7
|
enable backface culling on procedurals
|
2019-02-06 10:55:36 -08:00 |
|
Brad Davis
|
19be752361
|
Merge remote-tracking branch 'origin/feature/quest_frame_player' into feature/quest
|
2019-02-06 10:29:07 -08:00 |
|
Brad Davis
|
91e18f569b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-06 10:15:36 -08:00 |
|
Bradley Austin Davis
|
a622f43099
|
Merge pull request #14861 from danteruiz/unused
remove initialized variable
|
2019-02-06 10:01:34 -08:00 |
|
Dante Ruiz
|
6c9d15d9a9
|
remove used variable
|
2019-02-06 09:58:02 -08:00 |
|
Bradley Austin Davis
|
41a07af790
|
Merge pull request #14859 from danteruiz/fix-quest-controllers
Make sure that the quest controllers are connected after initialization
|
2019-02-06 09:31:46 -08:00 |
|
Thijs Wenker
|
2247dd3471
|
local compare in entity list sorting
|
2019-02-06 18:24:40 +01:00 |
|