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
|
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 |
|
wangyix
|
124bd88b01
|
added tests for MovingPercentile
|
2014-06-04 17:23:44 -07:00 |
|
ZappoMan
|
b74676de0d
|
add more tests for decode
|
2014-06-04 15:33:22 -07:00 |
|
ZappoMan
|
2066dbcec7
|
cleanup
|
2014-06-04 15:16:51 -07:00 |
|
ZappoMan
|
10f7eae7a0
|
implemented decode
|
2014-06-04 14:56:13 -07:00 |
|
ZappoMan
|
78d3f1454c
|
more operators
|
2014-06-04 14:19:35 -07:00 |
|
ZappoMan
|
2b85145325
|
added test suite for PropertyFlags, latest work on PropertyFlags
|
2014-06-04 11:41:09 -07:00 |
|
Andrzej Kapolka
|
90e2145fc4
|
Working on enum streaming.
|
2014-06-03 17:17:02 -07:00 |
|
Andrzej Kapolka
|
ac7d23bf54
|
Working on support for streaming Qt enums/flags.
|
2014-06-02 19:00:48 -07:00 |
|
Andrew Meadows
|
1d64262067
|
whoops, committed wrong file. Rolling back.
|
2014-05-05 08:46:35 -07:00 |
|
Andrew Meadows
|
6cc8d53a6d
|
fix sphere-cube collisions at edges
|
2014-05-04 22:14:05 -07:00 |
|
Andrew Meadows
|
c8e56a97cc
|
fix sphere-cube collisions, with tests
|
2014-05-02 21:47:27 -07:00 |
|
Andrew Meadows
|
fe42f66cc9
|
change x.f to be x.0f as per the coding standard
|
2014-04-23 13:27:43 -07:00 |
|
Andrew Meadows
|
7cb6856415
|
Adding some collision tests for sphere-vs-AACube
|
2014-04-22 10:44:41 -07:00 |
|
Andrew Meadows
|
22d2f84cff
|
merge upstream/master into andrew/scripting
|
2014-04-09 15:38:56 -07:00 |
|
Andrew Meadows
|
635f832dfe
|
rename shapeShape() to be collideShapes()
Also add collideShapesCoarse()
|
2014-04-09 13:04:17 -07:00 |
|
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 |
|