Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 22:31:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34821 commits 74 branches 59 tags 1.2 GiB
Commit graph

790 commits

Author SHA1 Message Date
Seth Alves
f1c10f5119 build separate debug and release versions of polyvox library 2015-07-15 13:38:12 -07:00
Seth Alves
3bc182730a build separate debug and release versions of polyvox library 2015-07-15 10:52:38 -07:00
Seth Alves
a71c5cae5f build separate debug and release versions of polyvox library 2015-07-15 10:33:22 -07:00
Seth Alves
443cfc8970 build separate debug and release versions of polyvox library 2015-07-15 10:31:21 -07:00
Seth Alves
fd84893c61 build separate debug and release versions of polyvox library 2015-07-15 09:42:26 -07:00
Seth Alves
316c322118 build separate debug and release versions of polyvox library 2015-07-15 09:36:51 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Brad Davis
9eb15d3d55 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/GLCanvas.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	libraries/render-utils/src/DeferredLightingEffect.cpp
 2015-07-13 12:54:19 -07:00
Brad Davis
0c50cb670a Moving boostconfig folder in IDEs 2015-07-13 12:40:26 -07:00
Brad Davis
0a389a9daa Updating oglplus version and switching to url based dist 2015-07-07 11:11:52 -07:00
Sam Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Seiji Emery
16e7af1848 Reverted macro naming convention 2015-07-02 17:41:38 -07:00
Sam Gondelman
a6cbc09eac reverted to openvr 0.9.1 2015-07-02 12:32:35 -07:00
Sam Gondelman
81efd99ae4 merge with hifi/plugins 2015-07-02 10:13:28 -07:00
Bradley Austin Davis
54bbc841e2 Working on mac compilability 2015-07-01 23:03:33 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Brad Davis
e7f31ec811 Move to latest Oculus SDK 2015-06-27 00:27:22 -07:00
Seiji Emery
e81b0a3c3a Fixed tests for ALL_BUILD 
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).

ALL_BUILD will now succeed.
 2015-06-26 13:31:31 -07:00
Seiji Emery
6e87f44ec7 Merge remote-tracking branch 'upstream/master' 2015-06-24 15:12:57 -07:00
Seiji Emery
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Brad Davis
a5428ae24a Merge remote-tracking branch 'upstream/master' into plugins 2015-06-24 10:39:31 -07:00
Andrew Meadows
1ceed98ca2 Merge pull request #5166 from jherico/64bit 
Enable Windows 64 bit builds
 2015-06-23 17:03:42 -07:00
Brad Davis
9f98547390 Merge branch 'master' into plugins 2015-06-22 13:35:40 -07:00
Seiji Emery
0cc940d433 Modified the build files for external targets so that they longer show up project view in IDEs (which clutters up the view, etc). 
Said files are now buried under hidden/externals; the (phony) build targets still exist and are visible in the target dropdown, but this is filterable (in Xcode, dunno about Visual Studio (just start typing and a filter/search box comes up))
 2015-06-19 21:58:16 -07:00
Brad Davis
d65e5882aa Working on 64 bit builds 2015-06-18 21:44:12 -07:00
Brad Davis
a8d3dc7218 Updating oglplus version 2015-06-17 23:50:38 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
15d214f335 Initial pass at OpenVR 2015-06-12 17:29:05 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -07:00
Stephen Birarda
128b086e82 don't build the polyvox examples 2015-06-12 10:25:34 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Brad Davis
e9587d90c4 Trying to fix linux build 2015-06-09 01:50:32 -07:00
Brad Davis
43bddf23b4 Grabbing correct oglplus commit 2015-06-09 01:03:14 -07:00
Brad Davis
5a1b713160 Fixing texture include error in oglplus 2015-06-09 00:59:17 -07:00
Brad Davis
11bc838be9 Switching to Git for oglplus 2015-06-09 00:48:42 -07:00
Brad Davis
119f37a178 Working on SDK 0.6 2015-06-07 14:34:40 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6 
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
 2015-06-07 01:40:44 -07:00
Brad Davis
f22682fe39 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-06-01 22:59:10 -07:00
Brad Davis
a483dd27ba Trying to get widgets / windows working 2015-06-01 17:31:18 -07:00
Stephen Birarda
94131908fb update polyvox for xcode C++11 build 2015-06-01 14:53:11 -07:00
Brad Davis
912c003d58 Making (most) plugins into a library 2015-05-29 16:49:11 -07:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Brad Davis
1c49dde6f8 Merge branch 'master' into plugins 
Conflicts:
	CMakeLists.txt
 2015-05-28 14:30:19 -07:00
