Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 13:36:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
67470 commits 75 branches 59 tags 1.2 GiB
Commit graph

67470 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Dante Ruiz
a57c72df6e fix entity highlighting during edit mode 2018-05-04 08:53:49 -07:00
Ken Cooke
73ce02ce75 Fix asan warnings in byte-unpacking functions 2018-05-04 07:56:44 -07:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e Update avatar query names 2018-05-03 18:19:30 -07:00
Clement
d7e9fdc6a4 Bump Avatar Query packet version 2018-05-03 18:19:29 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
3283c5eaec Fix inverted comparaison 2018-05-03 18:19:29 -07:00
Clement
b4ea32bbb6 Correctly compute conical frustum for irregular ones 2018-05-03 18:19:29 -07:00
Clement
67c119cd2e Send Entity Query via conical frustums 2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2 Rename ViewFrustum packets to AvatarQuery 2018-05-03 18:19:29 -07:00
Clement
d774dc2060 WIP Only use conical frustums on the server 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av 
Add support for multifrustum avatar queries
 2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam 
Add support for multifrustum entity queries
 2018-05-03 18:13:51 -07:00
Stephen Birarda
79576e0f48 update request and dependency hoek for CVE 2018-05-03 17:16:35 -07:00
Clement
7fe16f82fb Move variables to Agent.cpp 2018-05-03 17:08:17 -07:00
NissimHadar
1f691edf0d Removed platform code (was used for MD files). 2018-05-03 17:04:17 -07:00
NissimHadar
da621d99d3 Removed unneeded pragma. 2018-05-03 16:52:03 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix 
Keep CrashpadClient around for application lifetime
 2018-05-03 16:48:29 -07:00
Stephen Birarda
e9c3fb914f
Merge pull request #13084 from Atlante45/fix/wizard-wording 
Fix wizard wording
 2018-05-03 16:47:16 -07:00
NissimHadar
e07039266d Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 16:44:57 -07:00
NissimHadar
887b8285cd Removed unneeded pragma. 2018-05-03 16:44:04 -07:00
John Conklin II
ef997e647a
Merge pull request #13088 from samcake/rc67 
RC67: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
 2018-05-03 16:21:14 -07:00
John Conklin II
182e7c4b5f
Merge pull request #13086 from samcake/rc66.2 
RC 66.2: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
 2018-05-03 15:48:41 -07:00