Andrew Meadows
|
a9957ac7df
|
the real fix for ray-vs-plane intersection
|
2014-09-12 08:40:03 -07:00 |
|
Andrew Meadows
|
ff0872a5f0
|
add RayIntersectionInfo::getIntersectionPoint()
|
2014-09-12 08:38:44 -07:00 |
|
Andrew Meadows
|
46089a0611
|
fix ray-vs-AACube logic
|
2014-09-12 08:37:47 -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 |
|
Andrew Meadows
|
c9d5508f16
|
merge upstream/master into andrew/ragdoll
|
2014-09-08 10:21:32 -07:00 |
|
Philip Rosedale
|
68cc49f19e
|
Merge pull request #3372 from ZappoMan/entitiesCrashes
Fixes the several entity crashes
|
2014-09-07 21:04:14 -07:00 |
|
ZappoMan
|
420f7de957
|
fix various crashes in entites
|
2014-09-07 20:31:54 -07:00 |
|
ZappoMan
|
9fdd1f422a
|
fix crash on change domains while entities are animating or moving
|
2014-09-06 16:54:36 -07:00 |
|
ZappoMan
|
d734655ab6
|
fix some recently introduced warnings
|
2014-09-06 16:03:03 -07:00 |
|
Brad Hefta-Gaub
|
a77739f31c
|
Merge pull request #3369 from ctrlaltdavid/20007
Code Review for Job #20007
|
2014-09-06 15:36:29 -07:00 |
|
David Rowe
|
5ebe6962a4
|
Make scripts loaded with Script.load() not persist
|
2014-09-06 09:59:47 -07:00 |
|
Clément Brisset
|
f3344ac440
|
Merge pull request #3365 from AndrewMeadows/inertia
remove warnings
|
2014-09-05 18:00:35 -07:00 |
|
Andrew Meadows
|
bd8fc75305
|
fix bug: zero velocity when teleporting to new locations
|
2014-09-05 17:51:18 -07:00 |
|
Andrew Meadows
|
51dca12a7b
|
added default case for switch statements
which avoids warnings about unhandled enum values
|
2014-09-05 16:55:42 -07:00 |
|
Andrew Meadows
|
2fdfb125f2
|
removed signed/unsigned comparisons
|
2014-09-05 16:55:24 -07:00 |
|
Andrew Meadows
|
c089dbb0bb
|
removed signed/unsigned comparisons
|
2014-09-05 16:44:33 -07:00 |
|
Andrew Meadows
|
e7b39ae119
|
removed unused variable
|
2014-09-05 16:42:24 -07:00 |
|
Andrew Meadows
|
3ae78da593
|
fixed signed/unsigned comparison
|
2014-09-05 16:41:51 -07:00 |
|
Andrew Meadows
|
62438bae6a
|
fixed signed/unsigned comparison and unused variable
|
2014-09-05 16:41:01 -07:00 |
|
Andrew Meadows
|
0ddc8eb448
|
fix signed/unsigned comparison
|
2014-09-05 16:40:14 -07:00 |
|
Brad Hefta-Gaub
|
5942386383
|
Merge pull request #3364 from Atlante45/stereo_injections
move isStereo packing to the correct position
|
2014-09-05 16:37:58 -07:00 |
|
Atlante45
|
619aebcd67
|
move isStereo packing to the correct position
|
2014-09-05 16:18:02 -07:00 |
|
Andrew Meadows
|
6f22ff01d9
|
merge upstream/master into andrew/ragdoll
|
2014-09-05 16:04:01 -07:00 |
|
Philip Rosedale
|
1d2150e12d
|
Merge pull request #3362 from Atlante45/stereo_injections
Added stereo option to the AudioInjector
|
2014-09-05 15:53:29 -07:00 |
|
Philip Rosedale
|
39ffd3dadd
|
Merge pull request #3356 from ZappoMan/fixingOctreeSave
voxel file corruption fixes
|
2014-09-05 15:51:02 -07:00 |
|
ZappoMan
|
f0d72b83fa
|
CR feedback
|
2014-09-05 15:39:29 -07:00 |
|
ZappoMan
|
1e6b49899a
|
allow FBXReader to parse new format SVO files
|
2014-09-05 15:12:41 -07:00 |
|
Andrew Meadows
|
b953d880a3
|
minor optimization on CubeList and VoxelPool
|
2014-09-05 14:41:18 -07:00 |
|
Atlante45
|
507419162c
|
Added stereo option to the AudioInjector
|
2014-09-05 14:34:55 -07:00 |
|
ZappoMan
|
a19ce6e859
|
clean up warning
|
2014-09-05 12:52:04 -07:00 |
|
ZappoMan
|
54a746a846
|
remove noise
|
2014-09-05 12:49:23 -07:00 |
|
ZappoMan
|
e1064d8da7
|
correctly implement data types who assume all child data must be included (e.g. voxels)
|
2014-09-05 12:41:14 -07:00 |
|
ZappoMan
|
a25790b350
|
more work on fixing voxels
|
2014-09-05 11:51:17 -07:00 |
|
Andrew Meadows
|
ff09a0d41b
|
merge upstream/master into andrew/inerita
|
2014-09-05 11:47:49 -07:00 |
|
Andrew Meadows
|
7be411b4ca
|
expose _measured_ MyAvatar velocity to JS
|
2014-09-05 11:44:13 -07:00 |
|
Ryan Huffman
|
b0a0760be2
|
Update ShutdownEventListener to not stop event handling
|
2014-09-05 11:26:22 -07:00 |
|
Ryan Huffman
|
38a14c3864
|
Reapply "Update assignment client to close on WM_CLOSE message on Windows"
This reverts commit a603453cf2 .
|
2014-09-05 11:19:36 -07:00 |
|
ZappoMan
|
f234dbf9a1
|
converting voxel files to new versioned format with buffer breaks
|
2014-09-05 10:51:08 -07:00 |
|
Leonardo Murillo
|
a603453cf2
|
Revert "Update assignment client to close on WM_CLOSE message on Windows"
|
2014-09-05 11:36:56 -06:00 |
|
ZappoMan
|
5c5658b6e7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixingOctreeSave
|
2014-09-05 09:27:27 -07:00 |
|
ZappoMan
|
60e8056cd8
|
removed some debug code
|
2014-09-05 02:20:30 -07:00 |
|
ZappoMan
|
dc31381fc1
|
better handling of old model files
|
2014-09-05 02:19:17 -07:00 |
|
ZappoMan
|
3c2b534842
|
dead code cleanup and comment cleanup
|
2014-09-05 01:50:43 -07:00 |
|
ZappoMan
|
5ec98b8dec
|
more guards to corrupt voxel files
|
2014-09-05 01:40:41 -07:00 |
|
ZappoMan
|
a189f077b8
|
fix huge-mega-voxels and voxel file corruption
|
2014-09-05 01:13:22 -07:00 |
|
Brad Hefta-Gaub
|
9648c0d64e
|
Merge pull request #3343 from AndrewMeadows/ragdoll
Ragdoll Part 12: first pass avatar skeleton collides with voxels
|
2014-09-04 23:09:08 -07:00 |
|
Andrzej Kapolka
|
b275af48ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-09-04 17:26:34 -07:00 |
|
Andrzej Kapolka
|
83d209dbdc
|
Remove unused variables.
|
2014-09-04 17:26:01 -07:00 |
|
Clément Brisset
|
fb8b3020e5
|
Merge pull request #3353 from ZappoMan/virtualEntities
fix couple of Entities issues: possible static memory corruption, sphere colors
|
2014-09-04 16:23:38 -07:00 |
|