Brad Hefta-Gaub
e314fa1fc3
Merge pull request #3652 from ctrlaltdavid/19976
...
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
2014-10-29 20:46:12 -07:00
Andrew Meadows
4c3cdf5b7a
move stuff out of shared and into physics library
2014-10-28 13:51:45 -07:00
David Rowe
adf168b7ea
Remove ATL build dependency for Windows speech recognizer
2014-10-28 11:14:45 -07:00
Brad Hefta-Gaub
4e7e9641f0
Merge pull request #3673 from birarda/lobby
...
initial groundwork for lobby interface
2014-10-28 08:48:33 -07:00
Sam Gateau
fd514ccfc9
Fixed the cmake so if NSIGHT is not available then no problem
2014-10-27 14:47:31 -07:00
Stephen Birarda
d38dd2c53a
repairs for recursive source files, move HF meta events to SE
2014-10-27 14:18:23 -07:00
Stephen Birarda
0ddf665b86
add an HFMetaEvent class as super class for meta events
2014-10-27 12:56:48 -07:00
Sam Gateau
ff44a460d6
Add NSIGHT Profiliing capability
2014-10-27 11:40:52 -07:00
David Rowe
5f91f583e8
Merge branch 'master' into 19976
...
Conflicts:
interface/CMakeLists.txt
2014-10-24 20:34:45 -07:00
David Rowe
f373719f02
Don't include speech recognition if building with Visual Studio Express
2014-10-24 20:12:23 -07:00
Sam Gateau
80a87b3b44
framerate is as fast as the display can go
2014-10-24 17:50:31 -07:00
David Rowe
8fb1d22646
Fix indentation in CMake file
2014-10-24 17:25:07 -07:00
David Rowe
b32b82207b
Add include directory for Windows ATL
2014-10-24 17:01:01 -07:00
David Rowe
38524b3349
Merge branch 'master' into 19976
2014-10-24 15:43:55 -07:00
David Rowe
844be60f18
Fix CMake to find ATL on Windows build PC
2014-10-23 14:34:23 -07:00
Atlante45
ad2eb08964
Correctly link in cmake
2014-10-22 13:11:45 -07:00
Atlante45
ccc8e0d876
Statically link gverb
2014-10-22 12:56:44 -07:00
Atlante45
5854036296
cmake fix for ubuntu
2014-10-20 16:02:59 -07:00
David Rowe
7566b7e546
Add SpeechRecognizer.h and .cpp to Windows builds
2014-10-20 13:26:51 -07:00
Atlante45
86b87770c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-17 16:50:19 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
Atlante45
5d146a00e7
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
...
Conflicts:
interface/CMakeLists.txt
2014-10-16 15:21:34 -07:00
AndrewMeadows
4fbc589606
Merge pull request #3598 from birarda/domain-tunnel
...
initial pass at using keypairs for username verification for basic domain-server ACL
2014-10-16 10:49:03 -07:00
Stephen Birarda
fcd73858b8
remove Faceplus as a face tracker option
2014-10-15 15:13:52 -07:00
Atlante45
954be926e1
Fix cmake
2014-10-14 15:48:43 -07:00
Stephen Birarda
912512936e
add RSAKeypairGenerator to generate a 2048-bit keypair
2014-10-14 11:36:40 -07:00
NextPrior
a0a5530641
Initial reverb implementation
...
Conflicts:
interface/CMakeLists.txt
interface/src/Audio.cpp
interface/src/Audio.h
libraries/script-engine/src/ScriptEngine.cpp
2014-10-13 18:13:51 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
Ryan Huffman
762cc71d31
Update to SDL2
2014-10-10 17:03:10 -07:00
samcake
9f0936de53
Improve the TextRenderer::draw(), first step
...
- Introduce a managed Buffer for data to be used on the GPU. THis is the first type of resource (second will be texture) that we plan to use in the graphics engine in the long term. this is an api agnostic replacement to QGLBuggerObject
It's in the new file gpu/Resource.h(.cpp)
- Add two gpu::Buffers in the TextRenderer that collect all the glyph vertices (coords + texcoords + color) during the for loop on the string characters of the TextRenderer::draw(). Right now the text glyphs are then drawn in one draw call (and not one per character) at the end of the function.
THe step 2 plan is to keep on collecting all the glyphs from all the TextRenderer::Draw() issued during one frame and to draw all of them in a single drawcall. We decided to split the task in 2 so it's easier to review.
2014-10-09 10:17:50 -07:00
Stephen Birarda
138e57bcd8
don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD
2014-10-02 11:16:25 -07:00
Stephen Birarda
172ee3d7dc
add failsafe for hydra load, look in app frameworks folder
2014-10-02 09:06:29 -07:00
Stephen Birarda
f7a17b7dec
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
2014-09-29 12:58:01 -07:00
Stephen Birarda
900daf48eb
initial working connection of an xbox gamepad
2014-09-23 14:48:44 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
Ryan Huffman
6b1671c598
Add AppKit as a dependency in interface CMakeLists.txt
2014-08-19 22:17:09 -07:00
Ryan Huffman
284c4d8ac0
Merge branch 'master' of github.com:highfidelity/hifi into 19864
...
Conflicts:
interface/CMakeLists.txt
2014-08-19 11:59:53 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
Ryan Huffman
bf9e887cee
Fix SpeechRecognizer in CMakeLists
2014-08-13 16:16:11 -07:00
Ryan Huffman
a2e7c9b75c
Update build for speechRecognizer
2014-08-13 14:53:26 -07:00
Stephen Birarda
4dce4c4919
link to ws2_32.lib if LibOVR is being linked to
2014-08-12 15:23:12 -07:00
Stephen Birarda
00087e81d8
remove a line of debug that shouldn't have made its way in
2014-08-12 14:44:49 -07:00
Stephen Birarda
a8e17e19a4
resolve conflicts on merge with upstream master
2014-08-12 14:43:30 -07:00
Leonardo Murillo
e12cf9015f
Merge pull request #3271 from birarda/take-out-the-trash
...
allow CL specific that an optional external be required
2014-08-12 14:30:17 -07:00
Thijs Wenker
87abc6b66a
Merge branch 'master' of https://github.com/worklist/hifi
2014-08-12 13:17:32 +02:00
Stephen Birarda
cadfaab770
fix order now that I know my ABCs
2014-08-11 09:58:21 -07:00
Stephen Birarda
2469d958d6
include CoreFoundation for Audio.cpp defaultAudioDeviceForMode
2014-08-11 09:57:13 -07:00
Stephen Birarda
405e79fe6d
allow command line specification that an external be required
2014-08-11 09:51:36 -07:00
Stephen Birarda
2badf9ab1a
don't quote linked ZLIB and OpenSSL libs for interface
2014-08-08 13:42:07 -07:00
Stephen Birarda
a99b19d28a
make Qt5 and ZLIB required finds, add OpenSSL to interface
2014-08-08 13:17:54 -07:00
