Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 14:03:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14099 commits 69 branches 56 tags 1.2 GiB
Commit graph

107 commits

Author SHA1 Message Date
Andrzej Kapolka
8999fcef17 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-25 11:42:55 -07:00
ZappoMan
a7f2d150a4 what's this cmake defines ssize_t??? 2014-06-24 20:15:34 -07:00
ZappoMan
fd3916e662 another hack attempt to fix unit tests on windows 2014-06-24 20:10:06 -07:00
ZappoMan
1001ea5f87 fixed some windows warnings 2014-06-24 20:07:47 -07:00
Andrzej Kapolka
e7db355c95 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-24 19:11:43 -07:00
Andrzej Kapolka
65e50f32e4 Tests, fixes for SpanList. 2014-06-24 19:10:52 -07:00
ZappoMan
fdb0cf9386 change order of headers 2014-06-24 18:53:20 -07:00
ZappoMan
773e1b0522 try to get tests to build 2014-06-24 18:02:35 -07:00
ZappoMan
3da18ec1c0 try to disable model tests 2014-06-24 17:23:09 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll 
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
 2014-06-24 15:47:18 -07:00
ZappoMan
52b61ebab8 added addModel() performance test 2014-06-23 14:48:12 -07:00
ZappoMan
48e779cf8e added some performance tests 2014-06-23 14:08:47 -07:00
Andrzej Kapolka
e72429171f Working on congestion tests. 2014-06-23 12:01:49 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
Andrzej Kapolka
626bd42b7b Use randomColorValue, since we have it. 2014-06-20 18:22:36 -07:00
Andrzej Kapolka
de0c45a919 Spanner mutation in test. 2014-06-20 18:09:51 -07:00
Andrew Meadows
c17b8fdb60 collisions update shapes 
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
 2014-06-20 16:31:39 -07:00
Andrzej Kapolka
ce778f47b1 More work on stream testing, fixed bug with differently-ordered edits. 2014-06-20 14:08:39 -07:00
Andrzej Kapolka
24f535e02d Working on metavoxel streaming tests. 2014-06-19 18:15:17 -07:00
Andrzej Kapolka
7a9c0f0e6a Working on tests for metavoxel streaming. 2014-06-19 14:50:19 -07:00
Andrew Meadows
c98631f820 merge upstream/master into andrew/ragdoll 2014-06-18 17:23:24 -07:00
Andrew Meadows
715cc3467d forgot to add the test files 2014-06-18 14:47:39 -07:00
Andrew Meadows
96eebec0fc unit tests for VerletShapes 2014-06-18 14:06:00 -07:00
Andrzej Kapolka
26159a05d9 Fix for sporadic test failure due to hash ordering. 2014-06-18 13:09:45 -07:00
Andrew Meadows
9e839f0980 Shape::getCenter() -> Shape::getTranslation() 2014-06-18 08:55:48 -07:00
Andrzej Kapolka
9ded9b0696 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-17 17:07:38 -07:00
Andrzej Kapolka
758beff3d9 Make sure to use same enum streamer for the ones registered by type and the 
ones registered by scope/name.
 2014-06-17 17:06:28 -07:00
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll 
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
 2014-06-17 17:03:16 -07:00
Brad Hefta-Gaub
41b3e3e4ea Merge pull request #3023 from ey6es/metavoxels 
Refactored type/object streaming, added support for reading into/writing from "generic" containers that don't require the original classes/types.
 2014-06-17 16:24:22 -07:00
Brad Hefta-Gaub
6fc05d66c8 Merge pull request #3030 from AndrewMeadows/inertia 
raycasts against Shapes
 2014-06-17 16:10:36 -07:00
ZappoMan
4413049302 fixed a bug in inside out ray casting returning the wrong face 2014-06-17 13:05:35 -07:00
Andrew Meadows
f18864bd72 Moved findRayIntersection() to the Shape classes 2014-06-17 12:36:36 -07:00
Andrzej Kapolka
7931173671 Working on tools to convert bitstreams to/from json. 2014-06-17 12:33:31 -07:00
Andrew Meadows
018ba52b1c merge upstream/master with andrew/inertia 2014-06-17 10:50:49 -07:00
Andrew Meadows
fa6aed3e01 Add unit tests for ray intersections with shapes. 2014-06-17 10:49:53 -07:00
Andrzej Kapolka
37c977af02 Tests working for reading JSON. 2014-06-16 19:12:21 -07:00
Andrew Meadows
92159a7ed5 Shape::get/setCenter() instead of get/setPosition() 2014-06-16 08:43:27 -07:00
Andrzej Kapolka
aac7459f42 More work on JSON encoding. 2014-06-13 18:32:57 -07:00
Andrzej Kapolka
9fc84d6358 Generics up and running. 2014-06-13 12:00:42 -07:00
Andrzej Kapolka
d1549b00ab Might as well include strings in the "simple" random script objects. 2014-06-09 17:22:44 -07:00
Andrzej Kapolka
3293ab788b Fix for script object deltas. 2014-06-09 17:19:36 -07:00
Andrzej Kapolka
590f045ed1 Script value streaming tests, fixes. 2014-06-09 16:51:41 -07:00
Andrzej Kapolka
361461516c Check the delta-encoded objects, report bytes sent/received. 2014-06-06 14:26:20 -07:00
Andrzej Kapolka
56d9bc5215 Working on delta-streaming tests. 2014-06-06 11:37:45 -07:00
Andrzej Kapolka
0fc6354b6c Fix for streaming the same object. 2014-06-06 11:18:55 -07:00
Andrzej Kapolka
c333fb904f Working on tests for delta streaming. 2014-06-05 16:45:13 -07:00
Andrzej Kapolka
c44dba78cb Provide a reasonably painless way to stream enums that aren't object 
properties.
 2014-06-05 15:32:55 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements 
Octree wireformat improvements checkpoint
 2014-06-04 21:58:08 -07:00
Philip Rosedale
b59b26d87b Merge pull request #2985 from ey6es/metavoxels 
Pulled in fixes for delta-encoding from "deltatars," added support for version-resilient streaming of Qt enums/flags.
 2014-06-04 21:23:46 -07:00
Andrzej Kapolka
54a5bc3a49 More enum stuff, with tests. 2014-06-04 17:24:43 -07:00