Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-05 21:32:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87349 commits 17 branches 0 tags 1.1 GiB
Commit graph

386 commits

Author SHA1 Message Date
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Seiji Emery
d75f3b1398 Fixed test target dependencies (which were not getting added into the *-tests build targets) 2015-06-20 11:49:26 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
b8cf4ea29d use -Woverloaded-virtual with g++. quiet compiler warnings 2015-06-16 21:19:31 -07:00
Seth Alves
2a841cc0b8 clang doesn't know -Wdouble-promotion 2015-06-16 19:19:18 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Brad Davis
e5bc0fad1e Merge branch 'master' into plugins_pt3 2015-05-27 23:45:31 -07:00
Seth Alves
386b3301f4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 14:46:37 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning 
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
 2015-05-27 11:49:00 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Ryan Huffman
0883bde1be Update compiler flags to produce warnings on non-gnu compilers 2015-05-01 11:29:23 -07:00
Brad Davis
a83616a7dc Don't prevent building on Visual Studio 2015 2015-04-30 10:32:19 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -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
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
David Rowe
12f5b992c9 Add /LARGEADDRESSAWARE linker flag for Windows builds 
Enables Interface to use more than 2GB of memory.
Reduces the incidence of bad_alloc crashes.
 2015-04-08 20:01:01 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
02b69f4a70 Enabling the use of #ifdef DEBUG as a platform neutral idiom 2015-03-31 13:32:13 -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
fd29f72bfe Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00
Brad Davis
320cfa7c9e Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-09 14:54:09 -07:00
Andrew Meadows
e4c68bf31c committing some temp debug stuff to help git diff 
(will remove this stuff later)
 2015-03-05 18:06:08 -08:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
