Commit graph

2990 commits

Author SHA1 Message Date
Julian Groß
8573425f68 Update library headers 2021-04-15 20:15:36 +02:00
Kalila
cd2d6847ee
Merge pull request #1148 from daleglass/remove-unusued-GizmoEntityRenderer-variable
Remove unused variable
2021-04-02 16:24:31 -04:00
Kalila
333e3d49c6
Merge pull request #1143 from daleglass/add-missing-override
Add missing override keywords.
2021-04-02 16:24:12 -04:00
Dale Glass
790d110596 Remove unused variable 2021-04-02 01:15:37 +02:00
Kalila
f5b91b17ea
Merge pull request #1124 from ctrlaltdavid/fix/avatar-parts-rotating
Fix avatar parts rotating
2021-04-01 19:11:52 -04:00
Dale Glass
6e9e11993c Add missing override keywords.
Fixes warnings like:

/libraries/entities-renderer/src/RenderableTextEntityItem.h:47:18: warning: ‘virtual bool render::entities::TextEntityRenderer::needsRenderUpdate() const’ can be marked override [-Wsuggest-override]
   47 |     virtual bool needsRenderUpdate() const;
      |                  ^~~~~~~~~~~~~~~~~
2021-04-02 00:04:46 +02:00
Kalila
4ae4886f36
Merge pull request #1132 from daleglass/fix_renderablemodelentityitem_crash
Capture by value rather than by reference in RenderableModelEntityItem
2021-04-01 17:32:00 -04:00
HifiExperiments
7d58c772cb
Merge branch 'master' into materials 2021-03-30 14:31:11 -07:00
Dale Glass
1759e360b1 Capture by value rather than by reference
This fixes a stack-use-after-return error in RenderableModelEntityItem.

Fixes #1128
2021-03-29 22:44:34 +02:00
David Rowe
12ceb0d93e Fix avatar parts rotating 2021-03-28 21:11:58 +13:00
Kalila
409cc5835c
Merge pull request #1050 from HifiExperiments/imageAspectFix
Image Entities: fix keepAspectRatio, implement naturalDimensions
2021-03-27 15:24:43 -04:00
HifiExperiments
6b82c7fe90
Update RenderableImageEntityItem.cpp 2021-03-22 18:37:29 -07:00
HifiExperiments
35e836d34d image caching must maintain original image information and pass it around 2021-03-19 22:32:29 -07:00
HifiExperiments
9a247172f3 non-parented material use the right cull mode 2021-03-09 21:09:48 -08:00
HifiExperiments
68c20ce73d text backgrounds have texcoord if not simple 2021-03-03 17:47:03 -08:00
HifiExperiments
ccda630a3a fixing _glColor4f 2021-03-02 21:44:06 -08:00
HifiExperiments
c47351c4f2 merge with master 2021-02-25 19:39:09 -08:00
HifiExperiments
826eb709ce more work on materials 2021-02-25 19:03:42 -08:00
HifiExperiments
186f505b15 images support materials 2021-02-24 20:56:14 -08:00
HifiExperiments
25e4f59d55 gizmos have materials, working on images 2021-02-23 20:54:57 -08:00
HifiExperiments
30cf1555e4 fix keepAspectRatio, give text entities naturalDimensions 2021-02-20 22:47:33 -08:00
Julian Groß
937e0a55db Merge remote-tracking branch 'refs/remotes/HifiExperiments/fixBillboard' 2021-02-20 12:12:59 +01:00
HifiExperiments
852edec9e7 entities with billboardMode != none use local rotation so parent rotation doesn't affect them 2021-02-18 22:15:12 -08:00
HifiExperiments
f46f1b2219 Merge branch 'master' into alignment 2021-02-11 18:07:23 -08:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
HifiExperiments
0645866549
Merge branch 'master' into billboard 2021-02-09 23:28:58 -08:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
HifiExperiments
ace6bf6c5b dirty physics on useOriginalPivot change, other small fix for compound shapes 2021-02-03 17:35:17 -08:00
HifiExperiments
bb898aac33 non-exact collisions should work on models with pivots and useOriginalPivot=true 2021-01-21 21:05:00 -08:00
Kalila L
82313eccbf Add userAgent property for web entities. 2021-01-21 01:51:37 -05:00
HifiExperiments
92ea14a059 proper render bounds for models (need to pass RenderArgs to getBound everywhere) 2021-01-17 22:08:06 -08:00
HifiExperiments
1f71a23082 optimize picking 2021-01-17 13:09:09 -08:00
HifiExperiments
2a27fc4de2 billboarding for model entities 2021-01-13 22:31:21 -08:00
HifiExperiments
bef0c79b67 billboard mode working on most entity types 2021-01-10 16:03:04 -08:00
HifiExperiments
6e0bad814e working on billboard mode for all entity types 2021-01-03 20:33:08 -08:00
HifiExperiments
5dc45e895c more fixes and create checkbox defaults to checked 2021-01-02 19:18:54 -08:00
HifiExperiments
a072010b02 Merge remote-tracking branch 'upstream/master' into pivot 2021-01-02 17:13:24 -08:00
HifiExperiments
20e0c24163 cleanup + create 2021-01-02 00:04:24 -08:00
HifiExperiments
002271a4cc finishing touches 2021-01-01 21:52:16 -08:00
HifiExperiments
0f9f95f716 possible fix for physics 2020-12-28 23:46:37 -08:00
HifiExperiments
f33c7de67a Merge remote-tracking branch 'upstream/master' into pivot 2020-12-18 17:33:24 -08:00
HifiExperiments
7069e48073 working on pivot 2020-12-16 21:01:56 -08:00
HifiExperiments
9a5b956968
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-11-27 15:11:18 -08:00
HifiExperiments
c510a8fa3e add comment about material sphere scale 2020-11-27 15:10:14 -08:00
HifiExperiments
2ece568f09 fixing up simple-compound logic 2020-11-27 15:04:56 -08:00
HifiExperiments
2e780c34d1 Merge remote-tracking branch 'upstream/master' into update 2020-11-24 16:34:30 -08:00
HifiExperiments
b6744588f4 loading fix 2020-11-16 21:25:25 -08:00
HifiExperiments
81940214bb
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"" 2020-11-16 21:20:25 -08:00
kasenvr
21f8eac936
Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine" 2020-11-16 22:35:46 -05:00