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
Zach Fox
53081b51a6
Clean up as much as possible
2017-10-23 16:00:39 -07:00
Seth Alves
2b0285adc2
fix action (grab) deadlock
2017-10-20 15:05:21 -07:00
Zach Fox
9e68e805a0
Get marketplace public key from backend
2017-10-20 10:38:59 -07:00
Zach Fox
c99e803ab7
Error handling
2017-10-19 17:19:37 -07:00
Zach Fox
74180bc4cd
Implement static cert verification correctly
2017-10-19 16:39:13 -07:00
Seth Alves
2c8c5e214c
puff querybox if entity is in motion
2017-10-19 13:19:41 -07:00
Seth Alves
e8ca455547
cleanups + call updateQueryAACube when parent changes or action is deleted
2017-10-19 13:19:35 -07:00
Seth Alves
c1e8d5144c
remove code which is no longer needed because of custom physics setters
2017-10-19 13:19:25 -07:00
Seth Alves
f2cb5d4aff
clean-up concept of puffed queryAACube
2017-10-19 13:19:13 -07:00
Seth Alves
ae70f091c3
don't accept updates to queryAACube if this interface is simulation owner
2017-10-19 13:18:45 -07:00
Seth Alves
f75e59c0a6
keep grabbed and worn entities from spamming entity-server
2017-10-19 13:18:37 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
SamGondelman
c9d2d40e1e
possibly fix registration offset issue
2017-10-03 14:44:11 -07:00
Howard Stearns
0b7af66016
more linux warnings
2017-10-02 15:38:59 -07:00
Howard Stearns
136381adb9
fatal compiler warning on mac/linux
2017-10-02 13:56:15 -07:00
Howard Stearns
5c5f052bc2
explicit free, and remove header that isn't available on mac/linux
2017-10-02 10:28:47 -07:00
Howard Stearns
73c8da99dc
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12
animation url and computing certificateID
2017-09-29 16:32:25 -07:00
SamGondelman
0ad5f47bfd
trying to fix entity editing bugs, needs testing
2017-09-29 11:34:34 -07:00
Andrew Meadows
ca470d67b4
fix indentation
2017-09-29 11:34:32 -07:00
Seth Alves
72cacc4cef
server only deletes and entity if it's still the child of an avatar, not if it has ever been
2017-09-28 19:56:15 -07:00
Howard Stearns
d1350a03c2
working checkpoint, but with a lot of debug/development stuff
2017-09-28 17:06:07 -07:00
Howard Stearns
4403c27b52
working checkpoint. still needs verification/hashing, etc.
2017-09-26 14:14:37 -07:00
Howard Stearns
8fdd405593
consistent comments
2017-09-22 15:10:30 -07:00
Howard Stearns
f25e22b463
entityInstanceNumber
2017-09-22 15:06:39 -07:00
Howard Stearns
7724fc204b
working checkpoint
2017-09-22 14:19:54 -07:00
Anthony J. Thibault
6618ba12e9
Merge branch 'master' into feature/ant-man
2017-08-31 18:10:39 -07:00
Anthony J. Thibault
c9cdaadeb5
Better scale support in SpatiallyNestable class.
...
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.
Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field. a new _dimensions member variable is used instead. The SpatiallyNestable scale
field for entities should always be one.
Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.
Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.
Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
David Kelly
6ae516c46a
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 15:45:34 -07:00
Brad Hefta-Gaub
d572510770
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
...
update EntityItem bounding cube when on changed dimensions
2017-07-27 18:21:06 -07:00
Zach Fox
bd5f7b85d8
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde
2017-07-26 14:11:28 -07:00
Zach Fox
9147bc21d0
Getting there.
2017-07-26 11:41:27 -07:00
Ryan Huffman
6817cf9db4
Fix entity properties sometimes being resent
...
When writing entity properties to a packet, we start off with a list of
requested properties (`requestedProperties`) and keep track of which properties
didn't fit (`propertiesDidntFit`) the packet, which is intialized to
requestedProperties. As we pack the properties, we remove them from
propertiesDidntFit if they didn't need to be written or were able to be
packed. At the end we store propertiesDidntFit, and use it in the future
as our requestedProperties when we try to pack more data into a packet.
The bug: because of the order in which propertiesDidntFit is
initialized, it ended up always being the list of all properties for
that entity. This typically wasn't an issue because we usually go
through and try to append all of the properties, and if we don't need to
append them (because they aren't in requestedProperties)
we remove them from our propertiesDidntFit list. When we
don't have enough remaining space in the current packet for even the
entity header, which is fairly small, we don't bother trying to append
any of the properties. When this happens, propertiesDidntFit contains
the full list of properties, which we save for the next pass through the
entity, and use as our requestedProperties, causing us to resend entity
data again. In the worst case we never end up sending all of the
entity's data.
2017-07-25 10:59:03 -07:00
Andrew Meadows
17323ba42a
always update the bounding box
2017-07-21 10:25:03 -07:00
Andrew Meadows
a8dac0cb79
don't send constant updates for grabbed objects
2017-07-20 15:45:50 -07:00
Andrew Meadows
d88d7dda2b
changed dimensions flag entity for new queryAACube
2017-07-20 08:19:59 -07:00
Andrew Meadows
9ca3ec4313
faster computation of entity bounding cube
2017-07-19 13:35:34 -07:00
Andrew Meadows
c7ec82f98a
use local copy of _element for thread safety
2017-07-13 13:30:57 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Andrew Meadows
8d19395b0a
ignore remote update younger than recent bid
2017-06-14 16:04:52 -07:00
Andrew Meadows
29a05d7eb4
bid immediately when creating new entity
...
also clear EntityMotionState::_numInactiveUpdates on new ownership
2017-06-01 17:39:21 -07:00
Andrew Meadows
c56a6c44f8
minor formatting fix
2017-06-01 17:39:21 -07:00
Brad Hefta-Gaub
5af95c8fdf
Merge pull request #10476 from sethalves/fix-imported-children-querybox
...
fix up queryAACubes before sending imported entities to server
2017-05-25 08:29:23 -07:00
Seth Alves
381de7a1e2
tabs
2017-05-21 08:42:53 -07:00
Seth Alves
c68efc2ed0
treat locked like other properties that affect simulation
2017-05-21 08:29:35 -07:00
Seth Alves
2512b39848
don't dirty motion-type if lock value isn't actually changing
2017-05-20 14:14:33 -07:00
Seth Alves
8f38ea8c6a
force locked entities to be static in bullet
2017-05-20 11:54:42 -07:00
Seth Alves
a442181859
remove some redundancy
2017-05-20 08:51:44 -07:00
Seth Alves
5c93dbd20d
be more careful about fixing up entities which arrived before their parents
2017-05-19 13:48:29 -07:00
Seth Alves
735e4b7d05
trying to get child collision hulls to be in the right place after import
2017-05-19 10:59:59 -07:00