Seth Alves
aefd34f8d6 trying again to get polyvox to build on osx 2015-05-28 06:43:31 -07:00
Seth Alves
24bb17f7b2 trying again to get polyvox to build on osx 2015-05-28 06:36:31 -07:00
Seth Alves
b024bd0ff2 trying again to get polyvox to build on osx 2015-05-27 22:00:20 -07:00
Seth Alves
6a1ea820e7 trying again to get polyvox to build on osx 2015-05-27 21:50:35 -07:00
Seth Alves
1026da18b2 trying again to get polyvox to build on osx 2015-05-27 21:32:20 -07:00
Seth Alves
5b62714ba4 trying again to get polyvox to build on osx 2015-05-27 21:09:48 -07:00
Seth Alves
5e79b03faf trying to get polyvox to build on osx 2015-05-27 20:55:16 -07:00
Seth Alves
f4b7a41006 trying to get polyvox to build on osx 2015-05-27 20:46:50 -07:00
Seth Alves
6711c64cc6 trying to get polyvox to build on osx 2015-05-27 20:20:37 -07:00
Seth Alves
00296faa51 trying to get polyvox to build on osx 2015-05-27 20:00:37 -07:00
Seth Alves
aff82a90ce try, try again 2015-05-27 19:16:50 -07:00
Seth Alves
05cd7fb8c4 update polyvox external source 2015-05-27 18:39:13 -07:00
Seth Alves
25df777132 fix polyfox url 2015-05-27 16:15:58 -07:00
Seth Alves
c933c42b18 move polyvox external source to s3 2015-05-27 15:02:20 -07:00
Seth Alves
1109444c3d attempt to make sure the ray that picks against polyvox entities is long enough 2015-05-27 14:57:12 -07:00
Brad Davis
810db39233 Working on oculus rendering 2015-05-27 12:42:05 -07:00
Seth Alves
7c4b89d917 get polyvox to build on osx 2015-05-27 11:56:57 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Brad Davis
e69362dadc Working on stereo rendering 2015-05-22 17:51:59 -07:00
Brad Davis
ac93d2c721 Working on display plugins 2015-05-21 18:50:11 -07:00
Seth Alves
6a3203475a Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:57:54 -07:00
Seth Alves
0c1ad258f3 update polyvox 2015-05-21 11:57:37 -07:00
Seth Alves
bd94d28075 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:55:17 -07:00
Seth Alves
8e76887101 working on windows build of polyvox 2015-05-21 11:55:13 -07:00
Seth Alves
b74262f2ce update polyvox 2015-05-21 11:53:56 -07:00
Seth Alves
c02b87ad1c update polyvox 2015-05-21 11:09:44 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Bradley Austin Davis
5f12af75bd Tweaking to match master 2015-05-08 11:11:46 -07:00
Bradley Austin Davis
5e821b4447 Updating plugins 2015-05-07 22:32:28 -07:00
Bradley Austin Davis
77a9f7fa2a Merge branch 'plugins_pt1' into plugins 2015-05-06 14:22:13 -07:00
Stephen Birarda
b28e7cc765 handle case where a symlink replaces copy 2015-05-04 17:46:03 -07:00
Stephen Birarda
a24789b721 remove extra space from SetupHifiProject 2015-05-01 16:32:05 -07:00
Brad Davis
ba4ae3762d Working on merging in master 2015-04-30 22:01:03 -07:00
Stephen Birarda
b50545f414 use symlink for DS resources, add AM bandwidth 2015-04-30 13:53:44 -07:00
Stephen Birarda
e8ee9e4b3a try performing copy in PRE_BUILD for VS 2015-04-30 13:42:30 -07:00
Stephen Birarda
3c7f1cc565 add the symlink or copy directory macro 2015-04-30 13:37:15 -07:00
Stephen Birarda
42c40a7164 attempt add of resources to executable sources 2015-04-30 13:32:25 -07:00
Stephen Birarda
f9ac918ff0 add macro to copy directory beside target 2015-04-30 13:10:59 -07:00
Stephen Birarda
38ae3afc82 add a macro for directory copying 2015-04-30 13:06:00 -07:00
Brad Davis
a83616a7dc Don't prevent building on Visual Studio 2015 2015-04-30 10:32:19 -07:00
Stephen Birarda
ec2f54b90a add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -07:00
Seth Alves
34e64e5007 Merge pull request #4650 from birarda/vhacd-external 
add v-hacd as an external project
 2015-04-21 09:44:52 -07:00
Stephen Birarda
cfac4fe9c1 remove the Visage find module 2015-04-17 14:28:41 -07:00
Stephen Birarda
b25d22aa53 use debug/release for IDE handling of V-HACD 2015-04-15 14:38:24 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Stephen Birarda
08b155146a move externals from build-ext inside the build folder 2015-04-15 12:12:21 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master 
use non-persistent settings to avoid lobby crash confusion
 2015-04-02 17:37:24 +02:00
