Commit graph

14425 commits

Author SHA1 Message Date
Andrzej Kapolka
9e61b5e45f Fix Windows link error (hopefully). 2014-06-30 11:16:35 -07:00
Clément Brisset
bd56596b59 Merge pull request #3096 from AndrewMeadows/bug-fix
fix for assert crash in SkeletonModel::initRagdollPoints()
2014-06-30 10:04:10 -07:00
wangyix
de3c1ebf0f changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream 2014-06-30 09:42:22 -07:00
Andrew Meadows
57c17eb972 remove unecessary clearRagdollConstraintsAndPoints() 2014-06-30 09:18:31 -07:00
Andrew Meadows
f33728b615 guarantee that ragdoll is clear before initialized 2014-06-30 09:13:42 -07:00
David Rowe
ce874305be Add checkbox that automatically reloads externally changed files 2014-06-29 21:50:16 -07:00
David Rowe
c454c790fa Check script file for external changes when editor regains focus
Prompt user whether to reload.
2014-06-29 21:31:28 -07:00
David Rowe
3df43dc653 Catch any on-the-fly modifications made while script is restarting 2014-06-29 20:13:27 -07:00
David Rowe
742007892f Rework old fix for Script Editor Script.stop() crash 2014-06-29 19:57:26 -07:00
David Rowe
48fb156e28 Fix Script Editor run-on-the-fly crashing
Wait for script engine to stop before restarting.
2014-06-29 19:47:00 -07:00
David Rowe
9449ad7192 Add missing script engine hash key code changes
The script engine hash key changed starting at commit [62f85d] on 11 Jun.
2014-06-29 19:40:53 -07:00
Aleric Inglewood
37f0635024 Fix a (possible) crash in QObject::disconnect
This is https://worklist.net/19827
2014-06-30 02:07:26 +02:00
Aleric Inglewood
f13bbdfae6 Compile fix for non-standard Qt5 install.
When Qt5 5.2.1 is compiled from source, configured with
-developer-build, and used without being installed;
then compiling interface results in the following compile error:

libraries/shared/src/RegisteredMetaTypes.h:17:34: fatal error: QtScript/QScriptEngine: No such file or directory

This commit fixes this by explicitely adding the include
directory for QtScript/QScriptEngine to libraries/shared/CMakeLists.txt

Likewise we get the compile error:

In file included from /opt/highfidelity/hifi/hifi/animation-server/../libraries/voxels/src/VoxelEditPacketSender.h:18:0,
                 from /opt/highfidelity/hifi/hifi/animation-server/src/AnimationServer.cpp:26:
 /opt/highfidelity/hifi/hifi/animation-server/../libraries/voxels/src/VoxelDetail.h:15:34:
 fatal error: QtScript/QScriptEngine: No such file or directory

which is fixed by added the include directory for QtScript/QScriptEngine
to animation-server/CMakeLists.txt

Finally, compile errors like

In file included from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjectorOptions.h:20:0,
                 from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjector.h:21,
                 from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjector.cpp:22:
/opt/highfidelity/hifi/hifi/assignment-client/../libraries/shared/src/RegisteredMetaTypes.h:17:34: fatal error: QtScript/QScriptEngine: No such file or directory

