John Conklin II
8f8c5b4f08
Merge pull request #13105 from druiz17/another-highlight-f-x
...
fix-another-highlighting-issue
2018-05-07 10:05:59 -07:00
John Conklin II
2eb171be1c
Merge pull request #13107 from zfox23/RC67_MS14639
...
RC67: Fix for crash deep in QML after useFullAvatarURL
2018-05-07 10:05:16 -07:00
NissimHadar
481eddb2a3
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 08:24:03 -07:00
Alexander Ivash
b4cfea2fbc
FB14818 Login page for steam is blank
2018-05-06 17:17:06 +03:00
Seth Alves
677c99abd4
use memcpy on _usageType as well
2018-05-05 20:50:54 -07:00
Seth Alves
6a55e67ce9
avoid misaligned pointer deref
2018-05-05 16:39:03 -07:00
Seth Alves
6ec91cfa82
Merge pull request #13111 from sethalves/qml-test
...
fix qml-test on osx
2018-05-05 11:19:43 -07:00
Seth Alves
977dda9f5c
Merge branch 'qml-test' of github.com:sethalves/hifi into qml-test
2018-05-05 10:24:55 -07:00
Seth Alves
0589e2f6a0
Merge branch 'master' of github.com:highfidelity/hifi into qml-test
2018-05-05 09:43:32 -07:00
Seth Alves
220006928d
Merge branch 'master' of github.com:highfidelity/hifi into qml-test
2018-05-05 07:56:31 -07:00
Stephen Birarda
66122830c4
Merge pull request #13108 from Atlante45/fix/includes
...
Fix non self-sufficient headers
2018-05-04 19:05:26 -07:00
Clement
5a3773ba72
Fix compile error on linux/windows
2018-05-04 18:18:46 -07:00
Bradley Austin Davis
38f43bdc68
Disable current splash frame implementaton
2018-05-04 16:40:05 -07:00
Bradley Austin Davis
803bd284a6
Alternate shader
2018-05-04 16:40:05 -07:00
Brad Davis
72526781d9
Additional work on splash screen
2018-05-04 16:40:05 -07:00
Sam Gateau
6f6f591985
Merge pull request #12996 from jherico/fix/fb14099
...
Fix debug assert in manipulating thread local data to store GL surfaces
2018-05-04 16:31:09 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
...
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Anthony J. Thibault
8480bb962b
Fix for crash deep in QML after useFullAvatarURL
...
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
2018-05-04 16:08:44 -07:00
Zach Fox
4ebed7605c
MS14758: Fix avatar reset when gifting worn avatar
2018-05-04 16:04:05 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
...
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
John Conklin II
7699a19267
Merge pull request #12992 from Zvork/procedural
...
Fixed procedural shaders
2018-05-04 15:35:57 -07:00
John Conklin II
b314d496ec
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode
...
MS14699: Prevent Wallet passcode from being sticky in certain cases
2018-05-04 15:22:41 -07:00
Simon Walton
00d2f9494b
Change HMACAuth::calculateHash to just call existing methods
2018-05-04 15:07:20 -07:00
Clément Brisset
e1efd30143
Merge pull request #13098 from birarda/bug/update-hoek-for-CVE
...
update server-console dependency hook
2018-05-04 15:04:12 -07:00
Seth Alves
cc4d04aaef
experimenting
2018-05-04 14:45:57 -07:00
Clement
ad60a79180
Fix for android builds
2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db
CR
2018-05-04 14:43:16 -07:00
Liv Erickson
ee0af079cf
merge from upstream master and fix conflict
2018-05-04 14:34:38 -07:00
Dante Ruiz
0e92bb41bf
fix-another-highlighting-issue
2018-05-04 14:30:38 -07:00
Dante Ruiz
176d69444f
fix-another-highlighting-issue
2018-05-04 14:23:46 -07:00
Liv
e4b6686e1c
Merge pull request #13075 from ctrlaltdavid/21862
...
Clear entity selection handles and update list when entities are deleted
2018-05-04 14:23:37 -07:00
Dante Ruiz
607de3dfb4
Merge branch 'RC67' of github.com:highfidelity/hifi into RC67
2018-05-04 14:20:57 -07:00
Dante Ruiz
6414fcaae5
fix-another-highlighting-issue
2018-05-04 14:20:17 -07:00
NissimHadar
2311fa33fb
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-04 14:13:43 -07:00
NissimHadar
2c2b74f4c8
Removed unused variable.
2018-05-04 14:13:14 -07:00
Zach Fox
53fe0bc616
MS14699: Prevent Wallet passcode from being sticky in certain cases
2018-05-04 14:08:21 -07:00
Seth Alves
a6e8924cf0
Merge branch 'fix/qml_surface_test_leak' of github.com:jherico/hifi into qml-test
2018-05-04 12:43:58 -07:00
Bradley Austin Davis
81df7a1293
Fix texture leak in QML surface test
2018-05-04 12:41:39 -07:00
NissimHadar
aef5ea0936
Correct usage of the test script URL.
2018-05-04 12:30:13 -07:00
David Rowe
a35517d985
Fix JSDoc for Users.requestUsernameFromID
2018-05-05 07:05:10 +12:00
John Conklin II
c7bc479c60
Merge pull request #13094 from hyperlogic/bug-fix/case-14639
...
Fix for crash deep in QML after useFullAvatarURL
2018-05-04 11:33:28 -07:00
John Conklin II
ea230d8698
Merge pull request #13100 from druiz17/fix-entity-highlighting-during-editing
...
Don't highlight entities during edit mode
2018-05-04 11:32:24 -07:00
Ryan Huffman
e1d218bb57
Bump asset packet version for texture meta
2018-05-04 11:25:11 -07:00
Ryan Huffman
fc3fd75100
Fix TextureMeta::deserialize not handling json parse errors
2018-05-04 11:13:24 -07:00
Howard Stearns
1733d867ba
Merge pull request #13101 from zfox23/MS14758_fixAvatarGiftingSwitch
...
MS14758: Fix avatar reset when gifting worn avatar
2018-05-04 11:01:27 -07:00
Ryan Huffman
ac0fe62086
Make ModelBaker ktx extension check case-insensitive
2018-05-04 10:53:10 -07:00
Stephen Birarda
a922471b9a
Merge pull request #13018 from huffman/fix/logging-size-limit
...
Fix old log files not being cleaned up
2018-05-04 10:46:13 -07:00
Stephen Birarda
8ded6c76ec
Merge pull request #13069 from ctrlaltdavid/21729-a
...
Remove deprecated location.domainId from API
2018-05-04 10:35:41 -07:00
John Conklin II
32086def18
Merge pull request #13091 from samcake/blue
...
Master: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-04 10:25:57 -07:00
