Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 21:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
79418 commits 69 branches 56 tags 1.2 GiB
Commit graph

2781 commits

Author SHA1 Message Date
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
SamGondelman
c605c2917f trying to fix entity tree renderer performance 2019-06-24 14:32:56 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
SamGondelman
8409119ad0 possible fix for black shape issue 2019-06-21 12:58:49 -07:00
Andrew Meadows
1ea0dba083 use weak_ptr for fade-out-finished lambda 2019-06-20 09:29:48 -07:00
Andrew Meadows
87d7a0a72f recover the Good Parts from first attempt to fix bugz-512 2019-06-20 09:29:48 -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
Andrew Meadows
db3c7b9194 rollback fixes for bugz512 2019-06-13 13:57:18 -07:00
Andrew Meadows
b08bb93ff7 add comment about why WebEntityRenderer::onRemoveFromSceneTyped() 2019-06-13 10:53:55 -07:00
Andrew Meadows
eee52deefe destroy WebSurfaces on shutdown 2019-06-12 16:07:15 -07:00
Shannon Romano
1982424ee9
Merge pull request #15719 from SamGondelman/crash 
BUGZ-545: Possible fix for Mac PolyLine-related crash
 2019-06-10 12:56:31 -07:00
SamGondelman
23f8778feb possible fix for mac crash? 2019-06-10 11:10:29 -07:00
SamGondelman
37feb7f027 merge with master 2019-06-10 10:29:39 -07:00
SamGondelman
129d96a997 get rid of lightmapMap 2019-06-07 14:53:31 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-559) Improve transition debugging and transition clean-up
 2019-06-06 16:35:04 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
Seth Alves
7ee64258ec fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
766a5c7f81 avoid div by zero 2019-06-04 13:00:26 -07:00
Seth Alves
8a9f3b9508 fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
50e99cc1fd fix uninitialized read 2019-06-04 13:00:26 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh 2019-06-04 09:56:25 -07:00
SamGondelman
3f42d083f5 fix some transparency issues on amd 2019-06-03 16:14:09 -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
Sam Gondelman
a7842fe3ea
Merge branch 'master' into proceduralMesh 2019-05-21 09:51:33 -07:00
Andrew Meadows
045b0f7cf8 check for unloaded model 2019-05-21 07:49:21 -07:00
sabrina-shanman
03a8e77ade Move RenderItemStatusIcon to Item.h 2019-05-20 12:07:41 -07:00
sabrina-shanman
5aff4d9f69 Update comment on render item status 2019-05-20 11:58:55 -07:00
SamGondelman
6d3e23a7fe merge with master 2019-05-16 20:03:10 -07:00
SamGondelman
de90c5088c (✿◠‿◠) 2019-05-16 19:33:07 -07:00
SamGondelman
283cc18269 Merge remote-tracking branch 'upstream/master' into proceduralMesh 2019-05-16 16:33:16 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -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
SamGondelman
dfdace8cdc fix zones for real this time 2019-05-10 15:24:02 -07:00
Shannon Romano
930032bcc6
Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop 
case 22166: Build complex shapes in ThreadPool instead of MainLoop
 2019-05-09 17:14:50 -07:00
SamGondelman
04198c6bfc use weak ptrs, add comment about SelectSortItems performance 2019-05-08 13:13:05 -07:00
SamGondelman
da092cc5f0 fix zone issues 2019-05-08 11:04:54 -07:00
Andrew Meadows
915cbb69df split work out of EntityTree::update(), call it preUpdate() 2019-05-06 17:37:35 -07:00
Andrew Meadows
7dfa8a26a3 cleanup EntityItem::shouldBePhysical() and derivations 2019-05-06 17:35:57 -07:00
Shannon Romano
7fc92a74e0
Merge pull request #15429 from SamGondelman/leave 
Case 20989: Call leaveEntity when script on containing entity stops
 2019-05-02 15:42:47 -07:00
SamGondelman
703a4a5700 call leaveEntity when script stops 2019-04-19 15:18:05 -07:00
Olivier Prat
7d412f9109 Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias. 2019-04-19 11:03:43 +02:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
SamGondelman
a50cca006e use # instead of ? for material URL name selection 2019-04-08 23:45:47 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
SamGondelman
924bf53698 extra check to make sure we remove material from MyAvatar 2019-04-05 16:22:16 -07:00