Seth Alves
|
68cfda1af9
|
try again on AACube::operator +=
|
2015-12-21 11:34:53 -08:00 |
|
Seth Alves
|
00e0b26f05
|
fix thinko and whitespace
|
2015-12-21 11:15:54 -08:00 |
|
Seth Alves
|
3c2dac5cf8
|
parent query-cube should encompass child query-cube not child max-aa-cube
|
2015-12-21 11:05:07 -08:00 |
|
Seth Alves
|
abaa329984
|
parents AACube should encompass all children's
|
2015-12-21 10:55:07 -08:00 |
|
Seth Alves
|
1d9a81d5d4
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2015-12-21 09:14:37 -08:00 |
|
Brad Davis
|
46a4a469e9
|
Merge pull request #6689 from ZappoMan/rightClickMenu
Some early work to support hand driven reticle
|
2015-12-20 17:49:50 -08:00 |
|
Seth Alves
|
d71cecbc61
|
Merge pull request #6675 from AndrewMeadows/crash-fix
fix crash when visiting new domain with gun in hand
|
2015-12-20 06:24:44 -08:00 |
|
Brad Hefta-Gaub
|
ae04556f45
|
Merge pull request #6708 from sethalves/fix-entity-server-crash
fix entity-server crash
|
2015-12-19 16:13:24 -08:00 |
|
Seth Alves
|
bc52576ba2
|
Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting
|
2015-12-19 08:14:15 -08:00 |
|
Seth Alves
|
9271209d89
|
another
|
2015-12-19 08:13:53 -08:00 |
|
Seth Alves
|
a175bb85f9
|
Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting
|
2015-12-19 08:09:44 -08:00 |
|
Seth Alves
|
cdefa7ec32
|
move some debugging scripts into their own directory
|
2015-12-19 08:09:39 -08:00 |
|
Seth Alves
|
8b9de716f1
|
fix bad pointer juju
|
2015-12-19 08:08:10 -08:00 |
|
Seth Alves
|
b82559e898
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2015-12-19 07:08:25 -08:00 |
|
Brad Hefta-Gaub
|
e929e3f789
|
more work on angular velocity tests
|
2015-12-18 19:20:32 -08:00 |
|
Brad Hefta-Gaub
|
f55445bb88
|
Merge pull request #6707 from jherico/webengine
Fixing QML based web view crash.
|
2015-12-18 18:19:36 -08:00 |
|
Brad Davis
|
ae6cf131f5
|
Fixing crash bug
|
2015-12-18 17:19:06 -08:00 |
|
Brad Davis
|
6098c4a1d6
|
Revert "Revert "Migrate QML based web views to Qt WebEngine""
This reverts commit 1f3adeb666.
|
2015-12-18 17:18:46 -08:00 |
|
Seth Alves
|
4c996885e5
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2015-12-18 17:15:29 -08:00 |
|
Brad Davis
|
baf2d5acb7
|
Merge pull request #6705 from highfidelity/revert-6651-webengine
Revert "Migrate QML based web views to Qt WebEngine"
|
2015-12-18 17:09:44 -08:00 |
|
Brad Davis
|
1f3adeb666
|
Revert "Migrate QML based web views to Qt WebEngine"
|
2015-12-18 17:09:38 -08:00 |
|
Seth Alves
|
f60240e3f3
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2015-12-18 16:28:51 -08:00 |
|
Seth Alves
|
d7e08876da
|
Merge branch 'near-grab-via-parenting' of github.com:sethalves/hifi into near-grab-via-parenting
|
2015-12-18 16:28:34 -08:00 |
|
Seth Alves
|
701f99d28e
|
only send a queryAACube for entities to entity-server
|
2015-12-18 16:28:11 -08:00 |
|
Seth Alves
|
3782c21b45
|
when a parent moves, check children vs their queryAACubes
|
2015-12-18 16:06:51 -08:00 |
|
Brad Hefta-Gaub
|
a621579f17
|
add philips version of hand movement
|
2015-12-18 15:44:21 -08:00 |
|
Brad Hefta-Gaub
|
4075f355a3
|
more work on hand movement
|
2015-12-18 15:44:01 -08:00 |
|
Seth Alves
|
7689453ba2
|
don't reset action refresh counter untill the updateAction succeeded
|
2015-12-18 15:11:28 -08:00 |
|
Seth Alves
|
9b49d9d66b
|
default parentJointIndex to -1
|
2015-12-18 15:10:51 -08:00 |
|
Brad Hefta-Gaub
|
868d10651a
|
Merge pull request #6651 from jherico/webengine
Migrate QML based web views to Qt WebEngine
|
2015-12-18 14:56:35 -08:00 |
|
Seth Alves
|
13ad6bf2f7
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2015-12-18 14:52:02 -08:00 |
|
Seth Alves
|
5bede8123d
|
script for debugging queryAACube
|
2015-12-18 14:47:05 -08:00 |
|
Seth Alves
|
69bba4a182
|
queryAABox wasn't centered on object
|
2015-12-18 14:46:24 -08:00 |
|
Brad Davis
|
88b88a3306
|
Fixing warnings
|
2015-12-18 14:32:35 -08:00 |
|
Brad Hefta-Gaub
|
42764426ce
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
|
2015-12-18 14:30:16 -08:00 |
|
Brad Hefta-Gaub
|
bfa0652100
|
Merge pull request #6700 from AndrewMeadows/angular-velocity-is-a-vector
protect against NaN in measure of hydra angularVelocity
|
2015-12-18 14:29:23 -08:00 |
|
Andrew Meadows
|
aa3d1c6e4c
|
Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix
ModelEntityItem: Fix for incorrect animations with preTranslations
|
2015-12-18 14:16:35 -08:00 |
|
Seth Alves
|
b9a7ed8560
|
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
|
2015-12-18 14:02:51 -08:00 |
|
Andrew Meadows
|
eb3210071e
|
Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition
Improved idle to walk forward transition
|
2015-12-18 13:59:03 -08:00 |
|
Andrew Meadows
|
4e76e9e50b
|
prevent nan values in measure of angularVelocity
|
2015-12-18 13:51:14 -08:00 |
|
samcake
|
0492bb1c6d
|
Final cleans and tests using R11G11B10 for lighting buffer
|
2015-12-18 13:50:28 -08:00 |
|
Seth Alves
|
1a534ff645
|
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
|
2015-12-18 13:43:33 -08:00 |
|
Eric Levin
|
2e4df5f859
|
Merge pull request #6692 from ctrlaltdavid/20758
Update particlesTest.js per current particles implementation
|
2015-12-18 13:35:19 -08:00 |
|
samcake
|
f6c80e01e9
|
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
|
2015-12-18 13:23:09 -08:00 |
|
samcake
|
5a4d028573
|
Merge pull request #6699 from samcake/graphicsMaster
Graphics : merge upstream master into upstream graphics
|
2015-12-18 13:23:05 -08:00 |
|
samcake
|
0482a2a7f7
|
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
|
2015-12-18 13:20:46 -08:00 |
|
samcake
|
d22811a771
|
Merge pull request #6698 from zzmp/fix/check-locations-pipeline
Stop modelMesh render if pipeline is not found
|
2015-12-18 13:20:12 -08:00 |
|
samcake
|
dff4327f7d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-18 13:18:30 -08:00 |
|
Zach Pomerantz
|
2c2b794683
|
Stop modelMesh render if pipeline is not found
|
2015-12-18 13:16:05 -08:00 |
|
Brad Davis
|
16dd24f3d8
|
Removing unused LGPL JS file
|
2015-12-18 13:02:45 -08:00 |
|