Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 15:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64864 commits 25 branches 0 tags 1.1 GiB
Commit graph

3235 commits

Author SHA1 Message Date
Simon Walton
051d4c0d35 Merge branch 'master' into server-script 2018-02-27 09:57:58 -08:00
John Conklin II
abe7c29b5e
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly 
Export boolean entity properties properly
 2018-02-27 09:18:46 -08:00
Simon Walton
40f0e63af0 Merge branch 'master' into server-script 2018-02-26 16:39:03 -08:00
Simon Walton
e81fba22ed EntityServer should update a previously matched entity. 
EntityServer currently keeps a per-Node set of entities that matched
the JSON filter. This commit will send an update for an entity that
no longer matches then remove it from the set.
https://highfidelity.fogbugz.com/f/cases/11244/
 2018-02-26 13:43:35 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete 
Fix EntityItems not getting destroyed
 2018-02-23 16:17:52 -08:00
Thijs Wenker
a27a5a7e1f export boolean properties properly 2018-02-23 18:16:38 +01:00
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -08:00
SamGondelman
4b1217f1f6 move all entity items to main thread 2018-02-21 15:54:07 -08:00
Nissim Hadar
af484d0af6 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-20 23:48:12 -08:00
Zach Fox
2daa30f125 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-20 12:41:12 -08:00
ZappoMan
76d611d563 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-19 19:15:33 -08:00
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
Nissim Hadar
81c9e449e6 Models casting shadows (again). (Something stupid happened...) 2018-02-18 10:19:17 -08:00
Nissim Hadar
a69816f885 WIP. 2018-02-17 15:21:57 -08:00
Nissim Hadar
4c1f22f84e Models and Avatar cast shadows (box doesn't, yet). 2018-02-16 14:01:33 -08:00
SamGondelman
2d0b85af72 workaround bug 2018-02-15 17:28:59 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Nissim Hadar
72e89851f3 Added READ_ENTITY_PROPERTY_TO_PROPERTIES 2018-02-15 14:16:56 -08:00
Nissim Hadar
777862f253 can cast shadow flag now works correctly (UI/JS aspects). 2018-02-15 11:50:38 -08:00
Nissim Hadar
7e99570824 Fixed Ubuntu warnings. 2018-02-15 07:54:55 -08:00
Nissim Hadar
adb02d69f9 WIP -adding canCastShadow flag. 2018-02-14 21:45:56 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
Nissim Hadar
a92765a83a Adding can cast shadow property. 2018-02-14 12:01:30 -08:00
ZappoMan
e71811bef2 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-14 09:03:32 -08:00
Nissim Hadar
1632ab9782 Changed flag to "cast shadow" instead of "don't cast shadow". 2018-02-13 18:27:36 -08:00
Nissim Hadar
23a29b8d4b Added don't castr shadow flag to entity and shape classes. 2018-02-13 16:16:04 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-13 13:55:32 -08:00
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
Andrew Meadows
b111e82763
Merge pull request #12365 from AndrewMeadows/workload-001 
moving Job/Task framework out of 'render' library and into its own 'task' library
 2018-02-13 12:26:32 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images 
2d images (JPG and PNG) are now supported as (quasi) entities
 2018-02-13 11:44:02 -08:00
Andrew Meadows
38bc312004 faster and const EntityTree::findByID() 2018-02-13 11:25:34 -08:00
Zach Fox
95e9eb8e4a Lots of progress 2018-02-12 17:06:57 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -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
ZappoMan
71a8e96d5a fix several CR requests 2018-02-02 18:14:12 -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
ZappoMan
8a9153a461 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-02 16:08:05 -08:00
Andrew Meadows
a5e968867e
Merge pull request #12302 from druiz17/fix-another-bootstrapping 
Fix another bootstrapping and rename entityItem _dirtyFlags
 2018-02-02 15:14:38 -08:00
Elisa Lupin-Jimenez
9f8e2017ce can add image directly from asset server 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d390e20139 removed extraneous commenting and image class 2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
42151b8fd4 creating new image entity opens image property options 2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez
ceb621a521 reverted protocol change for images 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
576d683d3b initial changes to incorporate snap model 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
dc5f29aa58 entity item properties hooked up for image 2018-02-02 10:08:40 -08:00