Nissim Hadar
d0deaa631c
Trying to pretty-up.
2017-10-12 07:54:03 -07:00
Nissim Hadar
00609c9547
Name correction.
2017-10-12 07:37:44 -07:00
beholder
f31316b0aa
8210 Keyboard Input Field: Pressing Space should Clear Field
2017-10-12 15:03:32 +03:00
beholder
9c15af9fbe
raise highlight above button overlay to reduce flickering
2017-10-12 14:46:01 +03:00
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24
Added checkbox for altitude effect.
2017-10-11 22:10:58 -07:00
Nissim Hadar
3ec8faa1b9
Added checkbox for altitude effect of haze.
2017-10-11 20:47:39 -07:00
Nissim Hadar
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -07:00
Nissim Hadar
2f4ddd84f8
Renamed haze colours and moved checkbox for glare.
2017-10-11 19:32:09 -07:00
Nissim Hadar
748f97364b
Moved Bakground Blend to end of Haze fields.
2017-10-11 19:20:46 -07:00
Nissim Hadar
832f9fb6e3
Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.
2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e
Removed ...ALTITUDE_MODE from combo.
2017-10-11 18:58:59 -07:00
samcake
480047548d
exposing the Render interface to the overlay web3d
2017-10-11 18:04:29 -07:00
David Rowe
74899e4798
Preload PNG files also
2017-10-12 13:58:18 +13:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
Sam Gateau
7edb41b0ea
Merge pull request #11577 from samcake/orange
...
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 17:12:27 -07:00
Mohammed Nafees
52e29c07cc
Fix warning resulting in build error
2017-10-11 19:59:04 -04:00
Mohammed Nafees
19b00e1364
Add option to limit assets filesize in settings
2017-10-11 19:59:04 -04:00
Zach Fox
c3e66c9581
Fixes
2017-10-11 16:56:47 -07:00
Brad Hefta-Gaub
cd2a742974
Merge pull request #11576 from SamGondelman/pointerEvents
...
Remove unused HFMetaEvents
2017-10-11 16:10:43 -07:00
beholder
dcdf85b08e
workaround for https://bugreports.qt.io/browse/QTBUG-49297
2017-10-12 02:10:09 +03:00
druiz17
42cab19ab2
generialze window search
2017-10-11 16:04:35 -07:00
samcake
592a4de1e5
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 15:56:22 -07:00
samcake
9abe098436
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-11 15:48:40 -07:00
Sam Gateau
38b467a6bf
Merge pull request #11570 from jherico/overlays_blocking
...
Remove unnecessary blocking call
2017-10-11 15:40:53 -07:00
Zach Fox
5a3a3c4937
What is going on
2017-10-11 15:05:45 -07:00
SamGondelman
403b18977b
remove unused HFMetaEvents
2017-10-11 14:37:23 -07:00
Ryan Huffman
c6672fc4ac
Fix KTX requests thrashing if a mip level can't be assigned
...
When downloading a mip level and assigning it to the underlying
resource, we weren't checking to see if the assignment was successful.
If it was unsuccessful, we would queue up a request for the next mip
which would end up being a request for the same mip that was just
attempted. This change fixes this problem by checking to see if the
texture's available mip level is at least <= the assigned mip level.
2017-10-11 14:20:57 -07:00
Zach Fox
fa1bfe0d19
Maybe fixes?
2017-10-11 14:10:33 -07:00
Seth Alves
a4462056df
Merge pull request #11549 from sethalves/linux-clang-build
...
allow project to be built with clang on Linux
2017-10-11 13:28:45 -07:00
Zach Fox
d8b84e6875
Minor cleanup
2017-10-11 13:26:32 -07:00
Zach Fox
1aaf1a19cd
Quick fix for printing
2017-10-11 13:22:59 -07:00
David Rowe
f3b2ccf5f8
Preload asset files so that they're in disk cache ready for use
2017-10-12 09:09:57 +13:00
Zach Fox
9e570fdba3
First pass at encryption/decryption. Exciting!
2017-10-11 13:08:04 -07:00
Chris Collins
371df222d7
Merge pull request #11572 from highfidelity/RC-56.1-HOTFIX
...
Build 56.1 Hotfix texture referencing in fst files
2017-10-11 12:47:39 -07:00
Zach Fox
f05c709693
Remove static certificate verification for now
2017-10-11 12:06:11 -07:00
Zach Fox
1f8b68c952
Updates now that endpoint exists; add pending timer
2017-10-11 11:46:35 -07:00
druiz17
8f3fa08b1e
hud module intersects with stats window
2017-10-11 11:41:10 -07:00
Seth Alves
ca128a3251
merge from upstream
2017-10-11 11:09:33 -07:00
Zach Fox
f037eab26c
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-11 11:07:32 -07:00
Zach Fox
99109fe8e5
Merge pull request #11567 from zfox23/commerce_daveIntegration3
...
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Bradley Austin Davis
1e91c5cfce
Merge pull request #11561 from AndrewMeadows/improve-geometry-cache
...
more correct use of BufferView in GeometryCache
2017-10-11 11:03:53 -07:00
Brad Davis
69f869b339
Remove unecessary blocking call
2017-10-11 11:01:06 -07:00
Zach Fox
3f0ec73be6
Fix date displays
2017-10-11 10:55:14 -07:00
Ryan Huffman
6a90beb4aa
Fix .fst texdir not being followed
...
Although the texdir was being acknowledged and used as the
_textureBaseURL inside of the Geometry* classes, it was being
overwritten in code meant to handle redirects. Basically, when a
geometry resource request is redirected (via ATP, HTTP, etc.), we needed
to update the _textureBaseURL to take the new location into account.
Previously we were overwriting the _textureBaseURL all the time, even
when not being redirected, but this updates it to only be overwritten
when the request is redirected.
There is at least 1 known case that this does not handle: a .fst with
its `texdir` set, that points at an fbx that gets redirected.
2017-10-11 10:53:29 -07:00
utkarshgautamnyu
6e4a5da69d
Update JSBaker.h
2017-10-11 10:44:19 -07:00
utkarshgautamnyu
1d373c2988
Update JSBaker.cpp
2017-10-11 10:38:48 -07:00
John Conklin II
4394415058
Merge pull request #11565 from huffman/fix/fst-texdir
...
Fix .fst texdir not being followed
2017-10-11 10:24:37 -07:00
Zach Fox
c2733a4186
Fix notification bug
2017-10-11 09:47:16 -07:00
Brad Hefta-Gaub
b69c2a27ca
Merge pull request #11569 from Atlante45/new-master
...
Merge stable back into master
2017-10-11 09:33:55 -07:00
