Commit graph

1342 commits

Author SHA1 Message Date
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
c9b58c0ee9 fix headers in h files in tests, fix Andrew's dates 2014-04-09 09:49:47 -07:00
Stephen Birarda
cb402e3eb3 run apache header script on tests 2014-04-09 09:46:43 -07:00
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07:00
Andrew Meadows
c383b69b61 merge upstream/master into enforce-standard
Conflicts:
	interface/src/avatar/Hand.cpp
2014-03-27 10:53:54 -07:00
Andrzej Kapolka
7f3977578e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 18:30:06 -07:00
Andrew Meadows
4c64c11144 making some type casts abide by coding standard 2014-03-26 16:58:47 -07:00
Andrew Meadows
06fbd49ffa Adding StreamUtils for common debug output 2014-03-25 15:29:22 -07:00
Andrzej Kapolka
d569802fbc More metadata fixes. 2014-03-17 17:21:46 -07:00
Andrzej Kapolka
eb95b01aa1 Fixes to, test for metadata streaming. 2014-03-17 16:10:30 -07:00
Andrzej Kapolka
b21247ca67 Optional hash/full metadata streaming for QObjects. 2014-03-16 17:29:30 -07:00
Andrew Meadows
ab84526a1b removing compile warnings 2014-03-14 16:12:32 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians
prefer radians over degrees
2014-03-12 12:10:29 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
	interface/src/renderer/FBXReader.cpp
2014-03-05 18:28:25 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes
Collision Shapes
2014-03-05 17:59:42 -08:00
Andrzej Kapolka
d1747ed8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-05 17:12:37 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -08:00
Andrzej Kapolka
cbfc60d017 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 11:18:54 -08:00
Andrew Meadows
ea0bc52e12 removing unused variables 2014-03-04 09:56:06 -08:00
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