Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 07:49:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84395 commits 76 branches 59 tags 1.2 GiB
Commit graph

646 commits

Author SHA1 Message Date
Andrew Meadows
9a6b42ec28 move getCollisionShapeURL() back to base class 2019-07-09 15:51:56 -07:00
Andrew Meadows
520c62f6f6 wait for objects added to physics before stop SafeLanding 2019-07-09 15:51:56 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
Seth Alves
e7b852ca38 don't try to create collision shape before compound shape resource is finished loading 2019-06-17 13:18:03 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh 2019-06-04 09:56:25 -07:00
Andrew Meadows
bfe809f3f7 local entities should not be in physics 2019-05-29 20:19:12 -07:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh 2019-05-23 09:35:14 -07:00
Andrew Meadows
045b0f7cf8 check for unloaded model 2019-05-21 07:49:21 -07:00
SamGondelman
de90c5088c (✿◠‿◠) 2019-05-16 19:33:07 -07:00
Sabrina Shanman
fbe947c8ac
Merge pull request #15558 from AndrewMeadows/fix-crash-bugz178 
BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model
 2019-05-14 13:07:40 -07:00
Andrew Meadows
5a257eb137 avoid crash for RenderableModelEntityItem with invalid model 2019-05-14 09:48:06 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch 
Case 22379: Run-time switch for deferred/forward rendering
 2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
Andrew Meadows
7dfa8a26a3 cleanup EntityItem::shouldBePhysical() and derivations 2019-05-06 17:35:57 -07:00
SamGondelman
0bcd8b81e1 trying and failing to fix models 2019-05-01 12:01:49 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Sabrina Shanman
2fd2d2cc5d
Merge pull request #15154 from SamGondelman/parentCollider 
Case 8064: Child of animated model brings collider with it
 2019-03-21 11:26:50 -07:00
SamGondelman
ea50133146 working on adding particle shape types 2019-03-18 12:05:17 -07:00
SamGondelman
97b01bad70 tellPhysics to children when animating model 2019-03-11 12:23:26 -07:00
danteruiz
4371723145 fix soft entity popping 2019-03-11 11:27:12 -07:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
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
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