Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-24 01:39:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84580 commits 74 branches 59 tags 1.2 GiB
Commit graph

920 commits

Author SHA1 Message Date
David Back
84b2a7d474 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 15:42:02 -08:00
SamGondelman
fa66ed766d one more try 2019-01-07 12:31:52 -08:00
Andrew Meadows
5c750b40c9 fix copy-n-paste errors in EntityItem::contains() for cylinders 2019-01-05 08:03:29 -08:00
SamGondelman
1452d237e2 trying to fix avatar entity issue 2019-01-04 14:34:46 -08:00
Andrew Meadows
a656ea723e special handling of SPHERE case in EntityItem::contains() 2019-01-04 12:37:23 -08:00
Andrew Meadows
65e920039c cleaner return logic for EntityItem::contains() cylinder cases 2019-01-04 12:37:23 -08:00
Andrew Meadows
b480720409 proper shape support for EntityItem::contains(point) 2019-01-04 12:37:23 -08:00
David Back
eff9d11437 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-04 11:07:28 -08:00
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Seth Alves
54a5805b5c add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities 2019-01-03 08:17:52 -08:00
Seth Alves
05a80ae0e4 don't bootstrap with a traits-based grab 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
unknown
f8f13e974d property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties 2019-01-02 11:12:10 -08:00
SamGondelman
5dd00bed1d new improved polylines 2018-12-14 14:15:56 -08:00
SamGondelman
b261665072 working on lines 2018-12-12 09:39:01 -08:00
Alexander Ivash
600d09e533 relax 'isWearable()' condition to match latest changes in 'master' 2018-12-07 11:23:17 +03:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Andrew Meadows
1a685d2409 set script-triggerd sim ownership priority correctly 2018-10-18 10:33:02 -07:00
Andrew Meadows
bb51079284 move some bid-prep logic from EntityMotionState to EntityItem 2018-10-18 10:33:02 -07:00
Andrew Meadows
f63610af2b namechange: TerseUpdate --> TransformAndVelocities 2018-10-18 10:31:27 -07:00
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3 2018-10-17 13:57:21 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities 
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
 2018-10-01 16:16:48 -07:00
Seth Alves
f6e57f54b0 don't call enterEntity until script preload has finished 2018-09-21 10:26:55 -07:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
SamGondelman
2ca217eb4a merge with master 2018-07-30 17:43:15 -07:00
SamGondelman
f9cdfbad7c cleanup 2018-07-12 17:59:57 -07:00
SamGondelman
9929529f30 vec3 conversion 2018-07-11 14:18:22 -07:00
Andrew Meadows
0b87df45b5 cleanup return statement 2018-07-10 11:16:56 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
SamGondelman
86ee5c12d8 merge and update based on sam's changes 2018-05-31 17:53:36 -07:00
Andrew Meadows
addbb597fc move setSpaceIndex() to cpp file for easier debugging in future 2018-05-31 10:22:39 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
Andrew Meadows
d42375e4fe finish uint8_t to uint16_t conversion 2018-05-24 11:28:52 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
SamGondelman
e6741a363e add local-only isVisibleInSecondaryCamera flag to entities 2018-05-23 16:35:21 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
Liv Erickson
7efcc135e4 reorder flags 2018-05-22 11:03:41 -07:00
Liv Erickson
29b11b9101 some fixes to server cloneables 2018-05-18 17:12:41 -07:00
Andrew Meadows
c8b8d0f1c4 remove commented out cruft 2018-05-18 10:31:08 -07:00
Andrew Meadows
063c2564d1 only clear bid state when ownership actually changed 2018-05-18 10:28:45 -07:00
Andrew Meadows
a9c193b672 merge 'workload-014' into 'workload' 2018-05-18 10:12:04 -07:00
Andrew Meadows
00e360aff0 reduce sim ownership priority when releasing grab 2018-05-17 17:25:07 -07:00
David Back
b8ce07744d initialize prop defaults, no bool returns 2018-05-17 14:50:14 -07:00
David Back
3730cbe36c reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable 2018-05-17 10:28:48 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
David Back
7738a2bcdd Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-09 18:12:46 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
samcake
f686ef1f25 Exposing more uniforms to ui for refining the controller 2018-04-23 18:02:09 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert 
Minimum entity dimension (1mm)
 2018-04-23 13:40:53 -07:00
samcake
a6bd589f4f Merging upstream 2018-04-19 12:20:10 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
SamGondelman
527d71c379 CR 2018-04-17 10:58:54 -07:00
SamGondelman
b71a06a18e min dim = 1 mm 2018-04-13 15:26:37 -07:00
SamGondelman
284364683d Merge remote-tracking branch 'upstream/master' into scaleAssert 2018-04-12 14:46:40 -07:00
SamGondelman
9f3a431c5d minimum entity dimension 2018-04-12 14:12:52 -07:00
samcake
e2f9eef5e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-12 12:27:27 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership 
entity-server will expire stale simulation ownership
 2018-04-12 12:04:52 -07:00
Sam Gateau
6a7ae55d9c Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-11 19:08:57 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
Andrew Meadows
299f2a92e0 merge 'master' into 'workload' 2018-04-05 12:01:19 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
Andrew Meadows
4e0f307dc0 quint8 --> uint8_t 2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3 more cleanup for deleting entities 2018-03-30 13:18:32 -07:00
Seth Alves
98e9f1168a allow href to be set to a serverless domain 2018-03-16 10:50:03 -07:00
samcake
9bec8cdd0b Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-12 12:01:00 -07:00
Andrew Meadows
9fbe7ec194 time-box Picks and solve in round-robin sequence 2018-03-09 08:35:18 -08:00
samcake
a0db5c6135 Merge with master 2018-03-08 15:35:58 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -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
Andrew Meadows
e7495d830b maintain Space proxies for entities 2018-02-20 17:39:05 -08:00
Andrew Meadows
7ed68ced62 Merge master into highfidelity/workload 2018-02-20 12:31:37 -08:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
Nissim Hadar
a69816f885 WIP. 2018-02-17 15:21:57 -08:00
Nissim Hadar
4c1f22f84e Models and Avatar cast shadows (box doesn't, yet). 2018-02-16 14:01:33 -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
ZappoMan
baff900839 cleanup some writeLocks 2017-11-02 17:46:15 -07:00
ZappoMan
53c6eeb58b updatePosition now setPosition 2017-11-02 15:58:50 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
Zach Fox
bb1ffbc06f Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests 2017-11-01 12:38:34 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -07:00
Zach Fox
19420a0ff2 Move static cert verify to properties 2017-10-30 17:01:55 -07:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
ZappoMan
1000318dff tweak min dimension to match current behavior 2017-10-27 14:26:02 -07:00
Andrew Meadows
901e145712 remove redundant dimensionsChanged() 2017-10-26 22:57:33 -07:00
ZappoMan
431ee58577 more cleanup 2017-10-26 21:30:59 -07:00
ZappoMan
e5becba4e9 migrate away from updateXXX standardize on setXXX 2017-10-26 20:38:07 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 
2017-10-23: Merge RC57 into Master
 2017-10-24 21:19:01 -07:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00