Stephen Birarda
|
2f6ff36d22
|
fix list of args for visage find module
|
2014-08-08 14:17:36 -07:00 |
|
Stephen Birarda
|
e638bbca3a
|
fix find package standard args call for visage
|
2014-08-08 14:10:58 -07:00 |
|
Stephen Birarda
|
e74c8f5e56
|
don't set visage find args list as quoted string
|
2014-08-08 14:08:18 -07:00 |
|
Stephen Birarda
|
234920b5bc
|
add QuartzCore to FindVisage module
|
2014-08-08 14:04:22 -07:00 |
|
Stephen Birarda
|
d5b1bee13c
|
resolve conflicts on merge with upstream master
|
2014-08-08 13:48:32 -07:00 |
|
Stephen Birarda
|
2badf9ab1a
|
don't quote linked ZLIB and OpenSSL libs for interface
|
2014-08-08 13:42:07 -07:00 |
|
Stephen Birarda
|
0dfbc8b8ba
|
add the xml library to QXMPP_LIBRARIES
|
2014-08-08 13:32:34 -07:00 |
|
Stephen Birarda
|
d8dadc3199
|
link the socket library to the hifi networking library
|
2014-08-08 13:31:09 -07:00 |
|
Stephen Birarda
|
6eb2c73624
|
add assert include to SharedUtil
|
2014-08-08 13:23:54 -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
|
9d8818eee5
|
remove OpenSSL requirement from octree library
|
2014-08-08 13:18:32 -07:00 |
|
Stephen Birarda
|
2fda95ae8f
|
repair build of various tools
|
2014-08-08 13:17:54 -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
|
27419b7b6b
|
fix some build blockers in test directory
|
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
|
e4d01d269c
|
use shared dependency linking macro in hifi projects
|
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
|
fc92b93326
|
fix typo in metavoxels library setup
|
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
|
1f0a722d0d
|
remove antequated windows libraries that have been replaced by Qt usage
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
17df6484d4
|
remove ssize_t and replace with size_t or int where appropriate
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
a75a3f9434
|
don't look backwards for script-engine headers from particles library
|
2014-08-08 13:17:53 -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
|
0378fb3049
|
break glm helpers out of SharedUtil
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
892e30c5e1
|
get past assignment-client build after cmake auditing
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
2bb37f2d64
|
more Qt module dependencies sorted out for libraries
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
1059e9a635
|
add back more required Qt modules
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
b5c8a4d2c6
|
fix requirement of networking in audio library
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
fa26957b23
|
more CMakeLists cleanup for sub-dependencies
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
33e5826842
|
remove animation server, bubble up qt modules
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
9a50532b1f
|
bubble up sub dependencies to link_hifi_library
|
2014-08-08 13:17:52 -07:00 |
|
Brad Hefta-Gaub
|
e882e08579
|
Merge pull request #3265 from AndrewMeadows/ragdoll
fix for extraneous joints in avatar ragdoll
|
2014-08-08 09:00:35 -07:00 |
|
Andrew Meadows
|
2fe22a4c1a
|
merge upstream/master into andrew/ragdoll
|
2014-08-08 08:43:02 -07:00 |
|
Andrew Meadows
|
05318acc7f
|
don't make shapes for joints with zero radius
|
2014-08-08 08:37:28 -07:00 |
|
Brad Hefta-Gaub
|
0f5ee4eac1
|
Merge pull request #3264 from AndrewMeadows/ragdoll
fix for bad models and some crashes
|
2014-08-08 08:36:10 -07:00 |
|
Andrew Meadows
|
bcb0cb2c3c
|
fix bug: variable should be float rather than int
|
2014-08-08 08:26:25 -07:00 |
|
Andrew Meadows
|
5de762361a
|
remove cleanup of Model::_jointStates tree
the cleanup causes crashes and broken models
|
2014-08-08 08:20:42 -07:00 |
|
Philip Rosedale
|
96a795eea4
|
Merge pull request #3263 from AndrewMeadows/ragdoll
Ragdoll Part 9:
|
2014-08-07 22:12:31 -07:00 |
|
Andrew Meadows
|
9a55252587
|
remove extraneous roots from Model::_jointStates
|
2014-08-07 17:02:28 -07:00 |
|
Leonardo Murillo
|
03985a3bd4
|
Merge pull request #3262 from ZappoMan/master
remove animation server
|
2014-08-07 16:14:30 -06:00 |
|
ZappoMan
|
84f3ede32f
|
small change to force rebuild
|
2014-08-07 15:09:24 -07:00 |
|
ZappoMan
|
64699a213a
|
remove animation server
|
2014-08-07 14:48:51 -07:00 |
|
ZappoMan
|
8c2dad1476
|
remove animation server
|
2014-08-07 14:40:06 -07:00 |
|
Andrew Meadows
|
bb33266635
|
merge upstream/master into andrew/ragdoll
|
2014-08-07 14:37:10 -07:00 |
|