Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:33:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21017 commits 75 branches 59 tags 1.2 GiB
Commit graph

419 commits

Author SHA1 Message Date
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
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c use shared dependency linking macro in hifi projects 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1 get past assignment-client build after cmake auditing 2014-08-08 13:17:53 -07:00
Stephen Birarda
9a50532b1f bubble up sub dependencies to link_hifi_library 2014-08-08 13:17:52 -07:00
Ryan Huffman
ffb178cb43 Add SpeechRecognizer 2014-08-01 13:44:06 -07:00
Thijs Wenker
11b1425196 Windows requires ws2_32.lib for LIBOVR 0.4 2014-07-31 22:51:23 +02:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
Stephen Birarda
5bc42b9d1c add back the lost QXMPP_STATIC definition 2014-07-24 17:02:30 -07:00
Stephen Birarda
5cbd1492f2 more Cmake cleanup to grab externals 2014-07-24 15:09:41 -07:00
Stephen Birarda
1d78427e6a only override root dir for interface externals if they don't exist 2014-07-24 14:09:49 -07:00
Stephen Birarda
4cf27a0099 check in sixense not Sixense 2014-07-23 17:44:38 -07:00
Stephen Birarda
5c955ca656 fix faceshift definition 2014-07-22 14:48:51 -07:00
Stephen Birarda
e060693856 remove faceshift from repository, make external dependency 2014-07-18 13:54:44 -07:00
Stephen Birarda
9e83040fb4 more find module standardization and cleanup 2014-07-18 10:20:12 -07:00
Stephen Birarda
e619393ac0 link to GLEW_LIBRARIES instead of GLEW_LIBRARY in interface CMakeLists 2014-07-18 10:12:52 -07:00
Stephen Birarda
b0864b01de cleanup the FindPrioVR module and fix GLUT include 2014-07-18 10:05:58 -07:00
Stephen Birarda
cb384ac01b final repairs to LibOVR for multiple include folders 2014-07-17 17:24:47 -07:00
Stephen Birarda
3fad0e6ac8 cleanup qxmpp find module, use select_library_confgurations 2014-07-17 16:49:17 -07:00
Stephen Birarda
68f9334628 cleanup Faceplus and Faceshift find modules, fix for OVR stitched include 2014-07-17 16:37:10 -07:00
Stephen Birarda
ffb0ea30f8 Merge branch 'master' of https://github.com/highfidelity/hifi into select-library 2014-07-17 16:12:24 -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
Stephen Birarda
cebd379b68 don't pass OpenSSL libraries as string 2014-07-17 14:47:45 -07:00
Stephen Birarda
0c8c4a2cf9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 11:08:35 -07:00
Stephen Birarda
29504325d0 add a tweaked FindOpenSSL module and link and include it in interface 2014-07-16 10:52:53 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
Andrew Meadows
8ffc3aa73d merge upstream/master into andrew/thermonuclear (AKA samcake/19734) 
Conflicts:
	interface/src/Application.cpp
 2014-07-14 09:10:27 -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
samcake
f179b0e9ca Merge remote-tracking branch 'origin/master' into 19734 
Conflicts:
	cmake/modules/FindLeapMotion.cmake
	interface/CMakeLists.txt
	interface/src/devices/Leapmotion.h
 2014-07-08 12:43:32 -07:00
Stephen Birarda
d1afe127c3 updates to RtMidi find module to look for static or dynamic lib 2014-07-08 12:06:43 -07:00
samcake
f5c690cc8d Add Leapmotion support for Apple build 
- Add LEapmotion support in the CMake files
- fix a template syntax in DeviceHEader not compiling on mac
- add a missing #ifdef protection in Leapmotion
 2014-07-07 09:32:46 -07:00
samcake
abacefa723 Merge remote-tracking branch 'upstream/master' into 19734 
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
 2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13 Merge branch 'master' of https://github.com/highfidelity/hifi into 19734 2014-07-05 18:10:59 -07:00
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
Stephen Birarda
f389e3a6da resolve conflicts on merge with upstream master 2014-07-01 11:02:25 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
samcake
fe03743163 Revert "Revert "Add LeapMotion SDK support"" 
This reverts commit 8ce145085b3783782fafd051becbb0e339d5dfa1.
 2014-07-01 03:15:23 -07:00
samcake
6b549a5269 Revert "Add LeapMotion SDK support" 
This reverts commit 291c446c28.
 2014-07-01 03:15:21 -07:00
barnold1953
67c5281205 Fixed CMake for oculus. Gave Oculus its own camera for minimum latency. 2014-06-26 17:10:53 -07:00
ZappoMan
d25ba66b21 more Models->Entities renaming 2014-06-26 17:04:10 -07:00
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
samcake
29407d5858 Revert "Add LeapMotion SDK support" 
This reverts commit 291c446c28.
 2014-06-11 00:10:26 -07:00
samcake
291c446c28 Add LeapMotion SDK support 
- Add the leapmotion folder in interface/external
- Add the "FindLeapMotion.cmake" file in cmake
- Add the first iteration of the class LeapMotionManager.h and .cpp in
the interface/devices folder
- Tested only on windows  7 so far
 2014-06-10 16:40:04 -07:00
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Stephen Birarda
e6fa1c55db assume we are using a Qt build without bearer management 2014-05-16 17:06:17 -07:00
Andrzej Kapolka
6dd08ca1bf Working on joystick support using SDL. 2014-05-15 17:09:28 -07:00
Philip Rosedale
186f7766fc Merge pull request #2856 from ZappoMan/modelserver 
Animation Support in Models
 2014-05-14 15:03:49 -07:00
Andrzej Kapolka
e0486b2654 Starting on PrioVR integration. 2014-05-12 15:25:25 -07:00
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
Atlante45
100c3f8da4 Modify UIs that were using the qrc 2014-04-11 11:59:23 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
68c445e718 link GnuTLS to targets linking the networking library 2014-04-10 10:00:10 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Andrzej Kapolka
98011da1ef Starting on Faceplus integration. 2014-04-08 17:07:45 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
Andrzej Kapolka
840847cf54 Don't refer to the QM file. 2014-04-03 11:42:43 -07:00
Andrzej Kapolka
df4fd9df5f Remove translations for now, but use correct translation keys for the only 
translations we had (days/weeks/etc.)
 2014-04-03 11:30:06 -07:00
Stephen Birarda
6c08e2a407 add option for domain-server to enforce DTLS 2014-03-31 15:06:58 -07:00