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

5655 commits

Author SHA1 Message Date
Stephen Birarda
1ec48b5999 fix a dumb elseif in custom find glut module 2014-03-07 12:16:09 -08:00
Stephen Birarda
dbf8021ccd include GLUT and OpenGL dirs as system includes 2014-03-07 12:07:19 -08:00
Stephen Birarda
cabbfb9a9e fix typos in updated sixense and oculus READMEs 2014-03-07 10:36:19 -08:00
Stephen Birarda
68c5d72a0f update sixense and oculus readme to suggest use of HIFI_LIB_DIR 2014-03-07 10:30:43 -08:00
Stephen Birarda
3b06bbd88d move sixense directory to lowercase, have find module look in env dir 2014-03-07 09:59:24 -08:00
Stephen Birarda
a364655f63 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-07 09:40:50 -08:00
ZappoMan
92d39b3c47 Merge pull request #2229 from birarda/master 
make LibOVR (for oculus) an external dependency
 2014-03-06 22:43:32 -08:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
Stephen Birarda
b91a55d89d tweak the GLEW and glut modules to be more hifi specific 2014-03-06 17:53:07 -08:00
Stephen Birarda
594d43db84 add a find module for glew and tweak glm module 2014-03-06 17:41:14 -08:00
Stephen Birarda
cfc55c0435 cleanup interface CMakeLists for freeglut and GLEW finding 2014-03-06 17:23:56 -08:00
Stephen Birarda
d64be26e41 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-06 17:12:08 -08:00
Stephen Birarda
0f5fbb5fab pull out glew and freeglut so they can be external dependencies 2014-03-06 17:09:59 -08:00
Andrzej Kapolka
c5ab32235f Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-06 17:09:24 -08:00
Andrzej Kapolka
3adea84b81 Basic joint data sending. Closes #2166. 2014-03-06 17:07:29 -08:00
Stephen Birarda
d51deca0fe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 16:45:41 -08:00
Stephen Birarda
1ef780c6cb make headers coding standard compliant 2014-03-06 16:24:58 -08:00
Stephen Birarda
7ef882c525 make sure InterfaceConfig is included before Qt headers 2014-03-06 16:14:18 -08:00
Stephen Birarda
8cbdf5d94a Merge branch 'master' of https://github.com/highfidelity/hifi into resources 2014-03-06 15:49:45 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
Stephen Birarda
c2faf86201 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 15:24:37 -08:00
Stephen Birarda
4a1cb63d7b remove an blank line in Application headers 2014-03-06 15:09:35 -08:00
Stephen Birarda
87d908a3bc resolve conflicts on merge with upstream master 2014-03-06 15:03:03 -08:00
Stephen Birarda
2d10995d01 Merge pull request #2219 from ZappoMan/cruft_removal 
Fix Crash and Cruft Removal
 2014-03-06 15:01:31 -08:00
Stephen Birarda
721047234c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:53:57 -08:00
Stephen Birarda
5373cbbb9b Merge pull request #2228 from josecpujol/fix_2198 
Changed the up vector for computing the scale factor: it failed when
 2014-03-06 14:49:13 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Stephen Birarda
636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:45:02 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Stephen Birarda
1bcb595f57 add missing interface config includes for windows 2014-03-06 13:52:06 -08:00
Stephen Birarda
04807dd5d1 include cstdio for snprintf call in BandwidthDialog 2014-03-06 13:31:08 -08:00
Jose Carlos
8e81c4c467 Changed the up vector for computing the scale factor: it failed when 
there was a roll in the view
 2014-03-06 21:49:36 +01:00
Stephen Birarda
06743f771f remove a double InterfaceConfig incldue in AmbientOcclusionEffect 2014-03-06 12:49:01 -08:00
Stephen Birarda
b670859aaa reference SharedUtil from LogDialog as a library header 2014-03-06 12:46:06 -08:00
Stephen Birarda
820dc7f45f include cstdio for sprintf call 2014-03-06 12:41:25 -08:00
Stephen Birarda
e7b166a304 Revert "include InterfaceConfig before Application to fix win build" 
This reverts commit dde2b199c9.
 2014-03-06 12:35:20 -08:00
Stephen Birarda
dde2b199c9 include InterfaceConfig before Application to fix win build 2014-03-06 12:14:14 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
c737283935 qrc references should only use a single slash 2014-03-06 10:45:47 -08:00
Stephen Birarda
94a0db04f9 don't copy resources into OS X bundle 2014-03-06 10:41:44 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
cc554c53f1 use Qt Resource System to compile in resources 2014-03-06 10:25:15 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
ZappoMan
d5c18a54fa removed dead code 2014-03-06 01:32:58 -08:00
ZappoMan
a887baf081 fix warning 2014-03-05 21:22:08 -08:00
ZappoMan
13985f8149 fix crash in Menu.removeSeparator() if the menu item doesn't exist or isn't a separator 2014-03-05 21:17:25 -08:00
ZappoMan
7a8d26247a remove piemenu 2014-03-05 21:03:32 -08:00
Andrzej Kapolka
82011905be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 18:10:55 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Andrzej Kapolka
ad25455f86 Track hysteresis for next model separately, but just in case, don't use 
recursion to fall back on hysteresis value.  Closes #2209.
 2014-03-05 18:06:14 -08:00