Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow
...
Shadow performance / acnee improvements
2018-02-12 14:41:13 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
...
Misc bug fixes
2018-02-12 14:31:38 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests
...
Fix shared unit tests
2018-02-09 17:18:35 -08:00
Dante Ruiz
fccb4297f7
Merge pull request #12379 from samcake/pastel
...
fixing the scattering bad ambient lighting
2018-02-09 13:55:42 -08:00
David Back
7bcfd0cf8d
Merge pull request #12114 from dback2/polymaterials
...
Additional mtl spec support & fixes for Poly & more
2018-02-09 13:18:14 -08:00
John Conklin II
64c5b883b1
Merge pull request #12243 from RebeccaStankus/log-filtering
...
Some improvements to the log window
2018-02-09 12:50:49 -08:00
John Conklin II
02e9bd4fbc
Merge pull request #12348 from druiz17/fix-lasers-going-to-origin
...
Fix lasers going to origin when trying to far grab.
2018-02-09 11:48:00 -08:00
samcake
e64c029424
fixing the scattering bad ambient lighting
2018-02-09 11:32:29 -08:00
Bradley Austin Davis
7102cf44b8
Fixing merge errors
2018-02-09 10:30:57 -08:00
Bradley Austin Davis
dbc4b1533d
Fixing build warnings in minipromises
2018-02-09 10:12:32 -08:00
Sam Gateau
047d24fe5e
Merge pull request #12340 from jherico/fix/shader_length
...
Fix overlimit shader char strings
2018-02-09 09:31:15 -08:00
Seth Alves
5e16623c81
allow overlay children to follow avatar from one domain to another
2018-02-08 17:17:04 -08:00
Bradley Austin Davis
023ee35b2e
Merge remote-tracking branch 'upstream/master' into threaded_qml
2018-02-08 17:16:36 -08:00
David Back
f137fadc98
fix uint warnings
2018-02-08 16:56:13 -08:00
David Back
f929fa3bcb
filename space fix
2018-02-08 14:50:30 -08:00
David Back
6a23eea6ee
adjust shininess value
2018-02-08 14:15:47 -08:00
RebeccaStankus
14839bc5f4
Some improvements to the log window
...
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
2018-02-08 11:26:02 -08:00
David Back
880ef17c75
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-07 18:11:15 -08:00
David Back
784b265a86
better texture option parsing
2018-02-07 18:11:00 -08:00
Andrew Meadows
572edab79f
remove dupe const
2018-02-07 16:48:31 -08:00
Bradley Austin Davis
fcb59a4ee6
Fixing android
2018-02-07 11:06:30 -08:00
Andrew Meadows
57aef54237
pull master into AndrewMeadows/quickfix-tractor
2018-02-07 10:46:15 -08:00
David Back
d44ce78efc
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-07 10:10:05 -08:00
Bradley Austin Davis
ae092f6c0b
Merge remote-tracking branch 'upstream/master' into fix/shader_length
2018-02-07 09:48:23 -08:00
NissimHadar
d01f9cd1fb
Fixing git crap.
2018-02-06 23:51:08 -08:00
David Back
26a56f0173
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-06 16:12:30 -08:00
Bradley Austin Davis
0455fb37b6
Merge remote-tracking branch 'upstream/master' into fix/shader_length
2018-02-06 15:55:01 -08:00
Andrew Meadows
672520f3bf
quickfix for velocity spike for Tractor action
2018-02-06 12:06:27 -08:00
Brad Davis
7d5502eb92
Migrating QML rendering off the main thread
2018-02-06 11:53:09 -08:00
John Conklin II
0e3bcda859
Merge pull request #12336 from sethalves/bump-av-protocol-more
...
try harder to bump avatar-mixer protocol version
2018-02-06 09:12:03 -08:00
Seth Alves
d8ad3192fe
Merge pull request #12332 from sethalves/fix-tractor-action-initial-crazy
...
Fix tractor action initial crazy
2018-02-06 08:59:25 -08:00
Seth Alves
213dd61502
Merge pull request #12341 from sethalves/fix-polyvox-visible
...
make polyvox entities visible again
2018-02-06 08:59:01 -08:00
Olivier Prat
179aca2bf9
Shadow task now uses LOD culling from main view task
2018-02-06 11:47:39 +01:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
...
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Seth Alves
33ca1fd344
make polyvox entities visible again
2018-02-05 14:58:34 -08:00
Bradley Austin Davis
b658d4add2
Merge pull request #12338 from vladest/fix_build_gcc7
...
Add include with std::function
2018-02-05 13:34:48 -08:00
vladest
0715a7cae5
Add include with std::function
2018-02-05 21:02:44 +01:00
Seth Alves
14d8259a5e
try harder to bump avatar-mixer protocol version
2018-02-05 11:54:48 -08:00
Stephen Birarda
52e63db70b
Merge pull request #12249 from birarda/bug/god-voice
...
refuse to handle positional audio streams with NaN position
2018-02-05 12:50:56 -07:00
Stephen Birarda
761321875c
Merge pull request #12195 from birarda/bug/connection-refused
...
clear silent connection attempt counter on DomainHandler soft reset
2018-02-05 11:35:02 -07:00
Anthony Thibault
819af96fcc
Merge pull request #12331 from ctrlaltdavid/21732
...
Fix scaling of avatar submeshes attached to joints
2018-02-05 10:19:18 -08:00
Olivier Prat
92279b5939
Merged with master
2018-02-05 18:24:05 +01:00
Olivier Prat
445ffbd82f
Added tag bits to shadow octree query
2018-02-05 16:35:55 +01:00
Olivier Prat
2940a67b3e
Merged with master
2018-02-03 16:55:25 +01:00
Seth Alves
639f7a52d8
remove unneeded/repeated line
2018-02-02 18:24:38 -08:00
Seth Alves
a6978a6dec
Merge branch 'make-your-branch' of github.com:AndrewMeadows/hifi into fix-tractor-action-initial-crazy
2018-02-02 18:15:59 -08:00
David Rowe
9818674549
Fix scaling of avatar submeshes attached to joints
2018-02-03 15:06:47 +13:00
Andrew Meadows
83ab994181
avoid initial bad measure of tractor target's velocity
2018-02-02 16:42:51 -08:00
John Conklin II
c8bb26ae74
Merge pull request #12294 from samcake/pastel
...
Improve startup time by optimizing shader bookkeeping
2018-02-02 16:37:44 -08:00
