Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 17:29:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79308 commits 76 branches 59 tags 1.2 GiB
Commit graph

311 commits

Author SHA1 Message Date
beholder
04305155d0 make building tools (besides 'scribe') optional 2017-09-14 23:16:12 +03:00
Brad Davis
9c03fa0369 Cleanup CMake 2017-09-02 16:15:14 -07:00
beholder
a18410ef07 make building tests optional 2017-08-23 00:40:14 +03:00
Stephen Birarda
c7edc98d5c remove deprecated CMake policy no longer needed 2017-08-09 18:47:50 -07:00
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
David Rowe
727ba1320a Add unpublishedScripts content to the JS project 2017-05-21 11:15:51 +12:00
Brad Davis
a8de6eab8c Organize the files in the JS and QML projects to appear in a folder hierarchy 2017-04-20 14:39:06 -07:00
Brad Davis
8116de7c14 Force thread linkage 2017-03-23 13:45:13 -07:00
Vladyslav Stelmakhovskyi
2d2b2094fd Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination 2017-03-07 10:11:09 +01:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Stephen Birarda
a94fe62b37 use shared libc++ to reduce shared lib size 2016-09-01 10:56:49 -07:00
Stephen Birarda
85ba0f36cf fix controllers/shared compile for android interface port 2016-08-31 16:34:31 -07:00
Stephen Birarda
47f15f6ad8 use libc++ and clang toolchain 2016-08-31 16:16:40 -07:00
Stephen Birarda
fc8fad0753 check SCRIBE_PATH for scribe, add instructions 2016-08-31 13:56:02 -07:00
Stephen Birarda
feef76cbab add tools, no plugins, add InterfaceActivity 2016-08-31 11:31:07 -07:00
Stephen Birarda
f1ed7a2e78 initial changes needed for android interface cmake 2016-08-31 10:53:29 -07:00
elisa-lj11
2d2cb45c5d Merge remote-tracking branch 'highfidelity/master' into zip_project 2016-08-22 16:05:16 -07:00
Seth Alves
43c5735baa don't use -Wsuggest-override on older gcc 2016-08-18 11:05:31 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
elisa-lj11
0e79aa9dbe Added quazip for unzipping functions 2016-08-04 16:46:56 -07:00
Seth Alves
406b08ffa1 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:29:00 -07:00
Stephen Birarda
8b429d5b47 rename console directory to server-console 2016-01-19 16:11:08 -08:00
Stephen Birarda
59b6d8fde8 set CPACK_MODULE_PATH so custom template is used 2016-01-15 15:41:34 -08:00
Stephen Birarda
55886d43f5 add DDE component as downloadable optional 2016-01-15 15:41:34 -08:00
Stephen Birarda
817d651c47 add initial fixup install commands for interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
92064fe507 generate a componentized server/client installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
0463e008cf base cpack configuaration using install commands 2016-01-15 15:41:34 -08:00
Stephen Birarda
e075ac2814 call set_packaging_parameters before subdirectory calls 2016-01-04 16:34:59 -08:00
Stephen Birarda
7f9cd572c4 make WINDOW_SDK_PATH debug a status message 2016-01-04 16:08:15 -08:00
Stephen Birarda
c34ad7ceb8 add docstring for WINDOW_SDK_PATH 2016-01-04 16:07:36 -08:00
Stephen Birarda
4104aabc84 remove extra debugging of WINDOWS_SDK_PATH 2016-01-04 16:06:12 -08:00
Stephen Birarda
7b920b6047 cleanup WINDOWS_SDK_PATH debug 2016-01-04 16:02:17 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08:00
Brad Davis
243fba461d Add CMake flag for building only server components 2015-12-22 09:19:07 -08:00
Leonardo Murillo
a7b61cf791 Couple of fixes 2015-12-16 16:39:09 -06:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Leonardo Murillo
cbed8bf35a NSIS Changes 2015-12-16 15:12:14 -06:00
Leonardo Murillo
5ed422e3a1 Removing unwanted changes 2015-12-16 14:28:49 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08:00
samcake
93dbc92c61 Adding the correct selection of the winSDK based on the generator used 2015-12-11 10:59:36 -08:00
samcake
8497931cb4 Changing the path to the win sdk to x64 2015-12-11 10:29:14 -08:00
Leonardo Murillo
cc6d30fe6f Fix to path setting in shortcuts 2015-12-08 13:06:10 -08:00
Leonardo Murillo
eeebe06228 Using CPACK_PACKAGE_EXECUTABLES instead of CPACK_NSIS_CREATE_ICONS_EXTRE 2015-12-08 10:54:42 -08:00
Stephen Birarda
645a5319c3 remove the stack-manager 2015-12-03 14:06:51 -08:00
Stephen Birarda
fa4153d2e0 add a custom target to package up the console 2015-12-03 13:48:37 -08:00
Leonardo Murillo
c786789c4c Changes for SSL and icons 2015-12-02 12:43:25 -06:00
Leonardo Murillo
4e18640922 Some fixes 2015-11-30 10:07:11 -06:00
Leonardo Murillo
5822386702 Checkpoint 2015-11-30 08:56:30 -06:00
Leonardo Murillo
a37262465f Creating icons 2015-11-27 14:23:38 -06:00
Leonardo Murillo
766f0dbd32 Have stack manager use bundled stack 2015-11-27 14:04:33 -06:00
Leonardo Murillo
388157d432 Typo 2015-11-23 20:16:18 -06:00
Leonardo Murillo
c56a3b6d22 Checkpoint - turning quazip into external 2015-11-20 09:56:10 -06:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
fb3bf16391 improvement to cmake to explicitly use local external dependency 2015-10-30 09:01:42 -07:00
Brad Hefta-Gaub
e12ddf86f6 add back optional externals 2015-10-30 08:33:29 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
Brad Hefta-Gaub
8da52e2f17 Merge pull request #5906 from kencooke/audio-src 
Algorithmic optimization of new resampler
 2015-09-28 20:44:27 -07:00
Stephen Birarda
2976520061 remove an extra debug in root CMake 2015-09-28 14:53:53 -04:00
Stephen Birarda
386df86fd1 use the OS X version as the desired SDK 2015-09-28 14:52:17 -04:00
Stephen Birarda
3744632122 allow SDK fallback if 10.9 not present 2015-09-28 14:37:59 -04:00
Ken Cooke
4c12630458 Removed a stray reference to SOXR 2015-09-26 09:09:39 -07:00
Stephen Birarda
c6aeee7036 fix for OSX_SDK default string 2015-09-10 15:28:03 -07:00
Stephen Birarda
9a33a48ba5 clarify OSX_SDK option 2015-09-10 15:25:30 -07:00
Stephen Birarda
699a9566c3 add option to specify OS X SDK for Xcode 7 2015-09-10 15:00:01 -07:00
Seth Alves
0ac885da80 fix when memory debugging message is printed 2015-08-20 10:17:13 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Brad Davis
aba7bebf6e Revert "Updating to the new version of the sixense library" 2015-08-19 09:44:51 -07:00
Brad Davis
eba446e7f6 Updating to the new version of the sixense library 2015-08-18 18:55:59 -07:00
Stephen Birarda
078e60076c don't set a default build type 2015-08-05 14:34:00 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
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