wangyix
|
184e4b8bde
|
sestets added to jitter tester
|
2014-08-12 14:38:28 -07:00 |
|
Philip Rosedale
|
0e72c6a0b6
|
Merge pull request #3269 from ey6es/metavoxels
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
|
2014-08-12 00:40:14 -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 |
|
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 |
|
Andrzej Kapolka
|
b7910cfe74
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-08 14:20:38 -07:00 |
|
Andrzej Kapolka
|
468a3d4d67
|
Bump up the packet version.
|
2014-08-08 14:18:32 -07:00 |
|
Andrzej Kapolka
|
768410ca0b
|
A couple comments, let right mouse button decrease height.
|
2014-08-08 14:14:35 -07:00 |
|
Andrzej Kapolka
|
e24ff0130f
|
Basic color/height painting.
|
2014-08-08 14:10:44 -07:00 |
|
Stephen Birarda
|
d5b1bee13c
|
resolve conflicts on merge with upstream master
|
2014-08-08 13:48:32 -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
|
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
|
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
|
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
|
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 |
|
Stephen Birarda
|
45afce48f7
|
remember old session UUID in AvatarHashMap to work around ghosting
|
2014-08-08 13:14:03 -07:00 |
|
Philip Rosedale
|
96a795eea4
|
Merge pull request #3263 from AndrewMeadows/ragdoll
Ragdoll Part 9:
|
2014-08-07 22:12:31 -07:00 |
|
Andrzej Kapolka
|
0fc34a47aa
|
Show heightfield cursor.
|
2014-08-07 18:19:58 -07:00 |
|
ZappoMan
|
84f3ede32f
|
small change to force rebuild
|
2014-08-07 15:09:24 -07:00 |
|
Andrzej Kapolka
|
4e1886dfcb
|
Divided when I should have multiplied.
|
2014-08-07 15:04:55 -07:00 |
|
Andrzej Kapolka
|
8de2dd9485
|
Working on ray intersection testing.
|
2014-08-07 14:38:47 -07:00 |
|
Andrew Meadows
|
bb33266635
|
merge upstream/master into andrew/ragdoll
|
2014-08-07 14:37:10 -07:00 |
|
Andrew Meadows
|
94da63006c
|
VerletPoint::_mass is now private
We set the mass of other avatars artificially high
so they are less movable.
|
2014-08-07 14:35:32 -07:00 |
|
Andrew Meadows
|
0f784a9cc5
|
add other ragdolls to simulation
|
2014-08-07 13:09:05 -07:00 |
|
Andrew Meadows
|
87350ad2d0
|
ragdoll simulation now in model-relative frame
(same rotation as world-frame, but translated to MyAvatar origin)
|
2014-08-07 11:45:06 -07:00 |
|
Andrzej Kapolka
|
5a1456712f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-07 11:35:41 -07:00 |
|
Andrew Meadows
|
27b876e84c
|
namechange _frame --> _frameCount
|
2014-08-07 09:02:31 -07:00 |
|
Andrzej Kapolka
|
acb973d245
|
Working on ray intersection testing.
|
2014-08-06 19:41:25 -07:00 |
|
Andrzej Kapolka
|
62e6493456
|
Started on heightfield brush tool, added simple query for heightfield height
(accessible from scripts).
|
2014-08-06 17:09:22 -07:00 |
|