Andrew Meadows
0539246089
merge upstream/master into andrew/ragdoll
2014-09-15 13:56:51 -07:00
ZappoMan
d10bd6857d
add use of missingSet in release build to silence warning
2014-09-13 08:02:38 -07:00
Andrew Meadows
f2882618be
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-09-12 17:50:26 -07:00
Andrew Meadows
c475d5db36
unit tests for ray-vs-AACubeShape and PlaneShape
2014-09-12 08:41:28 -07:00
Andrew Meadows
08e5dbadfd
added validation of RayIntersectionInfo::_hitShape
2014-09-11 09:44:41 -07:00
Andrew Meadows
0494ffcf38
implement Ray-vs-Capsule and Ray-vs-AACube
2014-09-10 17:01:51 -07:00
Andrew Meadows
4da1ca22ba
Add RayIntersectionInfo and use for shape-vs-ray
2014-09-09 17:35:06 -07:00
ZappoMan
b78b8ccbb0
first cut at replacing radius with dimensions
2014-09-09 13:33:05 -07:00
Andrew Meadows
526d998924
removed warnigs about ill-formed narrowing conversion
2014-09-05 17:21:15 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Clément Brisset
72af7617fa
Merge pull request #3332 from AndrewMeadows/ragdoll
...
add AACubeShape to ShapeCollider
2014-09-03 14:34:32 -07:00
MarcelEdward
95cab15864
the command:
...
cmake . -GXcode
creates a CMakeFiles direcory in the test directory, causing the creation of the xcode files to fail with an the source directory does not contain a CMakeList.txt file.
This patch updates the CMakeList.txt file in the test directory to ignore that created dir.
2014-09-03 16:34:23 +02:00
Andrew Meadows
ebcc960ec7
merge upstream/master into andrew/ragdoll
2014-08-29 15:48:40 -07:00
Andrew Meadows
a0eb13f6db
collision logic for capsule-side-vs-cube-face
...
with unit tests
2014-08-29 14:23:00 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
Andrew Meadows
00913d4422
fixes for capsuleVsAACube() with unit tests
2014-08-28 16:51:16 -07:00
Andrew Meadows
f1ae0ce992
moved some functions around
2014-08-27 12:21:03 -07:00
Andrew Meadows
c6253bb51a
AACube vs Sphere and Capsule collision tests
...
Sphere is unit tested.
Also removed the shape collision query against Octree
2014-08-27 12:09:41 -07:00
Craig Hansen-Sturm
e941e58626
merge HEAD with PR-3281
2014-08-26 18:25:40 -07:00
Andrew Meadows
1bd7734ec1
sometimes swap order of shapes for simpler code
2014-08-22 18:07:11 -07:00
Andrew Meadows
de0ebf2f57
make sure all test errors have newline at end
2014-08-22 17:33:31 -07:00
Andrew Meadows
5d39efea82
make sure each test error has a newline at end
2014-08-22 17:26:19 -07:00
Andrew Meadows
1be922f986
add shapeVsList etc to dispatch table
...
renamed some functions for more readability
2014-08-22 11:20:53 -07:00
Andrew Meadows
3ebd8c1969
use dispatchTable for shape-vs-shape collisions
2014-08-21 16:40:25 -07:00
ZappoMan
daffb00bf2
build issues fixed after merge
2014-08-18 15:41:20 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
ZappoMan
be94f98a91
fix warning
2014-08-17 14:10:42 -07:00
ZappoMan
cac4e5ba6c
improved use of MovingMinMaxAvg<> for better performance, added execution timing stats
2014-08-17 14:08:07 -07:00
wangyix
029ef962b7
made JitterTester work on windows
2014-08-14 11:31:31 -07:00
wangyix
81fa5ed41f
readPendingDatagrams stats printed and sent to domain page
...
jittertester now prints out send or receive error msgs
2014-08-13 16:48:06 -07:00
wangyix
db0fbcab97
merge with upstream
2014-08-13 11:09:55 -07:00
wangyix
737228e7bb
another newline
2014-08-12 15:40:58 -07:00
wangyix
3c73fd5e0b
forgot newline
2014-08-12 15:39:03 -07:00
wangyix
53d6cdd67c
forgot more lines
2014-08-12 15:36:51 -07:00
wangyix
d43c39fd57
forgot a line
2014-08-12 15:28:36 -07:00
wangyix
dc46d6b80f
added stdev to jitter tester
2014-08-12 15:27:17 -07:00
wangyix
184e4b8bde
sestets added to jitter tester
2014-08-12 14:38:28 -07:00
wangyix
406be72f41
per-report stats added to jitter tests
2014-08-12 13:46:55 -07:00
wangyix
4ec84b32b0
updated AudioRingBuffer bytes vs samples returns
2014-08-08 17:00:39 -07:00
ZappoMan
027b1d58cc
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
interface/src/entities/EntityTreeRenderer.h
interface/src/models/ModelTreeRenderer.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
Stephen Birarda
2fda95ae8f
repair build of various tools
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
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
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
87cf262b9e
get to successful cmake after library link macro changes
2014-08-08 13:17:53 -07:00
ZappoMan
d50a607bc7
started support for new entity base class properties like velocity, gravity, damping, and lifetime
2014-08-08 11:38:03 -07:00
