Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 03:50:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64613 commits 76 branches 59 tags 1.2 GiB
Commit graph

25 commits

Author SHA1 Message Date
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Nissim Hadar
7e99570824 Fixed Ubuntu warnings. 2018-02-15 07:54:55 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08: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
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -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
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
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Olivier Prat
5e6300ce46 Merged with master 2018-01-30 09:52:30 +01:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Brad Davis
08df262474 Fix haze parameters uniform buffer size 2018-01-27 11:42:17 -08:00
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Olivier Prat
e6caa83d73 Merged with master 2018-01-17 16:35:31 +01:00
Olivier Prat
efa6a8c0b5 Merged with master 2018-01-17 15:49:46 +01:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -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