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

Merge branch 'master' of https://github.com/worklist/hifi

Browse source
This commit is contained in:
Philip Rosedale 2014-06-25 02:57:54 -07:00
commit 95a66a06af
11 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -3189,7 +3189,7 @@ void Application::updateWindowTitle(){
float creditBalance = accountManager.getAccountInfo().getBalance() / SATOSHIS_PER_CREDIT;
QString creditBalanceString;
creditBalanceString.sprintf("%.8f", floor(creditBalance + 0.5));
creditBalanceString.sprintf("%.8f", creditBalance);
title += " - ₵" + creditBalanceString;
}

6
interface/src/ui/ChatWindow.cpp
View file

@ -181,7 +181,7 @@ void ChatWindow::addTimeStamp() {
QLabel* timeLabel = new QLabel(timeString);
timeLabel->setStyleSheet("color: #333333;"
"background-color: white;"
"font-size: 14pt;"
"font-size: 14px;"
"padding: 4px;");
timeLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
timeLabel->setAlignment(Qt::AlignLeft);
@ -287,7 +287,7 @@ void ChatWindow::participantsChanged() {
"padding-bottom: 2px;"
"padding-left: 2px;"
"border: 1px solid palette(shadow);"
"font-size: 14pt;"
"font-size: 14px;"
"font-weight: bold");
userLabel->setProperty("user", participantName);
userLabel->setCursor(Qt::PointingHandCursor);
@ -323,7 +323,7 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
"padding-right: 20px;"
"margin: 0px;"
"color: #333333;"
"font-size: 14pt;"
"font-size: 14px;"
"background-color: rgba(0, 0, 0, 0%);"
"border: 0; }"
"QMenu{ border: 2px outset gray; }");

2
interface/src/ui/ScriptsTableWidget.cpp
View file

@ -23,7 +23,7 @@ ScriptsTableWidget::ScriptsTableWidget(QWidget* parent) :
setShowGrid(false);
setSelectionMode(QAbstractItemView::NoSelection);
setEditTriggers(QAbstractItemView::NoEditTriggers);
setStyleSheet("QTableWidget { background: transparent; color: #333333; } QToolTip { color: #000000; background: #f9f6e4; padding: 2px; }");
setStyleSheet("QTableWidget { border: none; background: transparent; color: #333333; } QToolTip { color: #000000; background: #f9f6e4; padding: 2px; }");
setToolTipDuration(200);
setWordWrap(true);
setGeometry(0, 0, parent->width(), parent->height());

2
interface/ui/preferencesDialog.ui
View file

@ -660,7 +660,7 @@ color: #0e7077</string>
<string notr="true">background: #0e7077;
color: #fff;
border-radius: 4px;
font: bold 14pt;
font: bold 14px;
padding: 10px;margin-top:10px</string>
</property>
<property name="text">

26
interface/ui/runningScriptsWidget.ui
View file

