Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-25 05:49:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64595 commits 74 branches 59 tags 1.2 GiB
Commit graph

735 commits

Author SHA1 Message Date
Andrew Meadows
7ed68ced62 Merge master into highfidelity/workload 2018-02-20 12:31:37 -08:00
Andrew Meadows
6d347cf44f revert deadlock, remove Space stubbery in EntityTree 2018-02-15 17:40:15 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Andrew Meadows
f35469c0de give EntityTree a workload/Space instance 2018-02-15 12:57:58 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -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
Dante Ruiz
ab20643ada fix mistakes 2018-02-01 08:13:43 -08:00
Dante Ruiz
bd5fc65bfb fix getDirtyFlags & getSpecialFlags function 2018-01-31 16:19:14 -08:00
Dante Ruiz
f6029ed9dc made requested changes 2018-01-31 15:21:22 -08:00
Dante Ruiz
01f8227fa2 remove stray prints 2018-01-31 10:41:08 -08:00
Dante Ruiz
9ff6e079ee fix functions 2018-01-31 10:09:23 -08:00
Dante Ruiz
9c81909be5 restructures _dirtyFlags name and bits 2018-01-30 16:42:08 -08:00
Dante Ruiz
93594fb0bb make dynamic entities collide with avatar when removing grab action 2018-01-18 08:55:51 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5 
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
 2018-01-10 09:08:54 -08:00
SamGondelman
7c17603f3e Merge remote-tracking branch 'upstream/master' into burp5 2018-01-08 14:27:31 -08:00
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594 
Case 10594 - Fix entity property href not being able to reset (empty) ...
 2018-01-08 14:22:28 -08:00
Andrew Meadows
13538006ec fix bug preventing sim owenrship on local domain 2018-01-04 14:46:16 -08:00
Clément Brisset
d6bc41db60
Merge pull request #12075 from highfidelity/stable 
Stable merge back into master
 2018-01-02 13:24:03 -08:00
Dante Ruiz
86be684d7a delete code 2017-12-22 14:58:32 -08:00
Dante Ruiz
e316f71b31 fix grabbing 2017-12-22 14:53:48 -08:00
SamGondelman
5018edcfe0 reduce calls to getVisible 2017-12-22 12:59:06 -08:00
Seth Alves
533aa3d918 code review 2017-12-22 09:07:16 -08:00
Seth Alves
897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 07:36:26 -08:00
Seth Alves
63ac426bf2 fix logic that resets own-avatar collisions after a parenting grab is released 2017-12-19 08:13:44 -08:00
Seth Alves
ca45c4e8da fix logic that resets own-avatar collisions after a parenting grab is released 2017-12-18 17:30:56 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning 
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
 2017-12-18 15:20:23 -08:00
Daniela Fontes
7ca4a21a91 Fix entity property href not being able to reset (empty) once it was set with 
the correct input for the first time.
 2017-12-18 21:00:29 +00:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js 
Cleanup names of debug stats and trace contexts.
 2017-12-18 10:02:42 -08:00
Zach Fox
4980c769c0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning 2017-12-13 17:30:19 -08:00
Zach Fox
d388ca5ac9 Missed a spot. That was the problem the whole time. 2017-12-13 11:22:31 -08:00
Zach Fox
7113a72f2e Bugfixes 2017-12-12 18:04:20 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Zach Fox
1bd12857ef Add static certificate JSON versioning; add serverScripts to cert JSON 2017-12-12 12:07:08 -08:00
Andrew Meadows
406bf7898d cleanup prof stats and trace context names 2017-12-11 11:31:00 -08:00
Seth Alves
40412b80c6 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 17:03:04 -08:00
Dante Ruiz
0f3a70553c fix dynamic entities that are parented to your avatar 2017-12-06 11:18:15 -08:00
Dante Ruiz
8af1d8d8d0 dont run code if not nesscassry 2017-12-05 15:48:09 -08:00
Dante Ruiz
c58286d371 dont do work if not needed 2017-12-05 09:31:35 -08:00
Dante Ruiz
486cdf14d2 make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed 2017-12-04 15:34:53 -08:00
Dante Ruiz
a1bf54ff00 fix issue of no_bootstrapping not being set correctly 2017-12-04 11:16:41 -08:00
Dante Ruiz
03934549cc Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children 2017-12-04 09:08:11 -08:00
Seth Alves
b590cd5b89 avatar-entities which are children of an avatar will scale with the avatar 2017-12-02 09:31:43 -08:00
Dante Ruiz
1e6b5c0c75 make requested changes 2017-12-01 17:09:00 -08:00
Dante Ruiz
a1d90b5dd9 added extra bit 2017-12-01 15:41:13 -08:00
ZappoMan
750d505f9b fix issues in model import sizing caused by recent refactor 2017-11-30 17:51:59 -08:00
Seth Alves
9ccc416e80 avoid a crash during domain change 2017-11-22 16:34:56 -08:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
ZappoMan
d4b4d188ed allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU 2017-11-04 13:40:41 -07:00
ZappoMan
74ceab1e68 fix mac and unic build 2017-11-02 19:30:39 -07:00