Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-09 08:19:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76088 commits 22 branches 28 tags 1.2 GiB
Commit graph

572 commits

Author SHA1 Message Date
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
John Conklin II
78f0a3feaa
Merge pull request #14739 from SamGondelman/animations 
Case 20398: Fix animation URL change
 2019-02-08 14:40:24 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
SamGondelman
618146e885 fix animation url change 2019-01-18 15:36:10 -08:00
SamGondelman
292071febb fix model groupCulled 2019-01-08 14:34:19 -08:00
SamGondelman
10068cc42c merge with master 2019-01-08 12:14:32 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
SamGondelman
b609cfaa2b renderLayer 2019-01-07 15:43:35 -08:00
Andrew Meadows
13a3982b5a fix ZoneEntityItem::contains() for model shapes 2019-01-04 12:38:32 -08:00
Andrew Meadows
1fabaf0db4 rename getCollisionGeometryResource to fetchCollisionGeometryResource 2019-01-04 12:37:23 -08:00
Andrew Meadows
0072684d98 remove cruft and fix error in transform to mesh frame 2019-01-04 12:37:23 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
SamGondelman
fd8245e258 Merge remote-tracking branch 'upstream/master' into NOverlays6 2018-12-11 10:46:39 -08:00
Shannon Romano
bb9a764855
Merge pull request #14517 from luiscuenca/getEntityJointParent 
Add method to check entities joint hierarchy
 2018-12-11 01:06:38 +00:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
luiscuenca
ad42f6a590 Add method to check entities joint hierarchy 2018-12-01 12:32:29 -07:00
sabrina-shanman
83cc90ace0 Re-name GLTFReader to GLTFSerializer and do the same for other model readers 2018-11-12 16:12:20 -08:00
Brad Davis
8c4237b520 Fix warnings 2018-11-08 12:27:56 -08:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
Andrew Meadows
3b1b64b057 fix logic in readyToAnimate() 2018-10-17 11:45:39 -07:00
Andrew Meadows
da0d70af3f don't use string comparison when polling for changed animation URL 2018-10-17 11:45:39 -07:00
Andrew Meadows
0c61779331 remove deprecated cruft; stub setAnimationURL() override 2018-10-17 11:45:39 -07:00
Andrew Meadows
148944814b consolidate two bad string checks into one 2018-10-17 11:45:39 -07:00
John Conklin II
eb088772d0
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls 
Fix "Good" collision not honoring mesh groups in OBJ files
 2018-10-17 11:12:21 -07:00
sabrina-shanman
57f67ffe91 Do not have additional compoundMeshes variable in computeShapeInfo 2018-10-08 11:46:46 -07:00
sabrina-shanman
e15a41c839 Fix model being loaded before dimensions are initialized 2018-10-08 09:26:35 -07:00
sabrina-shanman
c8cccc5ec7 Fix "good" collision not subdividing OBJ meshes by group 2018-10-08 09:24:33 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
John Conklin II
658c74a1c6
Merge pull request #14080 from huffman/fix/111-models-not-being-resized 
Fix models with 1^3 dimensions never being resized
 2018-10-02 14:11:45 -07:00
Dante Ruiz
652ec2210d fixing loading issues 2018-10-01 13:58:14 -07:00
Ryan Huffman
af897bdef2 Fix models with 1^3 dimensions never being resized 2018-09-25 09:13:59 -07:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02:00
Sam Gondelman
42ded53b5f
Merge branch 'master' into modelBugs 2018-09-12 14:35:46 -07:00
SamGondelman
3daaa0ce81 empty urls are invalid 2018-09-10 11:45:40 -07:00
SamGondelman
a4605289a2 animation on switch url 2018-09-10 10:03:05 -07:00
danteruiz
e2cd695dfb PR code clean up 2018-08-27 11:01:29 -07:00
danteruiz
e4293d9ad5 fixing some entity visual problems 2018-08-26 21:50:01 -07:00
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