Commit graph

919 commits

Author SHA1 Message Date
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
2014-03-04 09:01:24 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Andrzej Kapolka
949e40a10e Revert complicated system of "soft" pointers, instead use hard references in
write mappings and listen for object destruction.
2014-03-03 11:44:45 -08:00
Andrzej Kapolka
55dca45feb Working on tests for shared objects. 2014-03-03 10:20:50 -08:00
Andrew Meadows
da0276ac7e ShapeCollider takes CollisionList argument
Also, adding first pass at ListShape
2014-02-26 12:10:16 -08:00
Andrew Meadows
f0e1a6ccd3 more capsuleCapsule tests 2014-02-25 11:38:08 -08:00
Andrew Meadows
9a70a50bdb capsuleCapsule() collision with preliminary tests 2014-02-25 10:59:12 -08:00
Andrew Meadows
8a3640f016 Adding CapsuleSphere collisions with tests. 2014-02-24 11:38:27 -08:00
Andrew Meadows
0e28e0947c Adding ShapeColliderTests.* 2014-02-22 13:20:47 -08:00
Andrew Meadows
072369abfe Adding physics test framework 2014-02-21 16:27:44 -08:00
Andrzej Kapolka
bb56e2847f Global edits, edits use virtual function. 2014-02-12 20:00:07 -08:00
Andrzej Kapolka
f9b0ff0608 Various bits of streaming work: send delete messages for main channel on
reliable channel, test messages on main channel.
2014-02-12 12:33:40 -08:00
Andrzej Kapolka
36f1e59201 Working on support for sending messages through reliable channels. 2014-02-10 20:26:09 -08:00
Andrew Meadows
c8bb539a0c Theoretical fix for windows build of tests/metavoxels 2014-02-10 16:24:10 -08:00
Andrzej Kapolka
e9579feef5 Reordering testing. 2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d Streaming fixes. 2014-02-09 23:38:33 -08:00
Andrzej Kapolka
f81a9d9fe8 Circular buffer work. 2014-02-09 22:29:23 -08:00
Andrzej Kapolka
8c9f06ceec Fix/tests for streaming. 2014-02-09 17:43:18 -08:00
Andrzej Kapolka
524ceb4ed2 Working on tests for datagram sequencing, added autogenerated ==/!= operators
to mtc.
2014-02-09 16:26:53 -08:00