Thijs Wenker
|
8c7099a0bb
|
changed "Load Scripts" label to be better understandable
|
2015-01-13 01:09:28 +01:00 |
|
Thijs Wenker
|
336a96bd48
|
Merge branch 'master' of https://github.com/worklist/hifi into 20255
|
2015-01-13 00:44:39 +01:00 |
|
Thijs Wenker
|
e4fd027d15
|
"load script from URL" button in Running scripts window
|
2015-01-12 00:49:41 +01:00 |
|
Thijs Wenker
|
8feb51013b
|
running script window treeview fully works
|
2015-01-12 00:41:38 +01:00 |
|
David Rowe
|
968a34f966
|
Add instructions for building with SDL2
|
2015-01-11 11:44:16 -08:00 |
|
Thijs Wenker
|
d84a65a5f9
|
running scripts list -> treeview initial
|
2015-01-10 01:29:06 +01:00 |
|
Atlante45
|
05d2887c94
|
Move Torso twist to HeadData with Lean
|
2015-01-09 11:15:01 -08:00 |
|
Philip Rosedale
|
285e588266
|
Merge pull request #4072 from Atlante45/network_replies_cleanup
Windows crash fix
|
2015-01-09 07:42:36 -08:00 |
|
Atlante45
|
891d8d5abf
|
Removed unecessary foreach
|
2015-01-08 18:22:25 -08:00 |
|
Atlante45
|
1c4903c346
|
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
|
2015-01-08 16:33:01 -08:00 |
|
Atlante45
|
e73f8baf93
|
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
|
2015-01-08 11:54:54 -08:00 |
|
Atlante45
|
4157a3ca40
|
Remove lean from head rotation
|
2015-01-08 11:33:14 -08:00 |
|
David Rowe
|
198226450a
|
Suppress warnings about inconsistent DLL linkage of lrintf in Windows
This warning in Windows builds is due to redefinition of lrintf in gverb
library's ladspa-util.h file.
|
2015-01-08 11:26:32 -08:00 |
|
Atlante45
|
0bae05b924
|
Remove chat message
|
2015-01-08 11:25:53 -08:00 |
|
Andrew Meadows
|
25b9b50468
|
Merge pull request #4065 from ZappoMan/voxelEctomy
fix some warnings and remove more references to voxels
|
2015-01-08 08:07:06 -08:00 |
|
Philip Rosedale
|
a04ce68fba
|
Merge pull request #4063 from ZappoMan/restoreLookAt
restore camera lookAt and keepLookingAt features
|
2015-01-07 16:31:07 -08:00 |
|
ZappoMan
|
cc19c15c17
|
remove more references to voxels
|
2015-01-07 16:09:56 -08:00 |
|
ZappoMan
|
91351d7700
|
fix warnings
|
2015-01-07 16:09:26 -08:00 |
|
ZappoMan
|
806e691bbf
|
restore camera lookAt and keepLookingAt features
|
2015-01-07 13:41:07 -08:00 |
|
Thijs Wenker
|
2690241eb6
|
fix to add GLEW debug library
|
2015-01-07 22:08:01 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
ZappoMan
|
fb68037b74
|
more removal of immediate mode
|
2015-01-06 15:51:39 -08:00 |
|
ZappoMan
|
d796ebf632
|
migrate circle overlays to use renderVertices()
|
2015-01-06 14:43:42 -08:00 |
|
ZappoMan
|
1bfce7d876
|
more removal of immediate mode
|
2015-01-06 14:14:13 -08:00 |
|
ZappoMan
|
0d63391be8
|
formatting
|
2015-01-06 12:31:42 -08:00 |
|