samcake
b29f276db3
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-18 16:42:30 -07:00
Nissim
a641d6de66
Variable rename.
2017-10-17 09:18:29 -07:00
Sam Gateau
74b02a3e9b
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-16 20:58:11 -07:00
Nissim
0a5302ce25
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-10-16 11:01:13 -07:00
samcake
918e13b2fc
fixing the zone entity not rendering when created or when avatar appears in one
2017-10-13 15:03:23 -07:00
Nissim Hadar
afb8b2d8e7
Merge branch 'master' into hazeZone
2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211
Replace light blend with glare.
2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c
Changed blend-in colour and blend-out colour to colour and glare colour
2017-10-13 12:21:00 -07:00
Nissim Hadar
5bfbaf4860
Renamed HazeMode to ComponentMode.
2017-10-13 11:24:56 -07:00
samcake
8994200d01
Trying to integrate the tool scripts as an app
2017-10-12 17:57:30 -07: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
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -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
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
Atlante45
6dd49f5c32
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-10-10 16:53:34 -07:00
Nissim Hadar
c9be5ea100
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone
2017-10-09 18:01:48 -07:00
Nissim Hadar
71f567f15a
Merge branch 'master' into hazeZone
2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43
Refactoring.
2017-10-09 17:25:19 -07:00
SamGondelman
ee02fa9a91
model asks for renderUpdate if animating
...
(cherry picked from commit 873ae9b9d6
)
2017-10-09 13:55:48 -07:00
SamGondelman
873ae9b9d6
model asks for renderUpdate if animating
2017-10-09 13:36:38 -07:00
Bradley Austin Davis
c92588685b
Merge pull request #11533 from SamGondelman/modelMaster
...
Fix model loading for real this time
2017-10-08 10:23:13 -07:00
Nissim Hadar
e02876f1ea
Zone position/direction sent to haze uniform.
2017-10-06 17:24:20 -07:00
Nissim Hadar
320c888ce4
Added checkbox to allow separate control of keylight attenuation.
2017-10-05 20:31:45 -07:00
Nissim Hadar
3afab3c1d3
Keylight attenuation implemented.
2017-10-05 18:25:02 -07:00
Nissim Hadar
414cae8df7
Implemented haze colours.
2017-10-05 13:29:32 -07:00
SamGondelman
a6b7578c3c
start fixing asynch issue, fixes model loading!
2017-10-05 12:30:00 -07:00
Nissim Hadar
794cb961d5
Merge branch 'master' into hazeZone
2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8
WIP - implementing range+altitude mode.
2017-10-04 23:03:21 -07:00
Nissim Hadar
8b72e3044a
WIP - implementing range+altitude mode.
2017-10-04 22:26:53 -07:00
Nissim Hadar
6dcd8b7b57
Haze Range works.
2017-10-04 21:47:20 -07:00
SamGondelman
3a6e84e681
trying to fix model issue
2017-10-04 17:26:12 -07:00
SamGondelman
215193ad90
try to improve performance
...
(cherry picked from commit a5f5f9fc5d
)
2017-10-04 13:50:35 -07:00
SamGondelman
a5f5f9fc5d
try to improve performance
2017-10-04 12:05:13 -07:00
Nissim Hadar
2ce86ebfae
WIP - working on byte order in server messages.
2017-10-04 11:56:35 -07:00
Nissim Hadar
c1f4735468
Replaced HazeMode with uint8_t in transport protocol.
2017-10-03 19:39:34 -07:00
Nissim Hadar
48e5b9d1bc
Haze enable/disable from UI works.
2017-10-03 17:42:04 -07:00
Andrew Meadows
46e809bbb2
use a better variable name
2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851
expose performance hot spot in stats details
2017-10-03 12:35:02 -07:00
Nissim Hadar
1cf7f5a732
For testing.
2017-10-03 09:54:44 -07:00
Nissim Hadar
93a2776cb5
Changes for debug
2017-10-02 18:13:23 -07:00
Nissim Hadar
cdbf067a24
Rename (haze)getParametersBuffer to getHazeParametersBuffer.
...
Add corrections from Sam
2017-10-02 16:54:02 -07:00
Nissim Hadar
29d5e772d4
Removed "..Is.." from various methods.
2017-10-02 12:42:46 -07:00
Nissim Hadar
f26345a3f0
Working on adding zone to haze.
2017-09-29 15:15:49 -07:00
Nissim Hadar
0acf4b9de9
Working on adding zone to haze.
2017-09-28 23:53:53 -07:00
Nissim Hadar
9d0cf16c20
Fixed Ubuntu warnings.
2017-09-27 19:33:04 -07:00
Nissim Hadar
784f928433
After merge.
2017-09-27 18:46:55 -07:00
Nissim Hadar
4d8a1db895
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Nissim Hadar
55fafeacb1
Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!
2017-09-27 17:43:09 -07:00