Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 09:03:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67470 commits 76 branches 59 tags 1.2 GiB
Commit graph

67470 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester 
Command line parameters for autotester
 2018-05-09 10:51:31 -07:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue 
Do not open help on first run
 2018-05-09 18:48:05 +02:00
NissimHadar
175fa9108e Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 15:52:15 -07:00
NissimHadar
7f9f9d769a Corrected bug causing Interface not to exit at end of test. 2018-05-08 15:51:52 -07:00
Stephen Birarda
a87b13c617
Merge pull request #13126 from birarda/67-to-master 
merge RC67 back to master
 2018-05-08 15:07:33 -07:00
Stephen Birarda
4165ab3667 Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master 2018-05-08 14:08:21 -07:00
Stephen Birarda
10b9546104
Merge pull request #13124 from birarda/66-2-to-67 
Merge 66.2 back to 67
 2018-05-08 14:03:07 -07:00
NissimHadar
d5bb582811 Per Austin's comments. 2018-05-08 11:40:56 -07:00
NissimHadar
516b2fa68c Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 11:13:26 -07:00
NissimHadar
eb14658bc5 Per Austin's comments. 2018-05-08 11:13:06 -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
Stephen Birarda
ae2c45bddd Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-08 10:23:14 -07:00
Zach Fox
c5ebc436ce Merge branch 'master' of github.com:highfidelity/hifi into MS14878_preventPasswordLeak 2018-05-08 09:40:53 -07:00
NissimHadar
0206de01f5 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 09:18:27 -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
John Conklin II
a6eed27bdd
Merge pull request #13123 from druiz17/RC67 
remove highlight on entity when point to the sky (RC67)
 2018-05-08 07:25:40 -07:00
Dante Ruiz
a593209ec1 remove highlight when point to the sky 2018-05-07 15:33:12 -07:00
Dante Ruiz
9d6019e78c Merge branch 'RC67' of github.com:highfidelity/hifi into RC67 2018-05-07 15:33:00 -07:00
Zach Fox
fd4530e671 MS3128: Remove vestigal Edit menu item 2018-05-07 14:39:31 -07:00
NissimHadar
8ad13826bd Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 13:11:39 -07:00
NissimHadar
2e51a66441 Use 'standard' format for command line parameter with multiple options. 2018-05-07 13:01:18 -07:00
NissimHadar
c3ef6aab1c Don't save test scripts 2018-05-07 12:51:41 -07:00
Zach Fox
646c0ec987 MS14878: Prevent wallet passphrase leak in specific case 2018-05-07 11:56:47 -07:00
John Conklin II
bec015db5c
Merge pull request #13116 from ElderOrb/FB14818 
Fix for 'Login page for steam is blank'
 2018-05-07 11:26:39 -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
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758 
RC67: MS14758: Fix avatar reset when gifting worn avatar
 2018-05-07 10:10:41 -07:00
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
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
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