Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 07:21:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3296 commits 25 branches 0 tags 1.1 GiB
Commit graph

87 commits

Author SHA1 Message Date
Stephen Birarda
200d81e0eb DRY up resource subdir copying for OS X bundle 2013-05-22 14:40:01 -07:00
Stephen Birarda
62cf452e3d non-DRY fix for correct copy of resources for OS X bundle 2013-05-22 13:16:55 -07:00
Stephen Birarda
910683c047 remove an extra space 2013-05-21 15:43:29 -07:00
Stephen Birarda
d2c2150b8f include QtGui dir with isystem flag to remove warning 2013-05-21 15:39:57 -07:00
Stephen Birarda
a2f8d8ae25 break audio out of shared into its own library 2013-05-16 13:00:40 -07:00
birarda
ff6ce63a31 Merge pull request #311 from birarda/master 
fix casing of PORTAUDIO_ROOT_DIR
 2013-05-14 12:13:23 -07:00
Stephen Birarda
306d2a4b98 casing is important for UNIX 2013-05-14 12:12:36 -07:00
Andrzej Kapolka
c9b688b876 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:56:36 -07:00
Stephen Birarda
c117d62532 fix old reference to LODEPNG_LIBRARY 2013-05-14 11:54:35 -07:00
Andrzej Kapolka
c6ce992332 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:49:27 -07:00
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Andrzej Kapolka
174fdb8109 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:32:43 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Stephen Birarda
4c2b729047 assume that oculus will only be from APPLE machines 2013-05-10 15:27:02 -07:00
Stephen Birarda
e15cf93443 Revert "link to LIBOVR_LIBRARY before calling add_executable" 
This reverts commit b2776f25ac.
 2013-05-10 15:05:36 -07:00
Stephen Birarda
b2776f25ac link to LIBOVR_LIBRARY before calling add_executable 2013-05-10 15:03:46 -07:00
Stephen Birarda
7edb7590a7 link the OVR library seperately from the QT_LIBRARIES 2013-05-10 14:54:44 -07:00
Stephen Birarda
a059e44011 resolve conflicts on merge with upstream master 2013-05-10 14:01:52 -07:00
Stephen Birarda
9ee3f889ab Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 14:00:10 -07:00
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's 
unparented, will only appear on OS X) with a test item connected to a slot.
 2013-05-10 12:07:47 -07:00
Stephen Birarda
999ab5cb20 initial setup to connect to oculus and grab sensors 2013-05-09 15:45:09 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
Andrzej Kapolka
7c8a06ed4d Added wrapper classes for shaders/shader programs to ease the process of 
compiling, linking, assigning uniforms, etc.  They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
 2013-05-07 17:40:55 -07:00
Andrzej Kapolka
ccdc1146a2 Removed cut and paste error from CMake file, made a couple variables in 
TextRenderer more descriptive.
 2013-04-30 10:26:47 -07:00
Andrzej Kapolka
068d3d216e Need to commit these, too, for the font rendering change. 2013-04-29 19:12:34 -07:00
Stephen Birarda
a558597b6a complete an initial version of eve that sits at 0,0,0 2013-04-22 13:10:21 -07:00
Stephen Birarda
ed3f308a0e pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM 2013-04-15 16:08:35 -07:00
Stephen Birarda
4702e6ade0 remove the unecessary trailing slash when setting root dir 2013-04-15 14:59:48 -07:00
Stephen Birarda
d0eed92699 add an avatars library and move AvatarAgentData there 2013-04-15 14:51:34 -07:00
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
Stephen Birarda
aff3732052 some light refactoring in interface CMakeLists 2013-04-12 13:29:27 -07:00
Stephen Birarda
b0ff960e37 use MACRO_DIR variable to find glm in root externals dir 2013-04-12 13:20:46 -07:00
Stephen Birarda
67efc12e59 move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
ZappoMan
4364a0e692 moved stuff around to migrate glm to shared 2013-04-11 18:41:12 -07:00
vincent
4f41aab89a last merge without Curl 2013-04-09 22:17:59 +02:00
vincent
56aac7077c changes after merge 2013-04-09 19:12:49 +02:00
Stephen Birarda
320fa9e5c8 link curl to shared library, not interface 2013-04-03 15:14:35 -07:00
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
 2013-04-03 22:44:22 +02:00
tosh
0733f06143 adds cmake support for starfield subdirectory 2013-04-03 22:04:09 +02:00
Stephen Birarda
aa17cc6edc link ALSA after PortAudio for UNIX build 2013-04-02 15:34:10 -07:00
Stephen Birarda
6005629d15 fix framework inclusions in CMakeLists after previous change 2013-04-02 15:27:46 -07:00
Stephen Birarda
757aadf53e changes to CMakeLists to remove double links on OS X 2013-04-02 15:07:04 -07:00
tschw
baa0a6de12 comments out ++(C++) build settings, for now 
in case it needs more than a clean rebuild to compile
the project on recent Xcode - will revisit when I can
ensure things build safely
 2013-04-01 15:33:22 +03:00
tosh
3a55234436 also bumps standard library version for clang (untested) 2013-03-29 22:32:44 +01:00
tosh
8300646b33 allows new C++ standard features 2013-03-29 10:42:36 +01:00
tosh
b4f2b04241 allows qualified inclusion in subdirectories 2013-03-29 10:24:14 +01:00
vincent
83abc571f1 #19197 Create basic visual studio 2013-03-28 18:20:50 +01:00
Stephen Birarda
17904ee069 remove .mm include for interface now that menu is gone 2013-03-27 11:29:13 -07:00
tosh
5de3ec035b leftover changes / minor corrections 2013-03-24 06:30:33 +01:00