Commit graph

7670 commits

Author SHA1 Message Date
Stephen Birarda
73312ecc5f add the PitchWheel constant to the MIDIManager class 2014-07-02 15:07:49 -07:00
Stephen Birarda
55d8b763c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 09:42:32 -07:00
Brad Hefta-Gaub
2df851dcfc Merge pull request #3106 from ctrlaltdavid/19823
Code Review for Job #19823
2014-07-02 09:06:01 -07:00
Brad Hefta-Gaub
d8a5f59511 Merge pull request #3104 from Atlante45/model_and_billboard_overlays
Model and billboard overlays
2014-07-01 15:52:25 -07:00
Atlante45
d63ad86db0 Removed unnecessary function 2014-07-01 15:37:52 -07:00
Atlante45
12ebfd92d1 Memory leak 2014-07-01 15:12:31 -07:00
Atlante45
19be406b1a Added billboards overlays 2014-07-01 15:09:30 -07:00
Atlante45
e9826250cb CR 2014-07-01 12:57:39 -07:00
Atlante45
958367f579 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
Conflicts:
	interface/src/devices/OculusManager.cpp
2014-07-01 12:45:42 -07:00
Atlante45
547431d52e Coding Standard -- static_cast 2014-07-01 12:43:28 -07:00
Atlante45
09cf01e097 ModelOverlay functionnal + bounding box 2014-07-01 12:42:56 -07:00
Stephen Birarda
f389e3a6da resolve conflicts on merge with upstream master 2014-07-01 11:02:25 -07:00
Stephen Birarda
de463642c0 add the ModWheel property to the MIDIManager 2014-07-01 11:00:17 -07:00
Brad Hefta-Gaub
df51d26625 Merge pull request #3094 from wangyix/seqNumberStats
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
2014-07-01 10:54:35 -07:00
wangyix
99fd1c7106 changed numSamplesNeedToStartPlayback calculation in Audio.cpp 2014-07-01 10:44:07 -07:00
Brad Hefta-Gaub
a88c92ea17 Merge pull request #3099 from Barnold1953/OculusSDK
Oculus SDK Upgrade
2014-07-01 10:43:39 -07:00
barnold1953
80bfb0766b Fixed warnings 2014-07-01 10:28:40 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
Atlante45
2015861e13 Fixed spelling mistake 2014-06-30 20:10:53 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Andrzej Kapolka
0075bb89c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 18:02:56 -07:00
wangyix
f51a77ce45 reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed 2014-06-30 18:00:29 -07:00
Atlante45
1a2fd4483b Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 17:54:34 -07:00
Atlante45
d102795314 Added application version to logger 2014-06-30 17:18:49 -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
Clément Brisset
1fd830f53c Merge pull request #3098 from ctrlaltdavid/19803
Code Review for Job #19803
2014-06-30 16:15:51 -07:00
wangyix
f2dfa6b978 fixed warnings 2014-06-30 16:10:58 -07:00
barnold1953
e51eb34f05 Fixed build errors when libovr is not present 2014-06-30 15:14:21 -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
0d18debd1b Moved UserActivityLogger to networking 2014-06-30 14:27:07 -07:00
wangyix
c789f3c6b9 merge with upstream 2014-06-30 14:13:34 -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
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
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
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