Seth Alves
0003c607ea
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-15 18:46:21 -08:00
Seth Alves
13a1eec48c
Merge pull request #6658 from AndrewMeadows/linux-input-plugins
...
correct input plugin load path on linux
2015-12-15 18:39:27 -08:00
Seth Alves
e8aa9c07ed
Merge branch 'linux-input-plugins' of github.com:AndrewMeadows/hifi into near-grab-via-parenting
2015-12-15 18:38:04 -08:00
Seth Alves
630b53d950
revert grab script changes
2015-12-15 17:42:34 -08:00
Seth Alves
1c0231c416
quiet some debugging prints
2015-12-15 16:46:16 -08:00
Seth Alves
951db42146
only send queryAABox if something about the location changed
2015-12-15 16:17:49 -08:00
Brad Davis
29516619ee
Merge pull request #6661 from ZappoMan/rightClickMenu
...
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 16:08:59 -08:00
Brad Hefta-Gaub
aa53900fa3
CR feedback
2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub
6420a43858
fix type
2015-12-15 15:35:17 -08:00
Seth Alves
0ac06bad5c
more AACube plumbing
2015-12-15 15:31:02 -08:00
Seth Alves
2b800d711f
queryAACube to and from scriptvalues
2015-12-15 15:18:43 -08:00
Seth Alves
b9f0a87a25
if a server can't get the queryAACube but received one from an interface, use the received one
2015-12-15 14:43:14 -08:00
Brad Hefta-Gaub
3e1e85aa18
Merge pull request #6659 from ctrlaltdavid/20757
...
Fix signal connection to ScriptEngine::finished()
2015-12-15 14:42:24 -08:00
Brad Hefta-Gaub
5a355bd22f
Merge pull request #6653 from hyperlogic/tony/model-entity-animation-fix
...
ModelEntityItem: fix for incorrect joint mapping
2015-12-15 14:29:06 -08:00
Brad Hefta-Gaub
7d43504c0c
Merge pull request #6615 from hyperlogic/tony/js-avatar-default-pose
...
Expose Avatar default pose to JavaScript
2015-12-15 14:27:53 -08:00
Seth Alves
0013d58365
include queryAACube when scripts make changes
2015-12-15 14:25:02 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
David Rowe
541af36794
Fix signal connection to ScriptEngine::finished
2015-12-16 09:12:07 +13:00
Seth Alves
a3631ea1d1
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-15 10:12:49 -08:00
Andrew Meadows
51ff8f096e
correct input plugin load path on linux
2015-12-15 08:43:04 -08:00
Brad Hefta-Gaub
1bcf275b53
Merge pull request #6652 from samcake/red
...
Fix Full screen mirror behavior
2015-12-14 18:12:19 -08:00
samcake
571ccb3c20
cleaning up the code
2015-12-14 17:14:45 -08:00
Anthony J. Thibault
617fda7832
ModelEntityItem: fix for incorrect joint mapping
...
This could happen when switching the animation url between fbx files
with different joint mappings. Only the first one would take effect.
This should fix the issue in the demo domain, with the contorted doll model.
2015-12-14 17:07:53 -08:00
samcake
9f1f0798cb
cleaning up the code
2015-12-14 17:04:26 -08:00
samcake
ed2d45d0b6
HMD Mirror looks correct
2015-12-14 16:18:44 -08:00
Seth Alves
165c41d843
add a way to remember which entities couldn't be properly placed in octree due to missing parents
2015-12-14 14:19:19 -08:00
Anthony J. Thibault
3f0cdb3c02
Merge branch 'master' into tony/js-avatar-default-pose
2015-12-14 11:19:24 -08:00
Clément Brisset
205bc1b790
Merge pull request #6641 from ZappoMan/removeFeatureCruft
...
Remove the blue sphere while speaking
2015-12-14 10:39:05 -08:00
samcake
1597d3d466
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2015-12-14 10:25:22 -08:00
samcake
2aad26154e
THis should fix the mirror and the skybox issue
2015-12-14 10:24:51 -08:00
Seth Alves
b9fc368857
Merge pull request #6633 from huffman/agent-spatial-finder
...
Add AssignmentParentFinder to Agent
2015-12-14 09:35:27 -08:00
samcake
e005bb7b5a
MAybe a mirror solution ?
2015-12-14 09:25:32 -08:00
Seth Alves
008065ba38
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Brad Hefta-Gaub
248c94e638
Merge branch 'master' of https://github.com/highfidelity/hifi into removeFeatureCruft
2015-12-14 09:04:49 -08:00
Andrew Meadows
0b7b9dcfda
Merge pull request #6640 from ZappoMan/menuGroups
...
first cut at adding advanced and developer menu groupings
2015-12-14 08:58:19 -08:00
Brad Hefta-Gaub
cf67e883ab
Merge pull request #6650 from ctrlaltdavid/win-build-instructions
...
Update Windows build instructions for 64-bit builds
2015-12-13 19:29:42 -08:00
David Rowe
7190c26c40
Update Windows build instructions for 64-bit builds
2015-12-14 15:37:10 +13:00
Philip Rosedale
11fca6be6e
Merge pull request #6647 from kencooke/master
...
Fix crash in "entry" from procedural skybox
2015-12-13 18:30:17 -08:00
Ken Cooke
67d6965f14
Revert "Fix the broken skybox and simplify a bit the vertex shader used"
...
This reverts commit 68134aafe5
2015-12-13 16:14:38 -08:00
Brad Hefta-Gaub
be058398a2
remove blue sphere while speaking
2015-12-13 12:02:39 -08:00
Seth Alves
270d5fc8e1
remove commented-out code
2015-12-13 06:44:34 -08:00
Seth Alves
f3acec5177
whitespace
2015-12-13 06:44:15 -08:00
Seth Alves
076e2b73a1
make AABox encoder and decode safer
2015-12-13 06:44:06 -08:00
Brad Hefta-Gaub
2815cb0fef
first cut at adding advanced and developer menu groupings
2015-12-12 18:12:36 -08:00
Seth Alves
da7aed8666
use parenting for near-grabbing
2015-12-12 14:48:07 -08:00
Seth Alves
7f11d2a4fe
whitespace
2015-12-12 14:45:02 -08:00
Brad Hefta-Gaub
868ed0dfbc
Merge pull request #6585 from AndrewMeadows/bullet-2.x
...
upgrade to bullet-2.83
2015-12-12 13:05:38 -08:00
Brad Hefta-Gaub
63c3f7c1a7
Merge pull request #6637 from Atlante45/warnings-win
...
Warning cleanup
2015-12-12 13:00:55 -08:00
Seth Alves
1492fd6090
merge from upstream
2015-12-12 12:37:57 -08:00
