Nissim Hadar
|
4bd09fd9af
|
Corrected default values - for reading legacy content.
|
2018-01-11 14:53:58 -08:00 |
|
Nissim Hadar
|
d1cd2d9c96
|
Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix
|
2018-01-11 14:52:19 -08:00 |
|
Seth Alves
|
1a1caa64d5
|
Merge pull request #12148 from vladest/disable_magnification
Temporarily disable magnification until further notice
|
2018-01-11 14:20:54 -08:00 |
|
Sam Gateau
|
4663f8eb2a
|
Merge pull request #12136 from SamGondelman/texture
Keep requesting render update until textures load
|
2018-01-11 14:09:21 -08:00 |
|
Sam Gateau
|
09f5f0746b
|
Merge pull request #12141 from SamGondelman/uniformBuffer
Fix particle uniform buffer issue
|
2018-01-11 14:05:36 -08:00 |
|
vladest
|
cff80e86b6
|
Temporarily disable magnification until further notice
|
2018-01-11 22:18:22 +01:00 |
|
Nissim Hadar
|
86566fc9e1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix
|
2018-01-11 12:30:30 -08:00 |
|
Nissim Hadar
|
d225f803d0
|
Corrected default values.
|
2018-01-11 12:28:44 -08:00 |
|
Anthony Thibault
|
8d5e7dbeff
|
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
Fix for black screen when clicking Settings from Snap app
|
2018-01-11 09:58:10 -08:00 |
|
Seth Alves
|
363b9bfe11
|
Merge pull request #12127 from SamGondelman/freeze
Comment out TabletAddressDialog logging of long messages
|
2018-01-10 18:07:18 -08:00 |
|
Seth Alves
|
457fcd6f40
|
Merge pull request #12129 from SamGondelman/doubleClick
Move key logic from onClicked to onReleased
|
2018-01-10 18:03:23 -08:00 |
|
Seth Alves
|
568c27d6e0
|
Merge pull request #12039 from luiscuenca/currentAPI
Fix and improve currentAPI.js
|
2018-01-10 17:55:08 -08:00 |
|
Seth Alves
|
aefd294bf2
|
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera
Improve stability for HMD third person avatars
|
2018-01-10 17:46:47 -08:00 |
|
Andrew Meadows
|
b3fcca8446
|
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body
Bug fix to prevent wrists entering the avatar's torso.
|
2018-01-10 17:22:50 -08:00 |
|
MiladNazeri
|
c77d2f4e58
|
Merge pull request #12121 from cain-kilgore/21667
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
|
2018-01-10 17:11:54 -08:00 |
|
MiladNazeri
|
301731554f
|
Merge pull request #12102 from cain-kilgore/21664
WL 21664 - Window.innerHeight should not include the menu bar
|
2018-01-10 17:10:14 -08:00 |
|
SamGondelman
|
e9d751fd23
|
try to avoid reusing uniform buffer locations
|
2018-01-10 17:01:01 -08:00 |
|
Anthony J. Thibault
|
1deb75daf7
|
Fix for black screen when clicking Settings from Snap app
(cherry picked from commit d5e3b97c93)
|
2018-01-10 16:31:51 -08:00 |
|
NissimHadar
|
19106fcff9
|
Merge pull request #12128 from NissimHadar/stageRemoval
Stage removal
|
2018-01-10 15:06:51 -08:00 |
|
Nissim Hadar
|
dff47f38a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-10 13:36:09 -08:00 |
|
Nissim Hadar
|
8396997dec
|
Renamed enum element.
|
2018-01-10 13:35:57 -08:00 |
|
SamGondelman
|
df574c6bc9
|
keep requesting render update until textures load
|
2018-01-10 13:19:53 -08:00 |
|
Cain Kilgore
|
104ac0ffae
|
Indents, man
|
2018-01-10 20:30:41 +00:00 |
|
MiladNazeri
|
b73106fa7e
|
Merge pull request #12120 from cain-kilgore/21666
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
|
2018-01-10 12:30:21 -08:00 |
|
Cain Kilgore
|
b26e31a362
|
Copy paste? Never!
|
2018-01-10 20:27:19 +00:00 |
|
MiladNazeri
|
2220b976dc
|
Merge pull request #12130 from cain-kilgore/21665
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
|
2018-01-10 12:06:58 -08:00 |
|
MiladNazeri
|
bf61d8c7b3
|
Merge pull request #12115 from ctrlaltdavid/deprecations
Update JSDoc with some deprecations
|
2018-01-10 12:04:21 -08:00 |
|
Anthony J. Thibault
|
ae997928c1
|
Bug fix to prevent wrists entering the avatar's torso.
This was inadvertently disabled in PR #11978.
|
2018-01-10 11:51:44 -08:00 |
|
Nissim Hadar
|
ea10bfba6c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-10 11:49:53 -08:00 |
|
Nissim Hadar
|
c99a936720
|
Bumped up protocol version.
|
2018-01-10 11:45:37 -08:00 |
|
Cain Kilgore
|
057c708637
|
Spaces instead of Tabs
(Damnit VS Re-install!)
|
2018-01-10 19:24:52 +00:00 |
|
Anthony J. Thibault
|
220b7f5e55
|
Merge branch 'master' into bug-fix/better-third-person-camera
|
2018-01-10 10:14:09 -08:00 |
|
Howard Stearns
|
fafc98f51c
|
Merge pull request #12098 from ElderOrb/FB11123
FB11123 Make the certificate GOLD (and change title to Proof of Prove…
|
2018-01-10 10:01:15 -08:00 |
|
Andrew Meadows
|
7060cd9a90
|
Merge pull request #12122 from druiz17/fix-double-set-tablet-root
don't call setQmlTabletRoot twice
|
2018-01-10 09:53:09 -08:00 |
|
Nissim Hadar
|
9f25b01b10
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-10 09:30:05 -08:00 |
|
Sam Gateau
|
539ee82937
|
Merge pull request #12033 from Zvork/compactvb
More compact representation of meshes on GPU
|
2018-01-10 09:11:33 -08:00 |
|
Sam Gateau
|
d4dc1e352f
|
Merge pull request #12124 from AndrewMeadows/no-misc-stats
more context for update performance stats
|
2018-01-10 09:10:26 -08:00 |
|
Sam Gateau
|
8c80247925
|
Merge pull request #12123 from SamGondelman/meta
Model meta render item is only withTypeShape if visual geometry request fails
|
2018-01-10 09:09:19 -08:00 |
|
Sam Gateau
|
6d6aad4aa8
|
Merge pull request #12060 from SamGondelman/burp5
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
|
2018-01-10 09:08:54 -08:00 |
|
NissimHadar
|
7fbb945892
|
Merge pull request #12055 from NissimHadar/keylightInheritance
Keylight inheritance
|
2018-01-10 08:40:14 -08:00 |
|
Cain Kilgore
|
330b266ca8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 21665
|
2018-01-10 11:33:06 +00:00 |
|
Cain Kilgore
|
38afc5a25b
|
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
|
2018-01-10 11:31:46 +00:00 |
|
Olivier Prat
|
5ae4b99b90
|
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
|
2018-01-10 11:20:00 +01:00 |
|
SamGondelman
|
c46531296f
|
move key logic from onClicked to onReleased
|
2018-01-09 18:28:54 -08:00 |
|
Zach Fox
|
928e3d2ef7
|
Merge pull request #12108 from zfox23/commerce_pagination
Commerce: Support pagination at History endpoint; improve Purchases scrolling
|
2018-01-09 15:57:34 -08:00 |
|
Nissim Hadar
|
bb04b68e42
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-09 15:51:46 -08:00 |
|
Nissim Hadar
|
5b1f8e83d4
|
Removed gcc warning.
|
2018-01-09 15:46:15 -08:00 |
|
Nissim Hadar
|
0b1e321ccf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-09 15:25:03 -08:00 |
|
Nissim Hadar
|
b53e411184
|
Corrected pushing of default lights.
|
2018-01-09 15:24:46 -08:00 |
|
Brad Hefta-Gaub
|
a7b56da570
|
Merge pull request #12103 from ZappoMan/emoteApp
first cut at an emote app
|
2018-01-09 15:23:14 -08:00 |
|