a7a9ede744 handle an SDK in Xcode beta 2015-02-25 13:53:57 -08:00
Stephen Birarda
e0d31f6e61 remove extra added spaces 2015-02-25 13:52:14 -08:00
Stephen Birarda
994c0386d3 cleanup command that looks for SDK 2015-02-25 13:50:59 -08:00
Stephen Birarda
d24287f627 look in Xcode application for 10.9 SDK 2015-02-25 13:48:28 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Stephen Birarda
e7e7323ff0 pass 10.9 SDK as CMAKE_OSX_SYSROOT 2015-02-24 15:00:41 -08:00
Stephen Birarda
8be707f63f rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -08:00
Stephen Birarda
dc9c4ea43c add options with default for get of external projects 2015-02-20 15:34:41 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Stephen Birarda
a3d370f01f more path shortening for build of external projects 2015-02-19 14:33:31 -08:00
Stephen Birarda
a0a4882ed6 shorten externals binary dir path 2015-02-19 14:18:05 -08:00
Stephen Birarda
7ec01c9095 handle android build of tbb, don't prefix win with lib 2015-02-18 17:20:13 -08:00
Stephen Birarda
71482f6ad7 include tbb as system include, use project as prefix 2015-02-18 13:58:20 -08:00
Stephen Birarda
84e82f045d find QT_DIR in root CMakeLists 2015-02-18 11:38:08 -08:00
Stephen Birarda
b2ecf99008 back out of lib cmake dir to get Qt bin 2015-02-18 11:36:49 -08:00
Stephen Birarda
e2d7fb574a move macro call so it is actually loaded 2015-02-18 11:27:37 -08:00
Stephen Birarda
cc29297a19 remove requirement of Qt dlls in path 2015-02-18 10:13:23 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Seth Alves
8c7e147b82 include debug symbols 2015-02-17 15:16:03 -08:00
Stephen Birarda
bc899eaa58 add fixup_bundle step for WIN32 interface 2015-02-17 13:17:23 -08:00
Stephen Birarda
a5bd9be510 put externals in build-externals to avoid clean build removal 2015-02-17 11:00:23 -08:00
Stephen Birarda
2c7e225ef7 use cmake ExternalProject for glm in Interface 2015-02-13 10:14:47 -08:00
Stephen Birarda
ef9cc2aacc repair ability for desktop to add gvr target 2015-02-12 12:49:29 -08:00
Stephen Birarda
53f58ad382 add possibility of desktop GVR build 2015-02-10 10:51:20 -08:00
Stephen Birarda
d68b0958a7 resolve conflicts on merge with upstream/master 2015-02-06 14:09:20 -08:00
Stephen Birarda
c8fb891158 move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
Stephen Birarda
f3e120f45d temp disable gvr-interface target to allow build 2015-02-04 11:15:03 -08:00
Stephen Birarda
1dd74c9831 allow gvr-interface target to be compiled for desktop 2015-01-28 16:57:16 -08:00
Stephen Birarda
d13e3c20c8 force GLM to not be found in path 2015-01-28 15:32:59 -08:00
Stephen Birarda
3dd0b85ca4 use a QOpenGLWidget subclass for InterfaceView 2015-01-28 15:26:03 -08:00
Stephen Birarda
2b0796eb7d simplify cmake call for android build 2015-01-28 13:40:47 -08:00
Stephen Birarda
21ecaafea9 don't force system include of GLM 2015-01-22 11:38:34 -08:00
Stephen Birarda
e5accde70d set the qmake excutable path to tell Qt modules where to look 2015-01-22 11:11:22 -08:00
Stephen Birarda
64aa203825 add output of QT_CMAKE_PREFIX_PATH 2015-01-22 11:05:48 -08:00
Stephen Birarda
316bbce83c allow ANDROID_QT_CMAKE_PREFIX_PATH to designate Qt location 2015-01-22 11:04:04 -08:00
Stephen Birarda
5716f576b7 output archive to current binary dir 2015-01-21 13:30:28 -08:00
Stephen Birarda
a3529e745b fix warning and compile with Multimedia 2015-01-21 13:28:18 -08:00
Stephen Birarda
c844502b97 use Qt 5.3 for android build as well 2015-01-19 14:49:01 -08:00
Stephen Birarda
de065ff442 add more instructions for Qt and GLM 2015-01-19 10:58:57 -08:00
Stephen Birarda
14e4879154 add a BUILD_ANDROID guide, reference ANDROID_LIB_DIR 2015-01-19 10:53:17 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Stephen Birarda
30f898109d don't warn about c++11 for MSVC12 2015-01-13 09:40:55 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Stephen Birarda
6beaa3d59a set policy for shared lib creation on OS X 2014-12-18 14:36:15 -08:00
Stephen Birarda
a3cc578fd1 use libc++ for C++11 in APPLE builds 2014-12-15 14:08:23 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
ZappoMan
3d082160ec fix build buster 2014-11-20 09:42:11 -08:00
Stephen Birarda
998457665f add back c++11 support to all, fix includes in networking 2014-11-18 17:26:42 -08:00
Stephen Birarda
5c9c89826e only enable C++11 on android 2014-11-18 12:01:06 -08:00
Stephen Birarda
52750f1ec5 use PixelLight's original Apk.cmake for shared library support 2014-11-17 12:42:53 -08:00
Stephen Birarda
05cab9a3ba add a gvr-interface target that uses native glue to make apk 2014-11-17 10:58:12 -08:00
Stephen Birarda
f23b08971c merge with cuckoo branch, fix makefile OS X support 2014-11-14 10:52:12 -08:00
Stephen Birarda
424aceadb8 compile tools on android for mtc 2014-11-14 10:18:09 -08:00
Stephen Birarda
36a6344c36 include C++11 check for android support 2014-11-14 10:12:54 -08:00
Stephen Birarda
40dc3c517f changes for android to find GLM and OpenSSL 2014-11-13 17:14:53 -08:00
Stephen Birarda
63304210c1 allow sep specification of android Qt location on system 2014-11-13 15:35:19 -08:00
Stephen Birarda
c8aeab53ba changes for C++11 support 2014-11-05 11:42:18 -08:00
Sam Gateau
843a64eeee Check for msdev version and appropriate window sdk 2014-10-16 16:15:01 -07:00
Stephen Birarda
ae90b38172 add the ice server 2014-10-01 17:19:34 -07:00
Stephen Birarda
49e3f4bdb0 use 10.8 only in deployment target, base SDK should be latest 2014-09-22 09:20:34 -07:00
Stephen Birarda
92b2fe6d68 remove ROOT_DIR param in include_glm, remove ROOT_DIR from root CMakeLists 2014-08-08 13:22:00 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
107cbc3f87 more simplification of hifi macros to find libraries 2014-08-08 13:17:53 -07:00
Stephen Birarda
33e5826842 remove animation server, bubble up qt modules 2014-08-08 13:17:52 -07:00
Stephen Birarda
54390600a3 remove some extra spaces 2014-07-30 15:13:01 -07:00
Stephen Birarda
21229f22a7 only set the policy if it exists 2014-07-30 15:12:07 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Anthony Elliott
adca04b9ce Configure build for Windows 8.1 2014-07-28 19:31:50 -04:00
Stephen Birarda
84aa4b9cda use compiler default C++ Standard Library on OS X 2014-07-08 11:59:10 -07:00
David Rowe
bc1660cdeb Configure multi-processor building on Windows 2014-07-01 09:57:23 -07:00
Andrzej Kapolka
6480c678d2 Disable strict aliasing for safe type punning, fix potentially uninitialized 
variable warning.
 2014-06-25 13:46:13 -07:00
