Andrzej Kapolka
3b7945fc14
Gather and print out some stats after loading the data.
2014-07-09 15:52:23 -07:00
Stephen Birarda
33e42ae272
Merge pull request #3149 from birarda/master
...
add two new concert cameras to examples
2014-07-09 15:51:56 -07:00
Stephen Birarda
d412e21008
add two new concert cameras to examples
2014-07-09 15:51:37 -07:00
wangyix
81e168f657
added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg
2014-07-09 15:38:03 -07:00
David Rowe
f2d49fa6a1
Rename focus indicators menu item and default to off
2014-07-09 15:12:29 -07:00
Brad Hefta-Gaub
1f00923146
Merge pull request #3148 from AndrewMeadows/inertia
...
improved performance stats API
2014-07-09 15:07:46 -07:00
Andrew Meadows
9ce6844e9d
fix accidental broken class definition
2014-07-09 14:39:08 -07:00
Andrew Meadows
63bcee0229
fix whitespace formatting
2014-07-09 14:33:09 -07:00
Andrew Meadows
f463099d16
add "simulate" stat name to Avatar::simulate()
2014-07-09 14:31:47 -07:00
Andrzej Kapolka
f9036dbaec
Lock the attribute mapping, since it can be accessed from multiple threads.
2014-07-09 14:22:33 -07:00
Andrzej Kapolka
efe443e2ff
Very basic metavoxel save/load.
2014-07-09 14:01:46 -07:00
Andrew Meadows
6ffa09f9e6
modified scope of devices stats
2014-07-09 13:58:54 -07:00
TonyPeng
ef4b95c6e0
Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays.
2014-07-09 13:27:42 -07:00
Andrew Meadows
3d6752ad90
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2014-07-09 12:52:00 -07:00
barnold1953
a2225da13d
Code cleanup
2014-07-09 12:11:06 -07:00
wangyix
a8cf199256
added format labels in interface for new audio stats
2014-07-09 12:08:41 -07:00
TonyPeng
56eadcb0dc
Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays.
2014-07-09 12:05:34 -07:00
barnold1953
e64f34a257
Separated mouse and controller pointers
2014-07-09 12:03:32 -07:00
wangyix
d03d3ef817
new auidostreamstats displayed in interface, domain page stats updated
2014-07-09 11:59:50 -07:00
Andrew Meadows
d26585728b
Improved stat accumulation and context names
2014-07-09 11:53:53 -07:00
Andrew Meadows
d214998d1a
enforce coding standard: explicit casts
2014-07-09 11:53:09 -07:00
Philip Rosedale
7bcd7e03a4
Merge pull request #3147 from Barnold1953/master
...
Fixed full screen mirror mode for non oculus
2014-07-09 11:41:56 -07:00
Brad Hefta-Gaub
170aa3e659
Merge pull request #3146 from ctrlaltdavid/default_ui_on
...
Default UI to "on"
2014-07-09 11:41:45 -07:00
David Rowe
527f6b2a3f
Fix User Interface menu item string
2014-07-09 11:32:38 -07:00
barnold1953
862f311306
Fixed full screen mirror mode for non oculus
2014-07-09 11:29:33 -07:00
David Rowe
603ca02ef9
Default UI to "on"
2014-07-09 11:21:16 -07:00
barnold1953
d044af1400
Made it so you can only select in a 180 degree radius with oculus
2014-07-09 11:12:02 -07:00
Atlante45
a76ebae771
Added typed array unit test
2014-07-09 10:28:50 -07:00
Atlante45
28438d66b1
Fixed exceptions/endian issues with DataViews
2014-07-09 10:27:23 -07:00
Atlante45
49302b2340
Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays
2014-07-09 09:49:34 -07:00
wangyix
54e8ed5e11
added MovingMinMaxAvg and unit test; added additional stats to AudioStreamStats struct
2014-07-09 09:41:49 -07:00
Aleric Inglewood
801be7edee
Stop QMenuBar to steal keyboard focus when pressing Alt key in Linux.
2014-07-09 13:55:38 +02:00
samcake
d6104e5d48
Final cleaning, ready to publish
...
- Removed the LEapmotion sdk from the external folder and validated that
it can be installed in the "HIFI_LIB_DIRS", fixed the
FIndLeapmotion.cmake for that
- Cleared the HandTracker class not needed
Ready for publish !
2014-07-09 01:02:56 -07:00
samcake
3ecaaa5a85
After HIfi visit, Fix skinning from javascript
...
- Understood the skinning mechanism from an absolute transform in model
space that need to use a call to
//JointState::setRotationFromBindFrame(rotation, priority);
- This is not available from the javascript MyAvatar interface yet
- now require LeapMOtion SDK2.0.3 to support arms
2014-07-08 23:57:37 -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
f8185dec75
removed some debug logs
2014-07-08 22:26:11 -07:00
Philip Rosedale
c50d9ae3e4
Hand low velocity filter as a menu option
2014-07-08 22:22:27 -07:00
David Rowe
305623d8a7
Add option to hide focus indicators
2014-07-08 21:37:08 -07:00
Clément Brisset
e648c3475b
Merge pull request #3139 from PhilipRosedale/master
...
Another improvement to clapping to match animation pace with keystrokes
2014-07-08 21:34:04 -07:00
Philip Rosedale
32eb51a224
Merge pull request #3141 from ey6es/metavoxels
...
Fixes, congestion control for metavoxel streaming.
2014-07-08 21:30:13 -07:00
Brad Hefta-Gaub
90d720face
Merge pull request #3142 from mpursley/master
...
adding "export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.2.1/lib/cmake" for qt5.2.1
2014-07-08 21:12:10 -07:00
David Rowe
51f7e8904d
Integrate UI toggling menu item and Hydra UI toggling
...
They work together and both fade the UI in / out.
2014-07-08 21:04:30 -07:00
David Rowe
1e7a18e625
Guard _framebufferObject deletion
2014-07-08 21:02:32 -07:00
Philip Rosedale
b2912552f6
switched to better sounds for clapping
2014-07-08 21:00:02 -07:00
barnold1953
b5a9f50ae7
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-08 17:15:35 -07:00
barnold1953
f8fdd2d11f
Minor adjustments
2014-07-08 17:15:11 -07:00
Philip Rosedale
a7ad803a7f
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-08 17:09:50 -07:00
Atlante45
4b2e4b7b28
Some type modifications in DataViewPrototype
2014-07-08 16:59:27 -07:00
Philip Rosedale
272e8c6e97
Merge pull request #3140 from ctrlaltdavid/script_error_reporting
...
Fix script errors not being reported
2014-07-08 16:56:26 -07:00
