Thijs Wenker
9d5c81bd67
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6
FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)
2014-07-23 16:55:59 +02:00
Philip Rosedale
4f52098da1
tuning tweaks to world and avatar lights
2014-07-22 20:23:23 -04:00
Andrzej Kapolka
be028c2b01
Fixes for local lights.
2014-07-22 14:13:51 -07:00
barnold1953
03bc3a9ff8
Added checkable menu option for laser toggle
2014-07-21 12:35:46 -07:00
barnold1953
c6bda4bf16
Moved sixense laser stuff to MyAvatar
2014-07-18 15:26:18 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
Andrzej Kapolka
3be00b972d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 18:11:54 -07:00
Andrzej Kapolka
e32bab5b04
Beginnings of some metavoxel scriptability, to create some test landscapes.
2014-07-14 14:32:55 -07:00
TonyPeng
1aa20dff60
Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager.
2014-07-14 13:59:57 -07:00
Andrew Meadows
456a3c3739
cleanup Leapmotion initialization removes warning
...
about unused variable
2014-07-14 09:26:42 -07:00
Andrew Meadows
8ffc3aa73d
merge upstream/master into andrew/thermonuclear (AKA samcake/19734)
...
Conflicts:
interface/src/Application.cpp
2014-07-14 09:10:27 -07:00
Brad Hefta-Gaub
a94e077a75
Merge pull request #3153 from wangyix/quick_audio_PR
...
Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg
2014-07-11 11:42:55 -07:00
wangyix
a7ef7647ed
application stats tracking and packing updated;
2014-07-10 16:54:26 -07:00
wangyix
b4c9e51011
Audio now periodically sends downstream audio stats to audiomixer
2014-07-10 14:14:29 -07:00
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
samcake
c6e308bc87
fixes after first review
...
- lots of cleaning of the syntax to respect the coding standard
- Fixed the device tracker singleton for clean destruction
- introduced the Factory for the Leapmotion itstead of a naked
constructor
2014-07-09 15:52:57 -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
samcake
abacefa723
Merge remote-tracking branch 'upstream/master' into 19734
...
Conflicts:
interface/CMakeLists.txt
interface/src/avatar/SkeletonModel.cpp
2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13
Merge branch 'master' of https://github.com/highfidelity/hifi into 19734
2014-07-05 18:10:59 -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
