Stephen Birarda
1f0611ab09
cleanup the LibOVR and LeapMotion find modules by removing checks
2014-07-17 15:58:29 -07:00
Stephen Birarda
1cfa4d7990
simplify the sixense find module removing unecessary checks
2014-07-17 15:57:29 -07:00
Stephen Birarda
45f4e033f3
fix the LibOVR find module to grab a util header
2014-07-17 15:55:10 -07:00
Stephen Birarda
e7269e809e
allow use of debug/release leapmotion library with select_library_configurations
2014-07-17 15:41:47 -07:00
Stephen Birarda
03a052d89c
add debug/release linking to sixense via select_library_configurations
2014-07-17 15:27:55 -07:00
Stephen Birarda
074d7f40bb
add dynamic selection of debug or release for oculus libraries
2014-07-17 15:10:32 -07:00
Brad Hefta-Gaub
437e3efbc2
Merge pull request #3179 from wangyix/quick_audio_PR
...
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
2014-07-17 11:44:05 -07:00
wangyix
cd8d52c6f8
case statement style fix
2014-07-17 09:24:54 -07:00
Brad Hefta-Gaub
87ff6b9012
Merge pull request #3178 from Atlante45/activity_logger_on_off_option
...
Activity logger on off option
2014-07-17 08:53:47 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
wangyix
e557ba8052
removed space
2014-07-16 18:06:55 -07:00
Atlante45
6cb5483c21
Added send data option to prefs
2014-07-16 17:56:29 -07:00
samcake
dd9327018b
Merge branch '19734' of https://github.com/samcake/hifi into 19734
2014-07-16 17:55:42 -07:00
samcake
e0e7b03841
Merge pull request #1 from AndrewMeadows/thermonuclear
...
merge and warnings cleanup
Thanks Andrew !
2014-07-16 17:46:30 -07:00
wangyix
8775d22765
re-added calculated desired frames to domain page stats
2014-07-16 17:44:49 -07:00
wangyix
397e6c8b13
renamed a function
2014-07-16 17:34:48 -07:00
wangyix
8763b39393
changed format label string a bit
2014-07-16 17:30:18 -07:00
samcake
d668f259f9
Merge branch 'gh-pages', commit 'refs/pull/1/head' of https://github.com/samcake/hifi ; branch 'thermonuclear' of https://github.com/AndrewMeadows/hifi into 19734
2014-07-16 16:03:43 -07:00
wangyix
6764ace8eb
droppable silent packets are added for dropped packets;
...
_currentJitterBufferFrames replaced with moving average of frames
available. Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
2014-07-16 14:41:24 -07:00
Brad Hefta-Gaub
cc7da35722
Merge pull request #3177 from Barnold1953/OculusSDK
...
Use deltaTIme to ensure sand updates are somewhat uniform
2014-07-16 12:36:52 -07:00
Atlante45
5dca794322
On/Off for activity logger
2014-07-16 12:22:27 -07:00
barnold1953
44cf662904
Use deltaTIme to ensure sand updates are somewhat uniform
2014-07-16 12:06:48 -07:00
Brad Hefta-Gaub
8a1484ce68
Merge pull request #3174 from wdings23/fix_new_avatar_light
...
Fix new avatar light
2014-07-16 12:03:21 -07:00
Brad Hefta-Gaub
3dfb5030c5
Merge pull request #3175 from Barnold1953/OculusSDK
...
Two new example scripts
2014-07-16 12:02:37 -07:00
Brad Hefta-Gaub
a6af882f2d
Merge pull request #3176 from Atlante45/fix_edit_properties
...
Fix edit properties
2014-07-16 12:02:22 -07:00
Atlante45
60f242118e
Code cleanup
2014-07-16 11:52:12 -07:00
barnold1953
77b2dd695d
fixed header
2014-07-16 11:34:31 -07:00
Atlante45
f960b4fff3
new windows JS interface
2014-07-16 11:32:18 -07:00
barnold1953
4483c7dc6b
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-16 11:24:32 -07:00
barnold1953
8b911c3e2c
Finished up basic falling sand example script
2014-07-16 11:21:58 -07:00
barnold1953
f6a184fc2b
Bug fixes in fallingSand
2014-07-16 11:10:59 -07:00
TonyPeng
7aae85833b
Take out getter for avatar's hash key.
2014-07-16 10:08:49 -07:00
TonyPeng
7e23ca1738
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_new_avatar_light
2014-07-16 09:46:15 -07:00
TonyPeng
317a08fc60
Draw local light stats.
2014-07-16 09:44:05 -07:00
AndrewMeadows
e7bc2a37e8
Merge pull request #3173 from ey6es/metavoxels
...
More metavoxel progress: basic scriptability, fix for subdivisions, threading fixes.
2014-07-16 09:22:13 -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
2d4134afaf
Provide basic conversions to/from SharedObjectPointer (still have to work out
...
how to handle reference counting correctly).
2014-07-15 17:58:31 -07:00
Andrzej Kapolka
a13d8559e6
Better scoping.
2014-07-15 16:55:52 -07:00
Andrzej Kapolka
ce0210bf04
The weak shared object hash can be accessed by multiple threads, so it must
...
be locked.
2014-07-15 16:52:17 -07:00
Andrzej Kapolka
469e31cc05
Script bindings for QColor.
2014-07-15 16:44:02 -07:00
TonyPeng
90d56bc108
Use the number of local lights to update new avatars instead of checking hashes.
2014-07-15 16:10:13 -07:00
Andrzej Kapolka
ebcb8d00d6
Unfortunately, the early test for subdivision doesn't work, which means that,
...
for now, we need to traverse the entire tree to find subdivided nodes. To be
revisited.
2014-07-15 15:47:31 -07:00
Brad Hefta-Gaub
8128214144
Merge pull request #3172 from wangyix/quick_audio_PR
...
removed SIMD instructions in AudioMixer; removed IsNaN check for _nextOutputTrailingLoudness
2014-07-15 15:20:13 -07:00
wangyix
abca4661f4
removed space
2014-07-15 14:48:26 -07:00
wangyix
d5a30ff6ee
removed SIMD stuff from AudioMixer for all builds
2014-07-15 14:43:08 -07:00
Brad Hefta-Gaub
fc28279afe
Merge pull request #3170 from wdings23/master
...
Allow script to set light properties for all the avatars
2014-07-15 14:07:26 -07:00
Andrzej Kapolka
e2c8bdbdbe
Create new nodes on subdivision.
2014-07-15 13:22:50 -07:00
wangyix
871aa2790a
forgot unused variable
2014-07-15 12:24:28 -07:00
wangyix
828410b7d6
removed isNan check for _nextOutputTrailingLoudness
2014-07-15 12:23:54 -07:00
wangyix
a1b2bf59e9
disabled SIMD adds in AudioMixer for windows
2014-07-15 12:23:02 -07:00
