Commit graph

25153 commits

Author SHA1 Message Date
Olivier Prat
e4818f1b4f Merged request changes from shadow 2017-11-15 17:51:06 +01:00
Olivier Prat
14275b1cf3 Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded 2017-11-15 15:42:04 +01:00
Olivier Prat
f47a3e7d2c Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake 2017-11-15 09:42:57 +01:00
Olivier Prat
bf46ccefaf Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-15 08:59:36 +01:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -08:00
David Back
4b8021bc4a
Merge pull request #11802 from dback2/mirrorfanciness2
prevent rendering HUD elements in secondary camera
2017-11-14 10:49:18 -08:00
Olivier Prat
010104d42a Switched off noise and switched back to screen space dither 2017-11-14 10:11:39 +01:00
Seth Alves
9df11fb11a
Merge pull request #11787 from elisa-lj11/musvis
Second fix to null file path return (specific to music visualizer)
2017-11-13 09:44:47 -08:00
Sam Gateau
4b14a7a820
Merge pull request #11799 from NissimHadar/hazeUIFix
Removed Keylight attenuation from .js (as well as .html).
2017-11-13 09:18:29 -08:00
Olivier Prat
dd6b7b04c2 Merged with master 2017-11-13 14:33:59 +01:00
Olivier Prat
fa58cf2e60 Merged with master 2017-11-13 14:07:48 +01:00
Olivier Prat
6611b28e2d Switched to world space dithering for more visual stability 2017-11-13 13:54:51 +01:00
Olivier Prat
dd0eaafc0d Screen space dithering for PCF with some noise added 2017-11-13 12:33:46 +01:00
Ryan Downe Karpf
9ff4541ee3
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
Remove hack for missing inttypes.h header on VS2010
2017-11-12 10:59:19 -08:00
Nissim Hadar
f629357ded Removed Keylight attenuation from .js (as well as .html). 2017-11-11 18:58:12 -08:00
David Back
163de649bf prevent rendering HUD elements in secondary camera 2017-11-10 17:44:09 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline
Multiple Outline Groups
2017-11-10 15:45:03 -08:00
Andrew Meadows
469b68011c
Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero
div by zero fixes, detected by address sanitizer
2017-11-10 13:47:40 -08:00
Anthony Thibault
08c12a1ced
Merge pull request #11704 from AndrewMeadows/shape-manager-key
cleanup ShapeInfo hash generation
2017-11-10 11:31:46 -08:00
Anthony J. Thibault
ba4c0f189e code review feedback
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -08:00
beholder
5fcde1186a hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard 2017-11-10 21:20:00 +03:00
beholder
db3ed81513 adjust to changed requirements:
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf 4684 Add collapse button on the virtual keyboard 2017-11-10 21:20:00 +03:00
Anthony J. Thibault
4169e11e77 Merge branch 'master' into bug-fix/div-by-zero 2017-11-10 10:15:26 -08:00
Olivier Prat
cbd2877524 Optimized shadow shader evaluation by computing concatenated shadow reprojection matrix on CPU 2017-11-10 11:26:20 +01:00
Olivier Prat
6cd4da877e Fixed dithered PCF filter in shadow 2017-11-10 11:11:04 +01:00
Olivier Prat
cf5a7531df Fixed dithered PCF filter in shadow 2017-11-10 11:10:31 +01:00
Olivier Prat
8b6a2eeb24 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-10 10:19:32 +01:00
Anthony Thibault
de9eeff7d2
Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer
Fix for address sanitizer warning
2017-11-09 14:19:03 -08:00
Elisa Lupin-Jimenez
119c662899 fixed null file path in file dialog call 2017-11-09 11:46:19 -08:00
Anthony J. Thibault
9724a5e5b8 Fix for address sanitizer warning
This fixes a potential null pointer dereference.
2017-11-09 10:53:36 -08:00
Anthony J. Thibault
5507bcea3c Remove hack for missing inttypes.h header on VS2010 2017-11-09 10:34:01 -08:00
Olivier Prat
4f7ed38e98 Fixed potential link errors on Mac 2017-11-09 11:26:08 +01:00
Brad Hefta-Gaub
d608d6ebf4
Merge pull request #11763 from Atlante45/new-master
Merge stable back into master
2017-11-08 15:10:06 -08:00
Seth Alves
34500fdf18
Merge pull request #11773 from vladest/fix_avatar_new_attachment
Remove checking of empty model url and add sanity for checking modelU…
2017-11-08 14:15:17 -08:00
vladest
6685b74c2a Remove checking of empty model url and add sanity for checking modelUrl field existing 2017-11-08 21:23:50 +01:00
samcake
af1180255e fixes from code review 2017-11-08 11:45:40 -08:00
samcake
75ce61c3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-08 11:30:53 -08:00
Olivier Prat
bbcb0b2d9b Fixed highlight in stereo mode, including HMD (testing on simulator) 2017-11-08 13:49:18 +01:00
Olivier Prat
f996435ac8 Merge branch 'master' of git://github.com/highfidelity/hifi into highlight 2017-11-08 11:41:21 +01:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix
Haze mask fix
2017-11-07 17:37:24 -08:00
samcake
0718763ed1 Adjust syntax 2017-11-07 17:31:15 -08:00
Atlante45
8a903c8b12 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-11-07 14:26:25 -08:00
samcake
6481e0f713 Address cauterized cluster matrices issue 2017-11-07 12:52:23 -08:00
samcake
5ca3113709 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-07 10:42:28 -08:00
Clément Brisset
85efe5265d
Merge pull request #11724 from ctrlaltdavid/21580
Fix serverScripts not being able to see entities in parent/child tree
2017-11-07 10:36:20 -08:00
Seth Alves
7c6b5081d6
Merge pull request #11725 from luiscuenca/case8270
8270 Changing avatars while sitting - restore animations
2017-11-07 09:55:06 -08:00
Olivier Prat
0bbd1edc0a Fixed fluttering highlight bug by attaching only stencil when drawing outline 2017-11-07 18:26:15 +01:00
Olivier Prat
ffa46b487a Only non empty selections are now linked to highlight passes 2017-11-07 17:07:37 +01:00
Olivier Prat
9817cb4c44 Added highlight configuration in HighlightStageSetup job 2017-11-07 15:35:43 +01:00