Ryan Huffman
11d4a7f8d3
Fix shutdown of ac monitor on Windows
2015-12-21 10:22:07 -08:00
Ryan Huffman
5dc33015f7
Merge branch 'console' of github.com:birarda/hifi into console
2015-12-17 15:34:35 -08:00
Ryan Huffman
01cf1c1d79
Merge pull request #57 from birarda/console-packaging
...
add latest icons, move source files to src
2015-12-17 15:33:06 -08:00
Stephen Birarda
3b92e77fdf
adjust console gitignore to handle all platforms
2015-12-16 15:08:52 -08:00
Stephen Birarda
146564d8cb
rename icon files to console for searchability
2015-12-16 14:52:25 -08:00
Stephen Birarda
dba54b4352
icon repairs for OS X package
2015-12-16 14:49:54 -08:00
Stephen Birarda
04d8918afb
update to new tray icon
2015-12-16 12:10:34 -08:00
Stephen Birarda
7fb433b212
re-organize console folder with src
2015-12-16 12:08:53 -08:00
Stephen Birarda
1ac5ba3b8c
change packaging command per platform
2015-12-16 11:48:32 -08:00
Stephen Birarda
2ff9d7a28c
update electron to 0.36.0, add packaging commands
2015-12-16 11:48:10 -08:00
Ryan Huffman
272ffda3db
Merge branch 'console' of github.com:birarda/hifi into console
2015-12-16 10:23:01 -08:00
Stephen Birarda
20886748af
resolve conflicts on merge with upstream/master
2015-12-16 10:21:24 -08:00
Stephen Birarda
ee2537c0ec
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2015-12-16 10:20:10 -08:00
Ryan Huffman
b4bd75e497
Update console Process logging to be optional
2015-12-16 09:21:00 -08:00
Ryan Huffman
5bdea485fc
Add log opening to console
2015-12-16 09:11:24 -08:00
Ryan Huffman
b907a04a3f
Add log directory to AssignmentClientMonitor
2015-12-16 09:08:51 -08:00
Ryan Huffman
195f58e130
Add log-directory option to AC monitor
2015-12-16 08:51:13 -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
Ryan Huffman
1e9a8cedf0
Merge branch 'console' of github.com:birarda/hifi into console
2015-12-15 14:07:55 -08:00
Ryan Huffman
e1e290c08a
Merge pull request #55 from birarda/console-dev
...
check for local binaries in development
2015-12-15 14:02:39 -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
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
Ryan Huffman
23dcb77019
Merge branch 'master' of github.com:highfidelity/hifi into console
2015-12-14 11:52:50 -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
