Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 07:43:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60268 commits 75 branches 59 tags 1.2 GiB
Commit graph

186 commits

Author SHA1 Message Date
Ken Cooke
84af90ad96 Bump the audio packet version 2017-01-04 19:59:50 -08:00
howard-stearns
8b9c1446cd protocol versions 2016-12-27 10:17:39 -08:00
Brad Hefta-Gaub
02a6060b5e hacking on new format 2016-12-22 16:16:44 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
David Kelly
4feec85337 CR feedback 
Though this seems like a hard place to remember, when we make further
changes.
 2016-12-19 17:23:24 -08:00
David Kelly
5b9c19b39e Versioning 2016-12-19 16:06:12 -08:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
David Kelly
c0d7c06d4a Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS 
Adding Machine Fingerprint to Domain Server permissions
 2016-12-19 11:49:33 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in 
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
 2016-12-14 16:09:13 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Stephen Birarda
fdcface8cb use enum in PacketHeaders, coding standard fixes in Connection 2016-10-18 15:54:25 -07:00
Stephen Birarda
6d69a0dc71 push version for asset packets to mismatch for TCPVegasCC 2016-10-18 15:54:25 -07:00
Zach Pomerantz
aacfa7d6c5 back out AudioVersion::CurrentVersion 2016-09-27 10:41:00 -07:00
Zach Pomerantz
b9c4018b8e expose AudioStats to qml/js 2016-09-26 15:35:29 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
Seth Alves
3d436d4c26 bump entity protocol version 2016-08-30 16:23:11 -07:00
Ken Cooke
28a99a7a03 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-08-29 12:38:17 -07:00
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -07:00
Anthony J. Thibault
c6ea64926c Sensor space entity support 
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space.  Essentially, this
gives you the ability to place objects in the user's physical room.

WebTablets now are located in this feature and no longer jitter.
 2016-08-23 10:13:06 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -07:00
Ken Cooke
87d5ec2437 Bump protocol version. Audio packets are now exactly 10ms (240/480 samples). 2016-08-18 08:31:43 -07:00
Stephen Birarda
7e6dbf2d1a add a kick request packet and send from NL 2016-08-02 14:35:11 -07:00
Howard Stearns
0b5cdcef42 Merge pull request #8252 from howard-stearns/suggestions 
suggestions
 2016-07-19 15:46:23 -07:00
Brad Hefta-Gaub
20824f038c include codec in audio stream packets so that each side can discard packets that don't match 2016-07-18 21:59:44 -07:00
howard-stearns
1a66574adb add protocol version signature to metaverse heartbeat 2016-07-18 14:29:49 -07:00
Stephen Birarda
07c1777485 push the packet version for NodeIgnoreRequest 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Andrew Meadows
92af849204 bump version for new shape types 2016-07-06 10:52:01 -07:00
Andrew Meadows
e5b89ebd17 bump version number 2016-06-22 15:33:44 -07:00
Seth Alves
80eeff5a64 bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided 2016-06-04 10:32:07 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
 2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
Brad Hefta-Gaub
ff45633c21 bump entities version/CR feedback 2016-05-24 17:36:52 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
e012630db2 Merge pull request #7860 from birarda/place-referrer 
send lookup hostname to DS for split counts, correct number of DS connected users
 2016-05-20 17:00:46 -07:00
Stephen Birarda
7110fe98eb associate incoming place name with DomainServerNodeData 2016-05-20 11:24:54 -07:00
Anthony J. Thibault
b82356a249 AvatarMixer: Clients will show incompatible version dialog 
For this to work, the server needs to send an empty AvatarIdentity packet back to the sender
when it receives a packet mismatch error.  This AvatarIdentity packet will be different then
what the client expects and will trigger the incompatible version dialog.

Previously, the avatar-mixer was just silently dropping incoming mismatched version packets.
Causing the client to never get a response, and thus never showing the incompatible version dialog.
 2016-05-17 15:02:04 -07:00
