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

477 commits

Author SHA1 Message Date
Sam Gateau
9601e09ba9 A simpler way to add the NSIGHT_FOUND define to all the projects depending on GPU 2015-07-29 14:42:24 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
Sam Gateau
661f29924f Clean up the cmakelist to normally onlly do th eminimal linking and include for gl 2015-07-29 13:55:26 -07:00
Sam Gateau
76acbde595 Removing the opengl and glew links from Interface since now coming from gpu lib 2015-07-29 09:54:10 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Marcel Verhagen
32d0513962 The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 
For now without a merge conflict.

Updated the menu name.

Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
 2015-07-27 19:04:49 +02:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Brad Davis
d4e637c5b8 Removing superfluous lighting and naked GL in mirror 2015-07-20 09:36:05 -07:00
Brad Davis
0da8b27fcf Removing unused files 2015-07-18 22:53:43 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
Jenkins Slave Access
981ff2d5fa Enhancing PR installer titles 2015-07-01 14:13:37 -04:00
Leonardo Murillo
3bd0c7bd87 Code Review changes 2015-06-10 14:35:52 -06:00
Leonardo Murillo
1d785c714b Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-09 09:01:50 -06:00
Leonardo Murillo
cefdbc3126 Checkpoint auto updater 2015-06-02 19:32:03 -06:00
Sam Gateau
2ed7aae8d5 merging and updating 2015-05-20 16:50:43 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Stephen Birarda
ec2f54b90a add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Stephen Birarda
63a81bdcb4 remove VISAGE handling in interface CMakeLists 2015-04-17 14:27:58 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Bradley Austin Davis
1a02255033 Remove the console window created when you start interface on win32 platforms 
Fixing cmake typo
 2015-04-06 12:59:44 -07:00
Sam Gateau
c6bd1ee671 drafting the render engine 2015-03-05 16:57:10 -08:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Brad Davis
d838b78df9 Merging from upstream 2015-03-04 21:53:31 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Sam Gateau
66894a8fda Adding the render library that will provide the base rendering engine and scene description 2015-03-03 14:55:26 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Stephen Birarda
38f77190eb remove PrioVR from build files 2015-02-26 17:20:45 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
2f4adbc2f7 also use release icon for RelWithDebInfo 2015-02-23 11:40:38 -08:00
Stephen Birarda
9878a93338 add a definition for shared QXmpp on win 2015-02-23 11:13:10 -08:00
Stephen Birarda
d08f7d6255 check if QXmpp is dynamic or static 2015-02-23 08:24:52 -08:00
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Brad Davis
16feaceab5 Working on oculus build 2015-02-20 09:32:25 -08:00
Stephen Birarda
44f8e599e2 test the possibility that zlib is no longer required 2015-02-19 15:29:28 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
6fc74eb830 fix cmake build type check for interface icon 2015-02-17 14:56:34 -08:00
Stephen Birarda
97fa1412e2 copy dlls beside windows executable for all executables 2015-02-17 14:45:26 -08:00
Stephen Birarda
767601de4f use a cache variable to pass around lib paths 2015-02-17 14:09:26 -08:00
Stephen Birarda
250b25154c test for recursive dll dir search 2015-02-17 13:41:37 -08:00
Stephen Birarda
bc899eaa58 add fixup_bundle step for WIN32 interface 2015-02-17 13:17:23 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00