Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 10:40:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64946 commits 25 branches 0 tags 1.1 GiB
Commit graph

2258 commits

Author SHA1 Message Date
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
Anthony J. Thibault
f5fcaae283 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-26 10:55:44 -08:00
humbletim
f824edd04e * remove Model_temporary_hack 
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
 2018-02-26 04:58:22 -05:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
Anthony J. Thibault
0469eafbe4 Switch between dualQuats and matrix skinning based on model entity scale factor. 2018-02-22 18:35:16 -08:00
humbletim
ec4f9fdc11 fix displayName 2018-02-22 08:31:05 -05:00
humbletim
4fd3d9bf7b cleanup; formalize data structures 2018-02-22 08:18:38 -05:00
humbletim
e4a2a589a5 CR fedback and cleanup 2018-02-22 07:56:09 -05:00
humbletim
72fca7e57e Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge 2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f CR fedback and cleanup 2018-02-22 05:15:01 -05:00
Nissim Hadar
bf4ba07b72 Added parameters to canCastShadow - still sucks. 2018-02-21 12:36:34 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05: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
9921217807 Shapes casting shadows OK. 2018-02-19 12:32:11 -08:00
Nissim Hadar
6a9bbaf0a5 WIP - clean-up. 2018-02-19 12:00:30 -08:00
Nissim Hadar
dc3b03c9bc Added shadows to shapes - still sucks... 2018-02-16 18:37:47 -08:00
Nissim Hadar
4c1f22f84e Models and Avatar cast shadows (box doesn't, yet). 2018-02-16 14:01:33 -08:00
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
humbletim
145a0df082 interim checkin 2018-02-15 14:14:07 -05:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -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
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue 
Introducing group culling to avoid the avatar model to be partially culled
 2018-02-14 15:38:52 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints 
fix -- get children of animated entity joints to follow along, again
 2018-02-14 11:12:45 -08:00
samcake
1d3ae1b187 Work in progress to get the render items beeing tagged correctly for groupCulled 2018-02-13 17:50:01 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -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
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
SamGondelman
ad40961864 fix tangents (I think), update material rendering when transform changes 2018-02-12 13:46:27 -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
Bradley Austin Davis
023ee35b2e Merge remote-tracking branch 'upstream/master' into threaded_qml 2018-02-08 17:16:36 -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
Seth Alves
31c2b8fea9 oops 2018-02-07 16:31:38 -08:00
Seth Alves
b6ac348428 get children of animated entity joints to follow along, again 2018-02-07 16:30:07 -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
Bradley Austin Davis
0455fb37b6 Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Seth Alves
213dd61502
Merge pull request #12341 from sethalves/fix-polyvox-visible 
make polyvox entities visible again
 2018-02-06 08:59:01 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Seth Alves
33ca1fd344 make polyvox entities visible again 2018-02-05 14:58:34 -08:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01: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