@ -25,18 +25,18 @@ QWidget {
<property name="geometry">
<rect>
<x>37</x>
<y>29</y>
<y>20</y>
<width>251</width>
<height>20</height>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">color: #0e7077;
font-size: 20pt;
font-size: 20px;
background: transparent;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt;&quot;&gt;Running Scripts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18px;&quot;&gt;Running Scripts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="margin">
<number>0</number>
@ -56,7 +56,7 @@ background: transparent;</string>
</property>
<property name="styleSheet">
<string notr="true">color: #0e7077;
font: bold 14pt;
font: bold 14px;
background: transparent;</string>
</property>
<property name="text">
@ -82,7 +82,7 @@ background: transparent;</string>
<string notr="true">background: #0e7077;
color: #fff;
border-radius: 4px;
font: bold 14pt;
font: bold 14px;
padding-top: 3px;</string>
</property>
<property name="text">
@ -105,7 +105,7 @@ padding-top: 3px;</string>
<string notr="true">background: #0e7077;
color: #fff;
border-radius: 4px;
font: bold 14pt;
font: bold 14px;
padding-top: 3px;</string>
</property>
<property name="text">
@ -123,7 +123,7 @@ padding-top: 3px;</string>
</property>
<property name="styleSheet">
<string notr="true">color: #0e7077;
font: bold 14pt;</string>
font: bold 14px;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Recently loaded&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -140,7 +140,7 @@ font: bold 14pt;</string>
</property>
<property name="styleSheet">
<string notr="true">color: #95a5a6;
font-size: 14pt;</string>
font-size: 14px;</string>
</property>
<property name="text">
<string>(click a script to load and run it)</string>
@ -184,7 +184,7 @@ font-size: 14pt;</string>
</rect>
</property>
<property name="styleSheet">
<string notr="true">font: 14pt;</string>
<string notr="true">font: 14px;</string>
</property>
<property name="text">
<string>There are no scripts currently running.</string>
@ -204,7 +204,7 @@ font-size: 14pt;</string>
</property>
<property name="styleSheet">
<string notr="true">background: transparent;
font-size: 14pt;</string>
font-size: 14px;</string>
</property>
</widget>
<widget class="QWidget" name="runningScriptsTableWidget" native="true">
@ -218,7 +218,7 @@ font-size: 14pt;</string>
</property>
<property name="styleSheet">
<string notr="true">background: transparent;
font-size: 14pt;</string>
font-size: 14px;</string>
</property>
</widget>
<widget class="QPushButton" name="loadScriptButton">
@ -237,7 +237,7 @@ font-size: 14pt;</string>
<string notr="true">background: #0e7077;
color: #fff;
border-radius: 4px;
font: bold 14pt;
font: bold 14px;
padding-top: 3px;</string>
</property>
<property name="text">

2
interface/ui/shareSnapshot.ui
View file

@ -277,7 +277,7 @@ padding-left:20px;</string>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Helvetica'; font-size:14pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Helvetica'; font-size:14px; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>

2
libraries/audio/src/AudioRingBuffer.h
View file

@ -31,7 +31,7 @@ const int NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL = NETWORK_BUFFER_LENGTH_BYTE
const unsigned int BUFFER_SEND_INTERVAL_USECS = floorf((NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL
/ (float) SAMPLE_RATE) * 1000 * 1000);
const short RING_BUFFER_LENGTH_FRAMES = 100;
const short RING_BUFFER_LENGTH_FRAMES = 10;
const int MAX_SAMPLE_VALUE = std::numeric_limits<int16_t>::max();
const int MIN_SAMPLE_VALUE = std::numeric_limits<int16_t>::min();

4
libraries/models/src/ModelItem.h
View file

@ -12,9 +12,10 @@
#ifndef hifi_ModelItem_h
#define hifi_ModelItem_h
#include <glm/glm.hpp>
#include <stdint.h>
#include <glm/glm.hpp>
#include <QtScript/QScriptEngine>
#include <QtCore/QObject>
@ -23,6 +24,7 @@
#include <SharedUtil.h>
#include <OctreePacketData.h>
class ModelItem;
class ModelEditPacketSender;
class ModelItemProperties;

13
tests/octree/CMakeLists.txt
View file

@ -30,15 +30,20 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
# link in the shared libraries
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(models ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
IF (WIN32)
# add a definition for ssize_t so that windows doesn't bail
add_definitions(-Dssize_t=long)
#target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
target_link_libraries(${TARGET_NAME} wsock32.lib)
ENDIF(WIN32)

3
tests/octree/src/ModelTests.cpp
View file

@ -14,17 +14,16 @@
#include <QDebug>
#include <Octree.h>
#include <ModelItem.h>
#include <ModelTree.h>
#include <ModelTreeElement.h>
#include <Octree.h>
#include <OctreeConstants.h>
#include <PropertyFlags.h>
#include <SharedUtil.h>
#include "ModelTests.h"
void ModelTests::modelTreeTests(bool verbose) {
int testsTaken = 0;
int testsPassed = 0;

4
tests/physics/src/ShapeColliderTests.cpp
View file

@ -1183,7 +1183,7 @@ void ShapeColliderTests::rayMissesCapsule() {
void ShapeColliderTests::rayHitsPlane() {
// make a simple plane
float planeDistanceFromOrigin = 3.579;
float planeDistanceFromOrigin = 3.579f;
glm::vec3 planePosition(0.0f, planeDistanceFromOrigin, 0.0f);
PlaneShape plane;
plane.setTranslation(planePosition);
@ -1228,7 +1228,7 @@ void ShapeColliderTests::rayHitsPlane() {
void ShapeColliderTests::rayMissesPlane() {
// make a simple plane
float planeDistanceFromOrigin = 3.579;
float planeDistanceFromOrigin = 3.579f;
glm::vec3 planePosition(0.0f, planeDistanceFromOrigin, 0.0f);
PlaneShape plane;
plane.setTranslation(planePosition);