Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle conflicts on merge with upstream master

Browse source
This commit is contained in:
Stephen Birarda 2015-06-26 15:33:35 -07:00
commit ff33922716
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/resources/qml/Tooltip.qml
View file

@ -38,10 +38,9 @@ Hifi.Tooltip {
Text {
id: textPlace
color: "white"
font.underline: true
anchors.left: parent.left
anchors.right: parent.right
font.pixelSize: hifi.fonts.pixelSize / 2
font.pixelSize: hifi.fonts.pixelSize * 2
text: root.title
wrapMode: Text.WrapAnywhere
@ -53,6 +52,15 @@ Hifi.Tooltip {
*/
}
Rectangle {
id: seperator
color: "white"
width: col.width
height: hifi.layout.spacing / 3
anchors.left: parent.left
anchors.right: parent.right
}
Image {
id: tooltipPic
source: root.imageURL
@ -69,8 +77,8 @@ Hifi.Tooltip {
width: border.implicitWidth
anchors.left: parent.left
anchors.right: parent.right
font.pixelSize: hifi.fonts.pixelSize / 2
text: root.description
font.pixelSize: hifi.fonts.pixelSize
wrapMode: Text.WrapAnywhere
}
}

2
libraries/entities/src/EntityPropertyFlags.h
View file

@ -55,7 +55,6 @@ enum EntityPropertyList {
PROP_DAMPING,
PROP_LIFETIME,
PROP_SCRIPT,
PROP_SCRIPT_TIMESTAMP,
// these properties are supported by some derived classes
PROP_COLOR,
@ -124,6 +123,7 @@ enum EntityPropertyList {
PROP_DESCRIPTION,
PROP_FACE_CAMERA,
PROP_SCRIPT_TIMESTAMP,
////////////////////////////////////////////////////////////////////////////////////////////////////
// ATTENTION: add new properties ABOVE this line

2
libraries/networking/src/PacketHeaders.cpp
View file

@ -73,7 +73,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketTypeEntityAdd:
case PacketTypeEntityEdit:
case PacketTypeEntityData:
return VERSION_ENTITIES_SCRIPT_TIMESTAMP;
return VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX;
case PacketTypeEntityErase:
return 2;
case PacketTypeAudioStreamStats:

1
libraries/networking/src/PacketHeaders.h
View file

@ -185,5 +185,6 @@ const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28;
const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29;
const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30;
const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP = 31;
const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX = 32;
#endif // hifi_PacketHeaders_h