Commit graph

15 commits

Author SHA1 Message Date
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
Atlante45
16340c0fee LightEntity debug render in batch 2015-05-17 12:31:14 +02:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
Ryan Huffman
5c9473cd24 Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties
Conflicts:
	libraries/entities-renderer/src/RenderableLightEntityItem.cpp
2015-02-27 12:20:10 -08:00
Ryan Huffman
fdc1146339 Update RenderableLightEntityItem to use update light entity 2015-02-27 12:14:50 -08:00
Andrew Meadows
7836bb4dcd rayIntersection uses meters instead of tree units 2015-02-26 17:42:17 -08:00
Ryan Huffman
d60618a582 Remove unused variables from RenderableLightEntityItem::render 2015-02-26 14:58:06 -08:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Andrew Meadows
8d4ea143ce easy conversions of: InDomainUnits --> InMeters 2015-02-25 14:48:06 -08:00
Andrew Meadows
2ffb19a0ed getPosition() --> getPositionInDomainUnits()
and friends
2015-02-25 14:35:04 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/avatar/Hand.cpp
2015-01-30 12:02:11 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
ZappoMan
9f9b8bcb68 move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
Renamed from interface/src/entities/RenderableLightEntityItem.cpp (Browse further)