that requires to do the same in libraries/audio/CMakeLists.txt
2014-06-30 02:06:44 +02:00
Andrzej Kapolka
4f9cf82335 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 17:53:50 -07:00
wangyix
c3f571745c removed more debug stuff 2014-06-27 17:42:22 -07:00
Andrzej Kapolka
b623276fde Increase the LOD threshold for now to get around spanner issue. 2014-06-27 17:39:51 -07:00
Clément Brisset
9eba4b01f0 Merge pull request #3092 from ctrlaltdavid/19789
Code Review for Job #19789
2014-06-27 17:28:48 -07:00
wangyix
a0795fd6e6 removed extra print 2014-06-27 16:52:15 -07:00
wangyix
4587828a3a removed debug prints 2014-06-27 16:48:21 -07:00
wangyix
9ceac2c631 fixed Audio.cpp jitter buffer size clamp bug 2014-06-27 16:34:30 -07:00
Andrzej Kapolka
f2bdacd5a8 Fix for shared object reference tracking. 2014-06-27 16:19:18 -07:00
wangyix
0ae58bd7f9 added senderUUID arg to seq stats 2014-06-27 15:39:11 -07:00
Clément Brisset
ae8997ec0d Merge pull request #3091 from AlericInglewood/master
Compiler warning fixes.
2014-06-27 15:36:13 -07:00
Aleric Inglewood
1bc2f214a5 Compiler warning fixes.
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
2014-06-27 22:18:38 +02:00
Andrzej Kapolka
d4470c04d6 Modify tests to use Endpoint base class. 2014-06-27 12:34:56 -07:00
Andrzej Kapolka
61c2ea40ae Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 12:34:50 -07:00
Leonardo Murillo
af9d09427a Merge pull request #3088 from birarda/master
repairs so OAuth flow doesn't get stuck after error
2014-06-27 12:33:58 -07:00
barnold1953
508fed9146 Add ability for FBO to have a different res than glWidget 2014-06-27 11:44:05 -07:00
Stephen Birarda
657bf6b3d5 repairs so OAuth flow doesn't get stuck after an error 2014-06-27 11:41:35 -07:00
wangyix
ff438a2434 added seq stats for Agent,
fixed  AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
2014-06-27 11:23:50 -07:00
Leonardo Murillo
21b839a8b5 Updating concertCamera script 2014-06-27 11:08:24 -07:00
Clément Brisset
04e2249413 Merge pull request #3087 from Atlante45/sit_on_a_model
make sitting points semi transparent
2014-06-27 10:56:46 -07:00
Clément Brisset
8c1e7fb0b5 Merge pull request #3086 from birarda/master
add HTTPS request debugging to domain-server
2014-06-27 10:56:35 -07:00
Atlante45
5bea267cd2 make sitting points semi transparent 2014-06-27 10:54:57 -07:00
Philip Rosedale
6e79fbdbdd Merge pull request #3085 from Atlante45/sit_on_a_model
Sit on a model
2014-06-27 10:52:57 -07:00
Stephen Birarda
8edc4bf9d1 add HTTPS request debugged to domain-server 2014-06-27 10:38:39 -07:00
Atlante45
43de421284 Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model 2014-06-27 10:07:02 -07:00
Atlante45
4281168fe9 Hide seat once you are seated 2014-06-27 10:03:50 -07:00
Atlante45
baf4a82269 Fix crash occuring when geometry not yet available 2014-06-27 09:56:03 -07:00
barnold1953
1af2996cf2 Properly use body orientation for Oculus camera 2014-06-27 09:53:31 -07:00
Atlante45
aad666be62 more sitting work 2014-06-27 09:48:27 -07:00
Stephen Birarda
ee2b5c2e3e Merge pull request #3084 from birarda/master
fix place lookup for new APIs
2014-06-27 09:37:27 -07:00
Stephen Birarda
bb44d8b478 fix place lookup for new APIs 2014-06-27 09:36:47 -07:00
Philip Rosedale
e47fb5750b Merge pull request #3083 from birarda/master
initial pass at settings in the domain-server passed down to audio-mixer
2014-06-27 09:26:01 -07:00
Andrzej Kapolka
7c046cb100 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-26 19:12:30 -07:00
Andrzej Kapolka
f16098daef Use the refactored endpoint/client classes in the actual client/server. 2014-06-26 19:11:54 -07:00
Stephen Birarda
3ae46bc60d switch audio-mixer to pull settings from domain-server via JSON request 2014-06-26 17:32:56 -07:00
barnold1953
67c5281205 Fixed CMake for oculus. Gave Oculus its own camera for minimum latency. 2014-06-26 17:10:53 -07:00
Stephen Birarda
3f70402e63 fix odd encoding in settings URL 2014-06-26 16:58:51 -07:00
wangyix
c5474f95bd forgot to skip seq number in InjectedAudioRingBuffer::parseData() 2014-06-26 16:55:29 -07:00