Seth Alves
46c1049a35 bump protocol version 2016-05-07 17:48:06 -07:00
Seth Alves
0fe4e42511 added zone properties to allow flying/ghosting or not 2016-05-01 13:53:44 -07:00
Stephen Birarda
8832a9d9ed add ICEServerHeartbeatACK packet type 2016-04-12 17:59:07 -07:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Stephen Birarda
e92a9c9741 fix comment for asset packet version push 2016-03-08 11:53:53 -08:00
Stephen Birarda
267ed3af82 remove client side handling of extension for ATP hash URLs 2016-03-07 13:57:02 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562 Merge pull request #7217 from huffman/udt-random-seq 
Randomize initial send sequence number in UDT
 2016-03-01 12:59:10 -08:00
Ryan Huffman
aa63dcc9d2 Add PacketType qMetaType 2016-03-01 11:36:49 -08:00
Ryan Huffman
548a672df9 Update DomainList version to 18 2016-02-29 15:31:38 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Stephen Birarda
5fe74bb33c send hearbeat denied packet back from ice-server 2016-02-23 15:12:17 -08:00
Stephen Birarda
11a1bc4488 add signed heartbeat sending to domain-server 2016-02-22 15:12:02 -08:00
Zach Pomerantz
292842261d Bump packet version to LIGHT_HAS_SURFACE_RADIUS 2016-02-22 15:07:07 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Andrew Meadows
c9b125612c fix bugs 2016-01-12 15:08:52 -08:00
Seth Alves
096ab44311 fix network version number 2016-01-06 11:01:31 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Seth Alves
8eef1624cb Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 09:27:59 -08:00
Seth Alves
83f60d6e97 make entity properties for model-entity joint-states 2015-12-23 15:43:50 -08:00
Anthony J. Thibault
1618e0a92f Network, Preferences and UI support for soft attachments 
Added an isSoft field to the AttachmentData which is edited
by the Attachment Dialog Menu, sent over the network via
AvatarData identity packets and saved in the Interface.ini preferences.

AvatarData and AvatarBulkData version number has been bumped.

Changed Avatar attachment collections to use smart pointers to models
instead of raw ones.  Removed _unusedAttachmentModels.
I don't think the caching was worth the added code complexity.
 2015-12-18 13:32:09 -08:00
Seth Alves
24fb43e8cd first steps toward a puffed-out query-box for child entities 2015-12-12 12:33:14 -08:00
Ryan Huffman
87e30a2157 Remove EntityQuery version and just append new data to end 2015-12-11 09:03:39 -08:00
Ryan Huffman
6acf3603d0 Update naming and number of entity query version 2015-12-10 14:58:08 -08:00
Ryan Huffman
cfcc07da2e Fix current version for EntityQuery 2015-12-10 14:49:28 -08:00
Ryan Huffman
b5e3dce376 Add keyhole radius to OctreeQuery 2015-12-10 14:34:28 -08:00
Anthony J. Thibault
e9f529bf12 Entities: Removed Start Automatically property from Animation Group 
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
 2015-12-09 17:59:56 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Anthony J. Thibault
2a9adafc09 Bumped avatar packet version number 2015-11-25 12:13:40 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Ryan Huffman
3d0afc3c5f Update entities version number for polyline change 2015-11-18 14:00:00 -08:00
Stephen Birarda
1c9396d66e handle disconnect request in domain-server 2015-11-12 15:43:03 -08:00
Stephen Birarda
8bdb81d832 send disconnect packet from node when leaving domain 2015-11-12 15:03:19 -08:00
Stephen Birarda
0a64242160 cleanup string grabbing for PacketType enum 2015-11-12 14:43:25 -08:00
Stephen Birarda
288ee0e9e8 add a NodeDisconnect packet 2015-11-12 11:39:32 -08:00
ericrius1
31fe5fa953 Bump version num, use different shader for additive blending effect 2015-11-03 17:15:10 -08:00
samcake
393f6a4c76 Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version 2015-10-30 11:35:50 -07:00
samcake
bc7ad9d3f7 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 09:27:06 -07:00
Seth Alves
778dc8dc15 add parentID and parentJointIndex EntityItemProperties 2015-10-22 11:52:56 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Atlante45
f5f349e13a Bumped packet version numbers 2015-10-02 14:20:20 -07:00
Brad Hefta-Gaub
57bf69cc48 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/entities/src/ModelEntityItem.cpp
	libraries/networking/src/udt/PacketHeaders.cpp
 2015-10-02 14:19:15 -07:00
Brad Hefta-Gaub
6aa9ef9910 first cut at migrating animation settings into a property group 2015-09-30 20:51:25 -07:00