Andrzej Kapolka
7931173671 Working on tools to convert bitstreams to/from json. 2014-06-17 12:33:31 -07:00
Stephen Birarda
fcc261cc2b fix BUILD.md instructions and CMakeLists so QT_CMAKE_PREFIX_PATH can be passed 2014-03-24 17:15:53 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Brad Hefta-Gaub
e0cbecc3dd Merge pull request #2243 from ZappoMan/fix_cmake_policy_warning 
fix cmake policy warnings
 2014-03-08 17:57:55 -08:00
ZappoMan
35a1bb8744 fix cmake policy warnings 2014-03-08 17:26:38 -08:00
Stephen Birarda
e52bc2c667 remove svo-viewer to place in external repository 2014-03-07 16:31:01 -08:00
Stephen Birarda
dceddc8ac4 repair indentation in root CMakeLists 2014-03-07 11:12:53 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
Stephen Birarda
494bf59e9b remove the winsdk hack to solve with VS SP1 2014-03-04 15:59:49 -08:00
Andrew Meadows
918cd39f5d adding warnings to linux build 2014-03-04 11:18:58 -08:00
ZappoMan
5ffff958fe cleanup names and fix some warnings 2014-03-01 11:47:37 -08:00
ZappoMan
45b5f54bc5 adding Matt's SvoViewer 2014-02-28 00:06:37 -08:00
Stephen Birarda
f72a87a47e remove the pairing-server target 2014-02-24 15:00:36 -08:00
Stephen Birarda
00b4cd799e remove the data-server from the repo 2014-02-24 14:56:17 -08:00
Andrzej Kapolka
524ceb4ed2 Working on tests for datagram sequencing, added autogenerated ==/!= operators 
to mtc.
 2014-02-09 16:26:53 -08:00
Brad Hefta-Gaub
54faeae13e fix windows builds 2014-01-24 09:51:06 -08:00
Stephen Birarda
d405d31edf add data-server to hifi repo, abstract DataServerClient 2014-01-20 14:42:50 -08:00
Brad Hefta-Gaub
912baf87c8 remove debug cmake code 2014-01-15 12:36:15 -08:00
Brad Hefta-Gaub
f64b3cdddb fix whitespace 2014-01-15 12:35:34 -08:00
Brad Hefta-Gaub
75d5932de9 added externals/winsdk to help with windows builds 2014-01-14 23:01:27 -08:00
Brad Hefta-Gaub
8e8e6fcb30 added latest version of freeglut for windows 2014-01-13 14:46:03 -08:00
Brad Hefta-Gaub
483ac66518 more windows build tweaks, warnings and linking 2014-01-13 11:48:16 -08:00
Brad Hefta-Gaub
9441f9ffb7 fix link issues for many targets 2014-01-13 01:01:30 -08:00
Brad Hefta-Gaub
a94e371e5c fix more windows warnings 2014-01-12 21:27:25 -08:00
Brad Hefta-Gaub
62cf9d5b8c remove animation-server from windows build until it supports QThreads 2014-01-12 17:43:34 -08:00
Brad Hefta-Gaub
6bde55898d handle NOMINMAX in cmake 2014-01-10 21:58:55 -08:00
Stephen Birarda
a820b2c3b6 force 10.9 build to act like 10.8 with Makefiles, closes #1210 2014-01-10 15:01:39 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
Stephen Birarda
f65a726745 switch base SDK to 10.8 2013-10-23 15:48:52 -07:00
Stephen Birarda
a4be44c2c5 remove the injector target 2013-10-16 17:28:42 -07:00
Stephen Birarda
ee1bf4ffcc remove eve as a target 2013-10-09 10:31:10 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
Stephen Birarda
70c5d3e349 decouple DS from main, move to C++11 2013-09-26 15:03:43 -07:00
ZappoMan
b682d3612b remove standalone voxel server 2013-09-19 22:09:03 -05:00
Stephen Birarda
32b507d2ac remove the global assignment-server for now to avoid confusion 2013-09-18 11:05:31 -07:00
Stephen Birarda
17727576d8 remove the avatar-mixer target from root CMakeLists 2013-09-05 14:03:34 -07:00
Stephen Birarda
94740eed60 remove the audio-mixer target 2013-09-04 10:11:26 -07:00
Stephen Birarda
97bee1eb82 add a stubbed assignment client to request assignments 2013-08-22 12:30:11 -07:00
Stephen Birarda
7e1b682663 switch OS X base SDK to 10.7 2013-08-20 14:55:29 -07:00
Stephen Birarda
055c644736 Merge branch 'qt5' into assignee 2013-07-24 12:23:08 -07:00
Stephen Birarda
5f26bbdc0a remove debug of QT_CMAKE_PREFIX_PATH 2013-07-24 12:22:57 -07:00
Stephen Birarda
67912cc325 merge with birarda/qt5 and resolve conflicts 2013-07-24 12:14:31 -07:00
Stephen Birarda
b8de278d90 use env variable for QT cmake prefix path 2013-07-24 12:10:36 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
b9c1525321 add the base of the assignment-server 2013-07-01 14:05:14 -07:00
Stephen Birarda
59a6fa8953 reinstate an alphatbetical ordering in root CMakeLists 2013-05-17 17:52:23 -07:00
Jeffrey Ventrella
f5dc5b0a39 thingy 2013-05-17 14:57:15 -07:00
ZappoMan
316da59da3 first cut at animation server 2013-05-17 12:44:39 -07:00
Stephen Birarda
7c04244f53 add missing newline to root CMakeLists 2013-05-06 12:01:39 -07:00
Jeffrey Ventrella
fcf37352d4 thingy 2013-05-06 11:32:04 -07:00
ZappoMan
2c128fd813 added voxel-edit tool, as well as made voxel file read/write work, disabled voxel persist on server shutdown 2013-05-03 19:19:48 -07:00
Stephen Birarda
01816ccda3 add a base config for a pairing server 2013-05-01 14:23:25 -07:00
Stephen Birarda
38f8769ff6 stub setup for eve 2013-04-22 11:39:38 -07:00
Stephen Birarda
96d3f5a27d move voxel to voxel-server, use setup project macro 2013-04-12 13:25:59 -07:00
Stephen Birarda
44c2099183 move space to space-server, use setup project macro 2013-04-12 13:23:07 -07:00
Stephen Birarda
7fb52c529e move mixer to audio-mixer, use SetupHifiProject macro 2013-04-12 13:17:10 -07:00
Stephen Birarda
3e6b794f11 rename domain target to domain server, use SetupHifiProject 2013-04-12 13:12:56 -07:00
Stephen Birarda
e434b06ed9 rename avatar target to avatar-mixer, add SetupHifiProject macro 2013-04-12 13:08:21 -07:00
Stephen Birarda
67efc12e59 move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
Leonardo Murillo
09df9d3dc7 Second take on avatar mixer 2013-04-03 15:17:15 -06:00
Leonardo Murillo
0ab62b7493 Stream injector 2013-03-22 20:42:56 -06:00
Stephen Birarda
686404be2b add a voxel server 2013-03-08 14:32:06 -08:00
Stephen Birarda
171c919946 remove SDK specifiers alltogether to confirm cause of hifi-mini error 2013-03-04 14:28:52 -08:00
Stephen Birarda
127dbf8da3 remove the deployment target specifier 2013-03-04 14:26:18 -08:00
Stephen Birarda
28832177ac force use of 10.7 SDK to make hifi-mini happy again 2013-03-04 13:26:11 -08:00
Stephen Birarda
64ecfa3b50 Revert "test for source of hifi-mini build failure" 
This reverts commit cbc6e07362.
 2013-03-04 13:05:03 -08:00