Bradley Austin Davis
4a7fd318c3 Fixing build problem on linux 2015-04-01 18:45:50 -07:00
Stephen Birarda
12cacad8f8 remove a stray message call in cmake file 2015-04-01 18:02:48 -07:00
Bradley Austin Davis
51d3aba71c Restoring SDK install target 2015-04-01 12:10:25 -07:00
Bradley Austin Davis
71233780e9 Pointing to an Oculus SDK build that works on linux (I hope) 2015-04-01 11:26:24 -07:00
Bradley Austin Davis
e3ae6354c4 Tie the Linux Oculus SDK to a given commit ID, so it can't invisibly break in the background in the repo is updted 2015-04-01 11:08:13 -07:00
Bradley Austin Davis
cebd2705c4 Updating windows Oculus SDK to 0.5.0.1 2015-04-01 11:06:22 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
a7eebfd002 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-31 15:42:01 -07:00
Bradley Austin Davis
c4c6cf82a2 Working on migration to SDK 0.5.0.1 2015-03-31 13:27:11 -07:00
Stephen Birarda
f0c4aef932 download and make tbb for OS X 2015-03-30 17:26:33 -07:00
Stephen Birarda
a308eb2e2f don't use DX11 for bullet even if found 2015-03-30 16:44:10 -07:00
Bradley Austin Davis
5e5bdec88d Merge branch 'master' into oculus_old_renderer 2015-03-30 16:36:00 -07:00
Stephen Birarda
eea4c56547 use TBB release libraries for apple external project 2015-03-26 14:03:25 -07:00
Stephen Birarda
faa47da57e update version of TBB external project 2015-03-24 11:49:33 -07:00
Bradley Austin Davis
1d56266044 Merge branch 'master' into oculus_old_renderer 2015-03-20 09:56:54 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Brad Davis
7e50d6359e Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-12 22:54:44 -07:00
Stephen Birarda
d3bc540919 use glm from hifi S3 now that fedora is down 2015-03-11 16:42:29 -07:00
Brad Davis
961173ede6 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-10 19:45:25 -07:00
Stephen Birarda
76f3378223 don't pass no-libraries option to windeployqt 2015-03-10 18:05:10 -07:00
Brad Davis
c512c5f2e9 LibOVR: Really fixing the Win32 build this time 2015-03-09 19:26:32 -07:00
Brad Davis
adb6a6ee54 Hopefully fixing win32 build 2015-03-09 17:27:10 -07:00
Brad Davis
2fdb92fc45 Fixing ubuntu build of libovr 2015-03-09 17:07:54 -07:00
Brad Davis
1e65324a7b Updating cmake config to build from pre-compiled Oculus SDK distribution 2015-03-09 14:46:43 -07:00
Brad Davis
e3d48dbb8f Working on Xcode build 2015-03-06 12:53: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
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
5a601f3676 resolve conflicts on merge with upstream/master 2015-03-03 10:01:24 -08:00
Stephen Birarda
38f77190eb remove PrioVR from build files 2015-02-26 17:20:45 -08:00
Stephen Birarda
95c25086d7 handle QTTOOLDIR env when looking for qmake 2015-02-26 16:59:37 -08:00
Stephen Birarda
eb646383e9 Revert "attempt to remove out-of-date warning for tbb" 
This reverts commit 43da329eb4.
 2015-02-26 16:21:15 -08:00
Stephen Birarda
43da329eb4 attempt to remove out-of-date warning for tbb 2015-02-26 16:14:09 -08:00
Stephen Birarda
9979bbd8b5 actually link debug bullet lib for WIN32 2015-02-26 15:49:03 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Stephen Birarda
5a4a3ce6dd remove message calls to debug bullet vars 2015-02-26 09:59:15 -08:00
Stephen Birarda
ea88518a44 handle debug/release for multi-config on WIN32 2015-02-26 09:57:56 -08:00
Stephen Birarda
621df1f66b remove win requirement of msbuild for bullet 2015-02-26 09:50:21 -08:00
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 
Conflicts:
	BUILD.md
	BUILD_WIN.md
 2015-02-26 22:16:35 +05:30
Stephen Birarda
f8627c8233 fix handling for vc12 externals 2015-02-25 17:48:26 -08:00
Stephen Birarda
1c2606c6db fail out if windeployqt is not found 2015-02-25 13:12:37 -08:00
Stephen Birarda
33b0fd24a6 don't call copy dll step for scribe 2015-02-25 11:02:05 -08:00
Stephen Birarda
66ab2ba9f9 fix for flipped conditional for dll fixup 2015-02-25 10:44:02 -08:00
Stephen Birarda
fd8240669b fix for windeployqt for executables 2015-02-25 10:39:44 -08:00
Virendra Singh
ed09b619d1 OS check 
check OS for different filenames
 2015-02-25 09:12:19 +05:30
Kodey
a5aeb3b980 cmake changes for building on linux 2015-02-25 08:45:00 +05:30
Stephen Birarda
d52ba5e958 call windeployqt after fixup_bundle for qt plugins 2015-02-24 13:20:17 -08:00
Stephen Birarda
71dd443ae2 also call fixup_bundle for release builds on win 2015-02-23 15:29:43 -08:00
Stephen Birarda
87ce55cc42 add new macro file for fixup libs 2015-02-23 13:24:53 -08:00
Stephen Birarda
8be707f63f rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00
Stephen Birarda
bae5d987f9 add OpenSSL lib path to paths for fixup 2015-02-23 13:21:45 -08:00
Stephen Birarda
954a298dc4 correct QXmpp DLL path for windows 2015-02-23 13:04:12 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
b32fa0f33d pass correct configuration to bullet install target 2015-02-23 12:27:30 -08:00
Stephen Birarda
88130feb11 force release build of bullet on win32 2015-02-23 12:19:54 -08:00