barnold1953
a785ceb3da
Restored UI fade animation
2014-07-09 17:33:41 -07:00
barnold1953
56ff74dd56
Removed ApplicationOverlay::resize()
2014-07-09 16:39:05 -07:00
barnold1953
6e92beeb1c
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.h
2014-07-09 16:32:02 -07:00
Andrew Meadows
6ffa09f9e6
modified scope of devices stats
2014-07-09 13:58:54 -07:00
Andrew Meadows
3d6752ad90
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2014-07-09 12:52:00 -07:00
Andrew Meadows
d26585728b
Improved stat accumulation and context names
2014-07-09 11:53:53 -07:00
barnold1953
862f311306
Fixed full screen mirror mode for non oculus
2014-07-09 11:29:33 -07:00
Clément Brisset
3f24feeb1d
Merge pull request #3143 from PhilipRosedale/master
...
Add Low Velocity Filter for hand movement as menu option
2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df
Merge pull request #3138 from ctrlaltdavid/19836
...
Code Review for Job #19836
2014-07-08 23:16:32 -07:00
Philip Rosedale
c50d9ae3e4
Hand low velocity filter as a menu option
2014-07-08 22:22:27 -07:00
barnold1953
b5a9f50ae7
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-08 17:15:35 -07:00
Atlante45
a225df63f6
Removed deprecated moveToThread()
2014-07-07 11:40:03 -07:00
David Rowe
2ad2b6cd1c
Resize the overlay framebuffer when the application window is resized
2014-07-03 18:23:37 -07:00
David Rowe
97ca6d70fa
Fixed performance timer scope
2014-07-03 17:15:46 -07:00
David Rowe
8b04a9c8b6
Add toggle for user interface display
...
- "/" toggles UI (incl. stats if displayed); menu View > User Interface
- "%" = toggle status; menu View > Stats
- Acts on normal, 3DTV, and Oculus display.
2014-07-03 16:19:05 -07:00
barnold1953
ba997334ff
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-03 16:10:26 -07:00
barnold1953
bf2959675f
First pass at laser oculus UI pointer
2014-07-03 16:09:54 -07:00
Atlante45
8e1b8334a1
Fixed invokeMethod unable to find method + fixed children in different thread
2014-07-03 14:46:17 -07:00
Brad Hefta-Gaub
b8071d8050
Merge pull request #3113 from birarda/master
...
initial pass at MIDI input for scripting
2014-07-03 13:40:25 -07:00
Brad Hefta-Gaub
dbdce32b68
Merge pull request #3107 from wangyix/master
...
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
2014-07-03 13:32:31 -07:00
Stephen Birarda
15619b5a98
don't require RtMidi if it isn't present
2014-07-03 13:30:14 -07:00
Stephen Birarda
f1e2ba1267
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 09:25:03 -07:00
Brad Hefta-Gaub
67910a5ba2
Merge pull request #3115 from Barnold1953/OculusSDK
...
3DTV UI overlay + Oculus fixes
2014-07-02 21:45:34 -07:00
Brad Hefta-Gaub
1b29b7c120
Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback
...
Removed json callback
2014-07-02 21:45:19 -07:00
Atlante45
69533c25c2
Fix script not being loaded at startup
2014-07-02 17:54:21 -07:00
barnold1953
edcf4d04f8
Fixed bug when switching from normal view to oculus
2014-07-02 17:05:06 -07:00
barnold1953
ee30a446e9
Fixed 3rd person camera for non oculus
2014-07-02 16:45:05 -07:00
barnold1953
a859094d4a
Clickable 3D UI in 3DTV
2014-07-02 16:40:02 -07:00
Atlante45
1ac38c9884
Switched call to setCache to invokeMethod
2014-07-02 14:31:19 -07:00
Stephen Birarda
55d8b763c5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-02 09:42:32 -07:00
barnold1953
67ecde7d31
Made tree editor voxel world stationary and not crash
2014-07-01 21:39:19 -07:00
Atlante45
c5a997a567
Switched Application to NetworkAccessManager
2014-07-01 17:43:25 -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
barnold1953
1a1050cb06
Added back _raiseMirror usage for mirror mode.
2014-07-01 12:31:48 -07:00
wangyix
fd051310da
prune missing set before constructing nack packets;
...
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
2014-07-01 12:01:51 -07:00
Stephen Birarda
f389e3a6da
resolve conflicts on merge with upstream master
2014-07-01 11:02:25 -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
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
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
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