Stephen Birarda
cbc6e07362 test for source of hifi-mini build failure 2013-03-04 13:00:31 -08:00
Stephen Birarda
5bd0b49cec general SDK specification for root CMakeLists 2013-03-04 12:49:19 -08:00
Stephen Birarda
653812a79c explicitly define OS X base SDK and target 2013-03-04 11:34:38 -08:00
Stephen Birarda
a5d08142e1 create target for shared hifi library 2013-02-14 15:25:50 -08:00
Leonardo Murillo
d81e52f6d7 Bringing spaceserver into interface repo - adding CMake target 2013-02-12 22:10:44 -06:00
Stephen Birarda
fab10ada3e move shared UDPSocket class to shared dir for reuse in mixer 2013-02-12 17:31:53 -08:00
Stephen Birarda
c45eeb2a51 add mixer subdirectory to root CMakeLists.txt 2013-02-12 16:52:38 -08:00
Stephen Birarda
52c410a65d add a target for domain server 2013-02-11 15:54:47 -08:00
Stephen Birarda
7262b7400a rename thirdparty dir to external 2013-02-08 17:29:04 -08:00
Stephen Birarda
b3a343f17f build portaudio as external project before interface 2013-02-08 17:28:22 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
bdda8065cd don't build the mixer until it's ready 2013-02-08 10:30:14 -08:00
Stephen Birarda
2f24c698c6 add CMakeList for mixer project 2013-02-07 18:01:26 -08:00
Stephen Birarda
f5cbe7a05a cmake build working for interface project 2013-02-07 17:29:01 -08:00
Stephen Birarda
f9b8d6cde0 don't use find module for glm/portaudio 2013-02-07 12:24:05 -08:00
Stephen Birarda
0ad551c86d use build directory to keep cmake clean 2013-02-07 11:57:35 -08:00
Stephen Birarda
4860fb086d link glm library to interface target 2013-02-07 11:41:01 -08:00
Stephen Birarda
24240a709c add all extra CMake files to gitignore 2013-02-06 18:26:19 -08:00