Commit graph

134 commits

Author SHA1 Message Date
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
SamGondelman
ea50133146 working on adding particle shape types 2019-03-18 12:05:17 -07:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero)
Also tweaks from original reviewer comments.
2019-03-01 17:25:46 -08:00
Simon Walton
16bc667b95 Looks like serialization order must be same a flag enum order!?
Also resuscitate EntityItem debug dumps.
2019-02-22 18:17:30 -08:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities
RC-79 version
2019-02-19 17:38:37 -08:00
SamGondelman
d17e04967a fix zone bugs 2019-01-18 13:49:16 -08:00
Andrew Meadows
13a3982b5a fix ZoneEntityItem::contains() for model shapes 2019-01-04 12:38:32 -08:00
Andrew Meadows
a642af23b7 enable shapeType=ellipsoid and expose zone shapeType to UI 2019-01-04 12:37:23 -08:00
Andrew Meadows
a8325b5c00 add ZoneEntityItem::contains() and support for shapes 2019-01-04 12:37:23 -08:00
SamGondelman
5dd00bed1d new improved polylines 2018-12-14 14:15:56 -08:00
SamGondelman
1fd8a21f8e cleanup 2018-12-03 11:07:54 -08:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02: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
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Clement
2e8a6e1961 Remove more dead octree code 2018-04-17 18:21:51 -07:00
Andrew Meadows
2750f3ee71 remove unused cruft and avoid useless work 2018-03-09 08:35:18 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05: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
0a21e5de04 Removed _backgroundPropertiesChanged 2018-01-08 12:07:21 -08:00
Nissim Hadar
93fffb4bbe Removed PROP_BACKGROUND_MODE. 2018-01-07 14:21:22 -08:00
nissim.hadar
33cc17a52f Removing unused Background mode. 2018-01-06 02:27:49 -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
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
64644fc980 WIP - skybox inheritance 2017-12-28 14:31:59 -08:00
Nissim Hadar
4ffd896ced WIP - adding AmbientLightPropertyGroup 2017-12-26 11:15:33 -08:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
Nissim Hadar
58c6f8e9c4 Radio buttons now work correctly. 2017-12-20 19:17:18 -08:00
Nissim Hadar
d4b34b71ad First version with packet update. 2017-12-20 13:12:07 -08:00
Seth Alves
b590cd5b89 avatar-entities which are children of an avatar will scale with the avatar 2017-12-02 09:31:43 -08:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
Nissim Hadar
a5a135c2ba Fixes for 8672-8674. 2017-10-27 15:39:14 -07:00
Nissim
5d0deaf946 Code review fixes. 2017-10-20 14:27:27 -07:00
Nissim
00c99d3d02 Corrected wrong else format. 2017-10-20 13:53:53 -07:00
Nissim
b0ca1353e4 Implemented Haze mode default. 2017-10-20 13:32:27 -07:00
Nissim
d01ecb71df Fixed gcc warning. 2017-10-19 14:41:02 -07:00
Nissim
9af87d46f2 Removed optimize pragma. 2017-10-19 13:51:33 -07:00
Nissim
edd256c600 Fixed crash on invalid HazeMode. 2017-10-19 13:36:32 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -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