samcake
b4b541178d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-16 09:42:06 -08:00
Seth Alves
4429890cd8
Merge pull request #6668 from zzmp/fix/fbx-texture
...
Load texture by convention with .obj
2015-12-16 06:47:02 -08:00
Brad Davis
1e5793893b
Merge pull request #6665 from ZappoMan/rightClickMenu
...
fix bug in simulated left click - make qml menus work
2015-12-15 21:40:00 -08:00
Zach Pomerantz
3280894e29
Load texture by convention with .obj
2015-12-15 19:30:15 -08:00
Clément Brisset
7c8f019507
Merge pull request #6663 from birarda/baseball
...
update link to bat script in createBatButton.js
2015-12-15 19:26:33 -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
Brad Hefta-Gaub
76da3a14ac
fix bug in simulated left click - make qml menus work
2015-12-15 17:58:07 -08:00
Stephen Birarda
13c83bb262
update link to bat script in createBatButton.js
2015-12-15 17:23:29 -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
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
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
Andrew Meadows
71d220027e
Merge pull request #6582 from samcake/hdr
...
Graphics: Tone mapping is now done in a separate class
2015-12-15 09:53:17 -08:00
samcake
2bbd5d86b8
cleaning indentation
2015-12-15 09:46:18 -08:00
Andrew Meadows
51ff8f096e
correct input plugin load path on linux
2015-12-15 08:43:04 -08:00
samcake
e70ab472af
Merging with upstream master/graphics
2015-12-14 18:38:29 -08:00
samcake
c99ae5d0cb
Merge pull request #6656 from samcake/graphicsMaster
...
Graphics : Merge upstream master into upstream graphics
2015-12-14 18:32:30 -08:00
samcake
84d1e3b123
Merged with upstream master
2015-12-14 18:30:24 -08:00
samcake
a50b14dfae
Merging with upstream graphics
2015-12-14 18:18:39 -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
Clément Brisset
a37c28871e
Merge pull request #6655 from samcake/graphicsMaster
...
Graphics: merge upstream master to upstream graphics
2015-12-14 18:07:31 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -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
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
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
Brad Hefta-Gaub
2815cb0fef
first cut at adding advanced and developer menu groupings
2015-12-12 18:12:36 -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
Andrew Meadows
beeb3becd6
Merge pull request #6639 from sethalves/dont-simulate-model-too-soon
...
don't simulate model until it has geometry
2015-12-12 07:33:22 -08:00
Sam Cake
6288e99798
Playing with mirror
2015-12-11 23:28:04 -08:00
Atlante45
b8495a6912
Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win
2015-12-11 18:05:47 -08:00
samcake
b3acde4462
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-11 17:49:00 -08:00
