David Rowe
|
fbaeeef014
|
Merge branch 'master' into 19840
Resolved conflicts in editModels.js
|
2014-08-11 20:59:37 -07:00 |
|
AndrewMeadows
|
0650169c25
|
Merge pull request #3270 from chansensturm/audio-filter
Added support for biquad, parametric, and multi-band filter eq
|
2014-08-11 12:22:40 -07:00 |
|
Craig Hansen-Sturm
|
3d95f28fb9
|
added apache licensing/removed implicit double<->float conversions/addressed style guide issues
|
2014-08-11 11:51:49 -07:00 |
|
David Rowe
|
53602c2ef2
|
Miscellaneous tidying
|
2014-08-11 10:55:31 -07:00 |
|
David Rowe
|
0b979d2e1e
|
Disabled SVO model uploading: server doesn't support SVO file uploads
|
2014-08-11 10:54:46 -07:00 |
|
David Rowe
|
f12973d5d0
|
Cater for multiple mapping values
|
2014-08-11 10:12:47 -07:00 |
|
Stephen Birarda
|
26c0345d1d
|
Merge pull request #3272 from birarda/cf-fix
include CoreFoundation for defaultAudioDeviceForMode
|
2014-08-11 09:58:47 -07:00 |
|
Stephen Birarda
|
cadfaab770
|
fix order now that I know my ABCs
|
2014-08-11 09:58:21 -07:00 |
|
Stephen Birarda
|
2469d958d6
|
include CoreFoundation for Audio.cpp defaultAudioDeviceForMode
|
2014-08-11 09:57:13 -07:00 |
|
AndrewMeadows
|
e5c2a099b8
|
Merge pull request #3268 from birarda/take-out-the-trash
cmake (in)sanity
|
2014-08-11 09:15:38 -07:00 |
|
Craig Hansen-Sturm
|
481108ecd1
|
added support for biquad, parametric, and multi-band filter eq
|
2014-08-10 22:47:27 -07:00 |
|
David Rowe
|
9a21f1c355
|
Fix FST file reading and writing
|
2014-08-08 21:51:14 -07:00 |
|
David Rowe
|
54ea86d6be
|
Fix texture directory display and validation
|
2014-08-08 20:40:15 -07:00 |
|
David Rowe
|
35bc1a03af
|
Simplify model scale to be that specified in FST or 1.0
No UI
|
2014-08-08 17:35:36 -07:00 |
|
David Rowe
|
0f9da8e13f
|
Make mapping writing more robust
|
2014-08-08 17:34:08 -07:00 |
|
David Rowe
|
198fa47409
|
Get "naked" FBX model content uploading working
Include an automatically created FST file in the upload
|
2014-08-08 16:38:27 -07:00 |
|
Stephen Birarda
|
b09cc55d6f
|
add QTKit to frameworks required for Visage
|
2014-08-08 15:01:47 -07:00 |
|
Stephen Birarda
|
36a3bc40d6
|
add AppKit to required Visage libraries
|
2014-08-08 14:44:37 -07:00 |
|
AndrewMeadows
|
9d48522dd9
|
Merge pull request #3267 from birarda/avatar-ghosting
fix for avatar ghosting on parsing of avatar with last session uuid
|
2014-08-08 14:37:17 -07:00 |
|
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 |
|
David Rowe
|
c50be5a872
|
Miscellaneous fixes
|
2014-08-08 13:43:25 -07:00 |
|
Stephen Birarda
|
2badf9ab1a
|
don't quote linked ZLIB and OpenSSL libs for interface
|
2014-08-08 13:42:07 -07:00 |
|
David Rowe
|
5b77274969
|
Remove animation, pitch, yaw, and roll from Set Model Properties dialog
|
2014-08-08 13:39:11 -07:00 |
|
David Rowe
|
d1701c12ca
|
Rewrite FST content so that it includes changed and new properties
|
2014-08-08 13:36:01 -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 |
|