Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-28 17:30:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70990 commits 25 branches 0 tags 1.1 GiB
Commit graph

532 commits

Author SHA1 Message Date
Dante Ruiz
92acaade2b trying to fix problems 2018-08-24 17:13:57 -07:00
Dante Ruiz
3796675123 script update and visuallyReady entities 2018-08-24 15:46:39 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Andrew Meadows
207aea8712 remove cruft from rendering collision shapes 2018-07-16 10:29:34 -07:00
SamGondelman
ca5ce888f4 parabola triangle intersection 2018-07-09 18:11:57 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
Anthony J. Thibault
328a485ad1 Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed. 2018-06-25 10:38:53 -07:00
SamGondelman
0b79e9f6c7 whoops 2018-06-15 15:13:29 -07:00
Sam Gondelman
225a98129a
Merge branch 'master' into modelTextures 2018-06-15 15:09:32 -07:00
sabrina-shanman
b2ec7f78c1 Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer 2018-06-14 15:49:40 -07:00
SamGondelman
5ac7ced306 cleanup renderable model entity item, fix crash on reload, fix different transparent bug 2018-06-13 17:14:52 -07:00
sabrina-shanman
4c39d08358 Remove "Draw Collision Shapes" option from developer physics menu 2018-06-11 11:03:57 -07:00
sabrina-shanman
440c77905a Remove functionality for rendering collision meshes directly in the Model class 2018-06-11 11:03:57 -07:00
SamGondelman
86ee5c12d8 merge and update based on sam's changes 2018-05-31 17:53:36 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
SamGondelman
e6741a363e add local-only isVisibleInSecondaryCamera flag to entities 2018-05-23 16:35:21 -07:00
Andrew Meadows
2750f3ee71 remove unused cruft and avoid useless work 2018-03-09 08:35:18 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
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
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -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
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08: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
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
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
samcake
1d3ae1b187 Work in progress to get the render items beeing tagged correctly for groupCulled 2018-02-13 17:50:01 -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