Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 21:00:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67732 commits 25 branches 28 tags 1.2 GiB
Commit graph

67732 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
30c5fa6fa1 fix divide-by-zero asan warning in LODManager::autoAdjustLOD 2018-05-05 20:45:06 -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
David Rowe
5021778dc0 Merge branch 'master' into 21866 2018-05-05 12:17:18 +12:00
David Rowe
5e6b83a634 Lint 2018-05-05 12:14:51 +12:00
David Rowe
3c2bee757a Remove calls to function that's been removed 2018-05-05 12:14:40 +12:00
David Rowe
1be948ee28 Scroll element into view if it's been moved off the screen 2018-05-05 12:03:18 +12: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
Cristian Luis Duarte
03ca427234 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 20:18:15 -03: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
Cristian Luis Duarte
de00f680fa Android - Search - Domains local file not needed anymore 2018-05-04 18:51:02 -03:00
Cristian Luis Duarte
a363041482 Material precision on GL ES fix not needed anymore 2018-05-04 18:46:46 -03:00
Seth Alves
cc4d04aaef experimenting 2018-05-04 14:45:57 -07:00
Cristian Luis Duarte
8c96d2be3c Patch for secondary camera assert error on Android 2018-05-04 18:44:07 -03: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
Cristian Luis Duarte
9f5365a277 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 18:38:08 -03:00
Cristian Luis Duarte
d4a6e845cd Android - Search - Code style fixes 2018-05-04 18:37:22 -03: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