SamGondelman
|
c522d1bc93
|
merge with master
|
2018-09-14 00:57:13 -07:00 |
|
Sam Gondelman
|
6730635931
|
Merge branch 'master' into scriptvec3
|
2018-08-27 10:43:52 -07:00 |
|
danteruiz
|
e4293d9ad5
|
fixing some entity visual problems
|
2018-08-26 21:50:01 -07:00 |
|
Dante Ruiz
|
92acaade2b
|
trying to fix problems
|
2018-08-24 17:13:57 -07:00 |
|
Dante Ruiz
|
af19849a75
|
fixing merge conflict
|
2018-08-24 15:48:42 -07:00 |
|
Dante Ruiz
|
3796675123
|
script update and visuallyReady entities
|
2018-08-24 15:46:39 -07:00 |
|
SamGondelman
|
283c0c0311
|
s i m p l i f y
|
2018-08-23 11:47:56 -07:00 |
|
SamGondelman
|
a0c3c09b05
|
Merge remote-tracking branch 'upstream/master' into bloom
|
2018-08-08 14:44:02 -07:00 |
|
SamGondelman
|
0dd8d2d3d4
|
working on enabling bloom
|
2018-08-07 18:18:58 -07:00 |
|
SamGondelman
|
16ad9cb5d3
|
xcolor/rgbcolor conversion
|
2018-07-11 18:06:06 -07:00 |
|
SamGondelman
|
9929529f30
|
vec3 conversion
|
2018-07-11 14:18:22 -07:00 |
|
SamGondelman
|
86ee5c12d8
|
merge and update based on sam's changes
|
2018-05-31 17:53:36 -07:00 |
|
SamGondelman
|
e6741a363e
|
add local-only isVisibleInSecondaryCamera flag to entities
|
2018-05-23 16:35:21 -07:00 |
|
SamGondelman
|
de4a2ca3b2
|
update procedural skybox on user data change
|
2018-05-10 18:44:53 -07:00 |
|
David Rowe
|
b461a422c6
|
Merge branch 'master' into 21709
|
2018-03-09 14:18:42 +13:00 |
|
NissimHadar
|
0f2cf8ea85
|
Re-implemented shadow controls.
|
2018-03-01 14:24:20 -08:00 |
|
SamGondelman
|
0fca56eef0
|
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21 , reversing
changes made to c0f20900a0 .
|
2018-02-27 11:33:05 -08:00 |
|
David Rowe
|
9e37230aa1
|
Miscellaneous code tidying
|
2018-02-19 12:21:56 +13:00 |
|
Nissim Hadar
|
34aab4a9c8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
# libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
|
2018-02-12 17:50:39 -08:00 |
|
NissimHadar
|
950a62f3f8
|
Global graphics flag default to on.
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
|
2018-02-08 15:52:20 -08:00 |
|
NissimHadar
|
d01f9cd1fb
|
Fixing git crap.
|
2018-02-06 23:51:08 -08:00 |
|
samcake
|
8dfa3aace3
|
cleaning en route
|
2018-01-26 17:34:37 -08:00 |
|
Sam Gateau
|
d4571bd86a
|
Merge pull request #12181 from humbletim/rename-model-graphics
Rename libraries/model -> libraries/graphics
|
2018-01-16 18:12:25 -08:00 |
|
humbletim
|
b91d536dd0
|
rename model:: -> graphics::
|
2018-01-16 12:46:16 -05:00 |
|
humbletim
|
08ccda9cfc
|
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
|
2018-01-16 12:44:44 -05:00 |
|
Nissim Hadar
|
daa6409936
|
Improved comments.
|
2018-01-15 17:33:48 -08:00 |
|
Nissim Hadar
|
9f25b01b10
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-10 09:30:05 -08:00 |
|
Nissim Hadar
|
b2b1807490
|
Changes per code review.
|
2018-01-08 15:37:06 -08:00 |
|
Nissim Hadar
|
46b494c802
|
Removed the Stage functionality - it is now implemented as a script.
|
2018-01-08 14:34:46 -08:00 |
|
Nissim Hadar
|
452c16e706
|
Removed backgroundPropertiesChanged
|
2018-01-08 12:11:36 -08:00 |
|
Nissim Hadar
|
8206ae6ffb
|
Removed BackgroundMode packet type.
|
2018-01-07 13:50:42 -08:00 |
|
Nissim Hadar
|
adbc4d0c39
|
Removed background mode from code (still in the protocol).
|
2018-01-04 18:23:25 -08:00 |
|
Nissim Hadar
|
8bd2985f1f
|
Simplified code.
|
2018-01-04 13:06:28 -08:00 |
|
Nissim Hadar
|
dad3a0d340
|
Fixed skybox inheritance.
|
2018-01-02 09:08:05 -08:00 |
|
Nissim Hadar
|
0764e80996
|
Corrected behaviour of skybox modes.
|
2017-12-30 18:19:42 -08:00 |
|
nissim.hadar
|
b56c7535d2
|
Added legacy functionality (for zones that used Background "skybox")
|
2017-12-30 12:25:58 -08:00 |
|
Nissim Hadar
|
7260b4ff7b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
# Conflicts:
# libraries/entities/src/EntityPropertyFlags.h
|
2017-12-29 15:16:14 -08:00 |
|
Nissim Hadar
|
87e896ab20
|
Zone inheritance ready for testing.
|
2017-12-29 15:13:46 -08:00 |
|
Nissim Hadar
|
85a81d6b5b
|
WIP - skybox inheritance
|
2017-12-28 18:23:49 -08:00 |
|
Nissim Hadar
|
64644fc980
|
WIP - skybox inheritance
|
2017-12-28 14:31:59 -08:00 |
|
Nissim Hadar
|
03cf7710d0
|
Ambient light inheritance
|
2017-12-28 09:34:55 -08:00 |
|
Nissim Hadar
|
4ffd896ced
|
WIP - adding AmbientLightPropertyGroup
|
2017-12-26 11:15:33 -08:00 |
|
Nissim Hadar
|
0b73e7db3f
|
WIP - adding AmbientLightPropertyGroup
|
2017-12-26 09:15:13 -08:00 |
|
Nissim Hadar
|
e102b8c087
|
Fixed Ubuntu warning.
|
2017-12-22 08:35:09 -08:00 |
|
Nissim Hadar
|
502cac2ac7
|
Keylight inherit/off/on working
|
2017-12-22 08:05:12 -08:00 |
|
Seth Alves
|
897b96d092
|
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
|
2017-12-22 07:36:26 -08:00 |
|
Nissim Hadar
|
e974cac177
|
Keylight inheritance mode works.
|
2017-12-21 19:19:55 -08:00 |
|
Nissim Hadar
|
58c6f8e9c4
|
Radio buttons now work correctly.
|
2017-12-20 19:17:18 -08:00 |
|
Olivier Prat
|
1d8d8335c5
|
Moved shadow cascade distances computation to shadow, not shadow task
|
2017-12-06 10:05:39 +01:00 |
|
Olivier Prat
|
0b6dcb2717
|
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
|
2017-12-05 09:18:26 +01:00 |
|