Andrew Meadows
|
c21491a034
|
add update expiry to VoxelShapeManager
|
2014-09-12 17:38:20 -07:00 |
|
Andrew Meadows
|
32b07027d3
|
namechange planeNormal --> faceNormal
|
2014-09-12 17:27:56 -07:00 |
|
Andrew Meadows
|
4e7a7667b1
|
remove unused variable
|
2014-09-12 09:19:03 -07:00 |
|
Andrew Meadows
|
c475d5db36
|
unit tests for ray-vs-AACubeShape and PlaneShape
|
2014-09-12 08:41:28 -07:00 |
|
Andrew Meadows
|
825be3e1e7
|
fix for ray-vs-AACubeShape intersection test
|
2014-09-12 08:40:48 -07:00 |
|
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
|
08e5dbadfd
|
added validation of RayIntersectionInfo::_hitShape
|
2014-09-11 09:44:41 -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 |
|
Philip Rosedale
|
de4b423c46
|
Merge pull request #3367 from ZappoMan/improveClockSkew
improve ping behavior and clockskew in octree servers
|
2014-09-07 20:59:34 -07:00 |
|
ZappoMan
|
420f7de957
|
fix various crashes in entites
|
2014-09-07 20:31:54 -07:00 |
|
Clément Brisset
|
dc59cd4bb6
|
Merge pull request #3371 from ZappoMan/warningFixes
fix some recently introduced warnings
|
2014-09-06 19:01:56 -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
|
fe3f0cd358
|
Merge pull request #3355 from stojce/19964
Code Review for Job #19964
|
2014-09-06 15:43:27 -07:00 |
|
Brad Hefta-Gaub
|
d342f9281f
|
Merge pull request #3357 from huffman/19968
Code Review for Job #19968
|
2014-09-06 15:42:02 -07:00 |
|
Brad Hefta-Gaub
|
2f22292213
|
Merge pull request #3370 from ZappoMan/defaultScriptsLoad
use load instead of include for default scripts since Script.load() now works better
|
2014-09-06 15:38:49 -07:00 |
|
ZappoMan
|
293fc56a66
|
use load instead of include for default scripts since Script.load() now works better
|
2014-09-06 15:38:01 -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 |
|
ZappoMan
|
f16a85b2aa
|
fix header
|
2014-09-05 19:07:30 -07:00 |
|
ZappoMan
|
9e21d26a6d
|
improve ping behavior and clockskew in octree servers by introducing datagramprocessing thread
|
2014-09-05 19:03:44 -07:00 |
|
Clément Brisset
|
7476c61647
|
Merge pull request #3366 from ey6es/master
The long-requested full "Retina" resolution fix for OS X.
|
2014-09-05 18:08:22 -07:00 |
|
Andrzej Kapolka
|
c9d22ea07e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-09-05 18:04:15 -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 |
|
Andrzej Kapolka
|
0b2d0a0b07
|
Fix for mouse events.
|
2014-09-05 17:30:19 -07:00 |
|
Andrew Meadows
|
526d998924
|
removed warnigs about ill-formed narrowing conversion
|
2014-09-05 17:21:15 -07:00 |
|
Andrew Meadows
|
1d7ac23aa1
|
removed signed/unsigned comparison
|
2014-09-05 17:10:13 -07:00 |
|
Andrzej Kapolka
|
c2cd23a54c
|
Mouse coordinate fix.
|
2014-09-05 17:07:37 -07:00 |
|
Andrew Meadows
|
5c75b53c0d
|
removed singed/unsigned comparisons
|
2014-09-05 17:06:42 -07:00 |
|
Andrew Meadows
|
2f03f0fb0d
|
removed unused variables
|
2014-09-05 17:00:23 -07:00 |
|
Andrew Meadows
|
be4ec8920d
|
reorderd init of data members in ctor
|
2014-09-05 16:58:25 -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 |
|
Andrzej Kapolka
|
5bdad18ade
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-09-05 16:45:15 -07:00 |
|
Andrzej Kapolka
|
7f6b3d3649
|
Dimension fixes for Retina displays.
|
2014-09-05 16:44:45 -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 |
|