samcake
|
728577dfd8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-05-08 11:46:01 -07:00 |
|
Zach Fox
|
cf917514b4
|
Merge pull request #13119 from zfox23/MS14878_preventPasswordLeak
MS14878: Prevent wallet passphrase leak in specific case
|
2018-05-08 10:44:52 -07:00 |
|
Zach Fox
|
c5ebc436ce
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14878_preventPasswordLeak
|
2018-05-08 09:40:53 -07:00 |
|
Ken Cooke
|
14f4c035ab
|
Merge pull request #13113 from sethalves/fix-ktx-asan-warning
avoid misaligned pointer deref in ktx code
|
2018-05-08 08:44:18 -07:00 |
|
John Conklin II
|
0a4fedca71
|
Merge pull request #13121 from zfox23/MS3128_removeVestigalEditMenuItem
MS3128: Remove vestigial Edit menu item
|
2018-05-08 08:34:03 -07:00 |
|
Zach Fox
|
fd4530e671
|
MS3128: Remove vestigal Edit menu item
|
2018-05-07 14:39:31 -07:00 |
|
Zach Fox
|
646c0ec987
|
MS14878: Prevent wallet passphrase leak in specific case
|
2018-05-07 11:56:47 -07:00 |
|
samcake
|
86b2eb0829
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-05-07 11:11:20 -07:00 |
|
John Conklin II
|
6ac43c34c2
|
Merge pull request #13032 from druiz17/fix-spamming-reset-sensors
don't spam resetSensors function when holding down Qt::Key_Apostrophe
|
2018-05-07 10:52:51 -07:00 |
|
John Conklin II
|
1e6e182c63
|
Merge pull request #13090 from druiz17/fix-entity-highlighting
fix highlighting issues (master)
|
2018-05-07 10:20:38 -07: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 |
|
Sam Gateau
|
9b65e0771b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-05-05 12:17:20 -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 |
|
samcake
|
6424b91e86
|
Templatizing the timeProfiler for the task
|
2018-05-04 17:58:21 -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 |
|
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 |
|
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 |
|
Dante Ruiz
|
0e92bb41bf
|
fix-another-highlighting-issue
|
2018-05-04 14:30:38 -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 |
|
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 |
|
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 |
|
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 |
|
Stephen Birarda
|
8c6d83ad67
|
Merge pull request #13023 from SimonWalton-HiFi/connection-stats-dump
Add a utility function to dump ConnectionStats
|
2018-05-04 10:19:25 -07:00 |
|
Zach Fox
|
e48d39ec38
|
MS14758: Fix avatar reset when gifting worn avatar
|
2018-05-04 10:10:48 -07:00 |
|
samcake
|
dd4777bef3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-05-04 09:49:52 -07:00 |
|
Ken Cooke
|
b657c28a9b
|
Merge pull request #13099 from kencooke/glm-asan-warnings
Fix asan warnings
|
2018-05-04 09:24:51 -07:00 |
|
Dante Ruiz
|
d44882e6dc
|
fix entity highlighting during edit mode
|
2018-05-04 09:01:24 -07:00 |
|
Ken Cooke
|
73ce02ce75
|
Fix asan warnings in byte-unpacking functions
|
2018-05-04 07:56:44 -07:00 |
|
Sam Gateau
|
e1d063e908
|
Adding the scripts for Jet
|
2018-05-04 00:01:48 -07:00 |
|