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

260 commits

Author SHA1 Message Date
Leonardo Murillo
736977a4c2 Using correct Icons for PR vs Relesae 2015-12-18 08:16:39 -06:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -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
Andrew Meadows
51ff8f096e correct input plugin load path on linux 2015-12-15 08:43:04 -08:00
Andrew Meadows
cb65a6f640 fix cmake to build bullet-2.83 2015-12-11 09:40:15 -08:00
Stephen Birarda
bddb8d5b68 remove Quazip files used by CMake 2015-12-03 14:08:10 -08:00
Leonardo Murillo
c786789c4c Changes for SSL and icons 2015-12-02 12:43:25 -06:00
Leonardo Murillo
ca8cd13c48 Checkpoint 2015-12-01 12:32:31 -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
6a53140720 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-30 08:38:13 -06:00
Anthony Thibault
a9e25c51e5 Fix for linker warning LNK4075 on Windows 
Specifcally, this warning:

    LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification

The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
 2015-11-27 20:56:57 -08:00
Leonardo Murillo
b7cdca75b7 Checkpoint towards integrated delivery 2015-11-24 16:12:04 -06:00
Leonardo Murillo
d58b11f0a2 Ubuntu fix - case sensitivity¨ 2015-11-23 18:13:41 -06:00
Leonardo Murillo
66803ce356 Ubuntu fix - case sensitivity¨ 2015-11-23 18:04:36 -06:00
Leonardo Murillo
fee50a56e5 Ubuntu fix - case sensitivity 2015-11-23 18:02:20 -06:00
Leonardo Murillo
8b573cebfb Successfull windows build given any build type checkpoint 2015-11-23 15:16:48 -06:00
Leonardo Murillo
e17d0b2af3 Bundling and consolidating deployment package 2015-11-20 15:10:56 -06:00
Leonardo Murillo
6105191a3f OS X Bundling 2015-11-20 14:45:25 -06:00
Leonardo Murillo
c56a3b6d22 Checkpoint - turning quazip into external 2015-11-20 09:56:10 -06:00
Brad Davis
0c60538952 Ensure that dependencies of runtime plugins are included in the DLL copy 2015-11-06 16:57:30 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport 
Support for runtime plugins (DLLs)
 2015-11-01 14:57:13 -08:00
Brad Davis
e0ac48fe27 PR comments 2015-11-01 12:19:19 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Davis
99d8554cc8 Make zlib a true external on windows (linux and OSX should rely on system libraries) 2015-11-01 01:36:59 -07:00
Brad Hefta-Gaub
fb3bf16391 improvement to cmake to explicitly use local external dependency 2015-10-30 09:01:42 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Ken Cooke
de8848f7bc Fix to only pass --release to windeployqt on release builds 2015-09-30 08:11:16 -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
Stephen Birarda
255f896f7b remove extra cmake debug 2015-09-08 15:21:34 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Seiji Emery
d29a368688 removed debug 2015-08-25 16:50:09 -07:00
Seiji Emery
140edd0589 try removing quotes... 2015-08-25 16:21:38 -07:00
Seiji Emery
248d0729a6 test 2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32 test 2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8 changed setup_project to only use the generated shader source files 2015-08-25 14:40:52 -07:00
Seiji Emery
316ddd68ef force cmake autoscribe to use full paths 2015-08-25 13:46:50 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Seiji Emery
bd18951be8 fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/ 2015-08-24 13:13:24 -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
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -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
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -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
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -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
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -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
a483dd27ba Trying to get widgets / windows working 2015-06-01 17:31:18 -07:00
Brad Davis
912c003d58 Making (most) plugins into a library 2015-05-29 16:49:11 -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
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
Stephen Birarda
08b155146a move externals from build-ext inside the build folder 2015-04-15 12:12:21 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Stephen Birarda
76f3378223 don't pass no-libraries option to windeployqt 2015-03-10 18:05:10 -07: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
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
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
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
dc9c4ea43c add options with default for get of external projects 2015-02-20 15:34:41 -08:00
Stephen Birarda
32fa2e8d31 add missing docstring to AddPathsToLibPaths 2015-02-20 12:24:17 -08:00
Stephen Birarda
b7cc163ca4 lib paths is actually a string 2015-02-20 12:21:10 -08:00
Stephen Birarda
0bad8db1a0 fix missing dependencies to external projects 2015-02-20 12:17:58 -08:00
Stephen Birarda
b7c03c34a8 use path and filepath where appropriate for cache 2015-02-19 16:39:05 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -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
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
9d7212cdae remove some debug in AddPathsToLibPaths 2015-02-17 17:18:24 -08:00
Stephen Birarda
68c19866c4 call dll copy after project deps are setup 2015-02-17 17:17:30 -08:00
Stephen Birarda
5b563e3bc5 add LIB_PATHS debugging to catch destruction 2015-02-17 17:12:14 -08:00
Stephen Birarda
315ab73900 fix a typo on temporary list 2015-02-17 16:32:52 -08:00
Stephen Birarda
bc9481051b use configure_file to pass lib_paths to fixup_bundle 2015-02-17 16:30:39 -08:00
Stephen Birarda
73891b61b0 use separate arugments to get colon separated list of paths 2015-02-17 16:18:35 -08:00