Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 06:42:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21845 commits 25 branches 0 tags 1.1 GiB
Commit graph

86 commits

Author SHA1 Message Date
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
21ecaafea9 don't force system include of GLM 2015-01-22 11:38:34 -08:00
Stephen Birarda
60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-19 12:35:22 -08:00
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Andrew Meadows
614a7eb0b5 fix for entities rendering as black on linux 2015-01-16 16:49:11 -08:00
Andrew Meadows
2177a1701a more correct cmake config for Bullet 
(copying pattern from IncludeGLM.cmake)
 2015-01-15 11:38:38 -08:00
Andrew Meadows
51cc9d6d9a alt method for repressing unused var warnings 2015-01-15 10:46:09 -08:00
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
Andrew Meadows
adf778fba2 Merge pull request #4013 from Atlante45/cmake_fix 
Fix for new version of cmake
 2014-12-30 15:10:14 -08:00
Atlante45
729034dd94 Removed unnecessary list(LENGTH ...) 2014-12-30 11:13:00 -08:00
Atlante45
4586afc6c5 Fix for new version of cmake 2014-12-29 17:23:54 -08:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Sam Gateau
acad86edf5 clean cmake file for autoScribeShader 2014-12-25 22:41:14 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Sam Gateau
03d8922d59 fix typo 2014-12-23 15:47:39 -08:00
Sam Gateau
3cfe066bcb Add the autoScribeShader cmake 2014-12-23 15:42:14 -08:00
Andrew Meadows
25b00977be fix cmake config for bullet after c++-11 changes 2014-12-18 17:34:39 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Andrew Meadows
11f01e1859 merge upstream/master into andrew/inertia 2014-12-18 15:01:08 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Stephen Birarda
33d50c6eb6 fix dependency qt module linking in LinkSharedDependencies 2014-12-17 10:26:51 -08:00
Stephen Birarda
4216806967 remove extra debugging in LinkSharedDependencies 2014-12-17 10:21:53 -08:00
Stephen Birarda
2ee33cef9f have targets bubble up their Qt modules 2014-12-17 10:21:27 -08:00
Stephen Birarda
bf5147cd91 fix qt modules to link in LinkSharedDependencies 2014-12-15 12:56:32 -08:00
Stephen Birarda
fe0d9cc034 repairs to deployment json file creation 2014-11-18 10:10:12 -08:00
Stephen Birarda
2316cfb885 link hifi libs and openssl statically to gvr-interface 2014-11-17 15:19:07 -08:00
Stephen Birarda
473ae10104 shuffle files with QtGui dependency out of shared 2014-11-17 13:33:07 -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
40dc3c517f changes for android to find GLM and OpenSSL 2014-11-13 17:14:53 -08:00
Stephen Birarda
b8d0bd5d6b allow a target to bubble up required includes 2014-11-05 13:25:32 -08:00
Andrew Meadows
92ceb52183 adding macro to find bullet 2014-11-04 16:46:45 -08:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Stephen Birarda
a99b19d28a make Qt5 and ZLIB required finds, add OpenSSL to interface 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
0449660f66 don't bubble up hifi libraries since they are static 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
c63e886444 don't look backwards for fbx header from avatars library 2014-08-08 13:17:53 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
93b6f167f5 change more CMakeLists to use simplified hifi library linker 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 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
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
b5c8a4d2c6 fix requirement of networking in audio library 2014-08-08 13:17:52 -07:00