ZappoMan
|
806e691bbf
|
restore camera lookAt and keepLookingAt features
|
2015-01-07 13:41:07 -08:00 |
|
Chris Collins
|
d15ae92e1e
|
Guitar fix
Guitar position fix
|
2015-01-07 13:40:36 -08:00 |
|
Brad Hefta-Gaub
|
23559743d9
|
Merge pull request #4060 from PhilipRosedale/gun
Added improved gun to /examples
|
2015-01-07 13:16:09 -08:00 |
|
Brad Hefta-Gaub
|
49508733aa
|
Merge pull request #4053 from cozza13/20254
CR for Job #20254 - Additional Script updates
|
2015-01-07 13:14:34 -08:00 |
|
Philip Rosedale
|
84b9d51e90
|
Merge pull request #4059 from AndrewMeadows/bispinor
fix rapid attenuation of angular velocity
|
2015-01-07 13:12:35 -08:00 |
|
Thijs Wenker
|
2690241eb6
|
fix to add GLEW debug library
|
2015-01-07 22:08:01 +01:00 |
|
Philip Rosedale
|
9bf56516e0
|
Added improved gun to /examples
|
2015-01-07 13:02:00 -08:00 |
|
Chris Collins
|
3a75a6f920
|
Minor typo fix
Minor typo fix
|
2015-01-07 12:57:40 -08:00 |
|
Andrew Meadows
|
af9bafae87
|
fix typo
|
2015-01-07 12:48:16 -08:00 |
|
Andrew Meadows
|
1745548665
|
fix rapid attenuation of angular velocity
|
2015-01-07 12:42:50 -08:00 |
|
Brad Hefta-Gaub
|
ddea2c4a68
|
Merge pull request #4058 from huffman/entity-tool-updates
Entity tool updates
|
2015-01-07 12:42:47 -08:00 |
|
Ryan Huffman
|
b471c1fa71
|
Update hotkey for audio stats
|
2015-01-07 12:15:53 -08:00 |
|
Ryan Huffman
|
eafe1ae951
|
Update position of grid-to-avatar to be at the left foot
|
2015-01-07 12:15:36 -08:00 |
|
Ryan Huffman
|
fbdc509428
|
Increase size of url input boxes
|
2015-01-07 12:15:14 -08:00 |
|
Ryan Huffman
|
92fc08fa70
|
Update property list window to only show after selection
|
2015-01-07 12:14:47 -08:00 |
|
David Rowe
|
6c4932f9d0
|
Coding standard
|
2015-01-07 11:24:10 -08:00 |
|
David Rowe
|
40274df279
|
Add downloads information changed event for JavaScript
|
2015-01-07 11:20:46 -08:00 |
|
Andrzej Kapolka
|
1abf111d7f
|
Index fix.
|
2015-01-07 11:19:40 -08:00 |
|
Brad Hefta-Gaub
|
8ad21d61c4
|
Merge pull request #4056 from huffman/audio-buffer-starvation-detection
Audio buffer starvation detection
|
2015-01-07 11:18:34 -08:00 |
|
Chris Collins
|
53f24954e0
|
Updates based on PR comments
Commented out Camera.stopLooking and Camera.keepLookingAt . This can be
put back when we merge back the C++ issue.
|
2015-01-07 11:15:30 -08:00 |
|
Ryan Huffman
|
50fcf4ba8f
|
Remove output buffer starvation log warnings
|
2015-01-07 11:06:36 -08:00 |
|
Ryan Huffman
|
19639367bf
|
Use usecTimestampNow instead of QDateTime::currentMSecsSinceEpoch
|
2015-01-07 11:04:09 -08:00 |
|
Brad Hefta-Gaub
|
476887b7ef
|
Merge pull request #4055 from huffman/fix-overlays
Update setting drawOnHUD and update to write lock for editOverlay
|
2015-01-07 10:56:18 -08:00 |
|
Andrew Meadows
|
d3d80a0b1b
|
Merge pull request #4049 from ZappoMan/gpuStreamizing
Work on removing immediate mode OpenGL from application
|
2015-01-07 10:55:15 -08:00 |
|
Andrew Meadows
|
559ec41bfe
|
Merge pull request #4051 from Atlante45/master
Restored addReverb default arg
|
2015-01-07 10:25:26 -08:00 |
|
Ryan Huffman
|
40f277b630
|
Fix use of dependency manager
|
2015-01-07 10:20:49 -08:00 |
|
Brad Hefta-Gaub
|
a055275469
|
Merge pull request #4057 from birarda/lasagna-not-spaghetti
remove the faceplus find module
|
2015-01-07 10:03:14 -08:00 |
|
Ryan Huffman
|
d113b3f85c
|
Update getAudio() calls to use DependencyManager instead
|
2015-01-07 09:48:41 -08:00 |
|
Stephen Birarda
|
35a69ce049
|
remove the faceplus find module
|
2015-01-07 09:48:12 -08:00 |
|
Ryan Huffman
|
cb80e18ad0
|
Update default detection period to be int
|
2015-01-07 09:47:24 -08:00 |
|
Ryan Huffman
|
a07d92b6ea
|
Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection
Conflicts:
interface/src/Audio.cpp
interface/src/Audio.h
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
|
2015-01-07 09:46:07 -08:00 |
|
Ryan Huffman
|
08776aec9d
|
Add output starve settings to preferences
|
2015-01-07 09:37:17 -08:00 |
|
Ryan Huffman
|
a660e7efed
|
Add output starve values to settings
|
2015-01-07 09:37:03 -08:00 |
|
Ryan Huffman
|
77aecaabd0
|
Remove extra switch output call
|
2015-01-07 09:36:26 -08:00 |
|
Ryan Huffman
|
288e2ee45a
|
Add output buffer starve detection to audio
|
2015-01-07 09:36:14 -08:00 |
|
Chris Collins
|
816e369c08
|
More Script updates
More Script updates
|
2015-01-06 22:32:45 -08:00 |
|
ZappoMan
|
7e8194a3d7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
|
2015-01-06 19:12:01 -08:00 |
|
Ryan Huffman
|
68a9d80ba3
|
Update setting drawOnHUD and update to write lock for editOverlay
|
2015-01-06 18:14:40 -08:00 |
|
Andrzej Kapolka
|
48fb9a27ba
|
Progress on heightfield/voxel interface.
|
2015-01-06 17:55:04 -08:00 |
|
Philip Rosedale
|
3ed5b0e9be
|
Merge pull request #4052 from cozza13/20253
CR for Job #20253 - Fix scripts that still link to highfidelity-public
|
2015-01-06 17:08:51 -08:00 |
|
Chris Collins
|
0a1a64b7e6
|
Script updates and fixes to highfidelity-public
Script updates and fixes to highfidelity-public
|
2015-01-06 17:04:42 -08:00 |
|
Philip Rosedale
|
a600069c65
|
Merge pull request #4048 from cozza13/20251
CR for Job #20251 - Tidy up script within the example folder
|
2015-01-06 16:59:51 -08:00 |
|
ZappoMan
|
e0338dd787
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
|
2015-01-06 16:42:25 -08:00 |
|
Atlante45
|
29839df9fe
|
Restored addReverb default arg
|
2015-01-06 16:35:30 -08:00 |
|
Clément Brisset
|
fb6fb8a38d
|
Merge pull request #4050 from birarda/lasagna-not-spaghetti
put back current address storage in Menu
|
2015-01-06 16:29:52 -08:00 |
|
Stephen Birarda
|
9c191be106
|
use the AddressManager's method to store current address
|
2015-01-06 16:13:06 -08:00 |
|
Stephen Birarda
|
8c8a925085
|
put back current address storage in Menu
|
2015-01-06 16:06:07 -08:00 |
|
Chris Collins
|
c3d151a646
|
Merge branch '20251' into 20253
|
2015-01-06 16:05:06 -08:00 |
|
Stephen Birarda
|
1d7f1de883
|
Merge pull request #4047 from birarda/master
some fixes to domain-server settings
|
2015-01-06 16:04:14 -08:00 |
|
ZappoMan
|
1bc91e7d29
|
removed renderTriangleProxies
|
2015-01-06 16:01:06 -08:00 |
|