Atlante45
d102795314
Added application version to logger
2014-06-30 17:18:49 -07:00
wangyix
4abfd2b6b7
removed forgotten semicolon in stats string
2014-06-30 17:16:28 -07:00
barnold1953
1cd2066e79
Added option to disable glow effect for 10fps boost for oculus
2014-06-30 17:13:47 -07:00
Atlante45
f33ad8a100
Adding logger calls
2014-06-30 17:10:17 -07:00
wangyix
7a6b20fd84
added downstream audio stats to stats overlay
2014-06-30 17:01:22 -07:00
barnold1953
2727328729
Removed unneeded menu option
2014-06-30 16:46:25 -07:00
barnold1953
de0e65eb03
Restored glow effect
2014-06-30 16:26:50 -07:00
wangyix
02f12c27c5
forgot to add early/late/lost domain page stats for mic stream
2014-06-30 16:20:29 -07:00
Clément Brisset
1fd830f53c
Merge pull request #3098 from ctrlaltdavid/19803
...
Code Review for Job #19803
2014-06-30 16:15:51 -07:00
Clément Brisset
33a01f7026
Merge pull request #3100 from ZappoMan/fixOctreeServerCrashInSendNack
...
fix crash in SendNack on server shutdown
2014-06-30 16:12:47 -07:00
wangyix
f2dfa6b978
fixed warnings
2014-06-30 16:10:58 -07:00
wangyix
1b0ce510f6
fixed a typo, tidied up more minor details
2014-06-30 15:33:31 -07:00
wangyix
ae2780dcab
changed getAudioStreamStatsOfStream to return stats instead of taking pointer
2014-06-30 15:20:42 -07:00
barnold1953
e51eb34f05
Fixed build errors when libovr is not present
2014-06-30 15:14:21 -07:00
wangyix
1bfe367020
fixed error with retrieving stream stats in AudioMixerClientData
2014-06-30 15:06:04 -07:00
Atlante45
e9dffc0681
Removed testing code
2014-06-30 14:31:39 -07:00
Atlante45
ff8694d5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
2014-06-30 14:30:17 -07:00
Atlante45
5e2ad7173c
Added functions to logger
2014-06-30 14:27:53 -07:00
Atlante45
0d18debd1b
Moved UserActivityLogger to networking
2014-06-30 14:27:07 -07:00
wangyix
6b6dccda2f
_resetCount to _overflowCount in AudioRingBuffer
2014-06-30 14:21:38 -07:00
wangyix
c789f3c6b9
merge with upstream
2014-06-30 14:13:34 -07:00
wangyix
c4a85736e7
removed unnecessary changes from ScriptEngine
2014-06-30 13:51:43 -07:00
ZappoMan
687a81a223
fix crash in SendNack on server shutdown
2014-06-30 13:18:58 -07:00
wangyix
0711eb063e
fix reference to temp object error?
2014-06-30 13:07:46 -07:00
wangyix
dbb370aecf
added early/late/lost to domain page stats
2014-06-30 12:49:54 -07:00
barnold1953
5a2d2bba8f
Updated readme.txt
2014-06-30 12:42:43 -07:00
Andrzej Kapolka
110f90df0e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-30 12:42:02 -07:00
David Rowe
e8e9d6464b
Fix running scripts scrollbar and add scrollbar to list of all scripts
2014-06-30 12:41:01 -07:00
Andrzej Kapolka
73a1e759a4
Include an additional bit with the objects that says whether what follows is
...
a delta. The clients may be retaining references to the objects, so we can't
rely on their having been deleted.
2014-06-30 12:35:34 -07:00
wangyix
d2f86278b2
modified AudioStreamStats to per-stream with seq stats
...
added AudioStreamStats info to interface overlay stats
2014-06-30 12:31:58 -07:00
Stephen Birarda
146cd2b59d
update BUILD.md to remove zlib requirement
2014-06-30 12:23:33 -07:00
barnold1953
ef57970510
Comments and code cleanup
2014-06-30 11:50:42 -07:00
barnold1953
6e954e7f53
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-06-30 11:44:49 -07:00
barnold1953
ffab329af4
Made camera line up with eyes in mirror mode
2014-06-30 11:39:33 -07:00
barnold1953
d109ef6fe1
Proper mirror and third person mode in Oculus
2014-06-30 11:33:22 -07:00
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
