Atlante45
|
ba5c20b7a6
|
Header cleanup
|
2015-10-06 13:56:24 -07:00 |
|
Atlante45
|
dde11c5cd1
|
More unused
|
2015-10-06 13:56:23 -07:00 |
|
Atlante45
|
cf3b33a96b
|
Replace Application::getInstance() with qApp
|
2015-10-06 13:56:19 -07:00 |
|
Brad Davis
|
8090bc8e8d
|
Revert "Enabling programmatic access to the IPD scale"
|
2015-10-06 10:16:42 -07:00 |
|
Brad Davis
|
725ed26ac2
|
Enabling programmatic access to the IPD scale
|
2015-10-04 16:55:49 -07:00 |
|
Brad Hefta-Gaub
|
00c32fc7cd
|
Merge pull request #5924 from jherico/marge
Support for accessing IPD in scripts
|
2015-09-29 14:24:53 -07:00 |
|
Brad Davis
|
7b1c04512a
|
Adding support for accessing IPD in scripts
|
2015-09-28 16:24:38 -07:00 |
|
Ryan Huffman
|
1a9cd59339
|
Fix ClipboardScriptingInterface to call methods on main app thread
|
2015-09-28 15:05:48 -07:00 |
|
Brad Hefta-Gaub
|
0ba1e8c945
|
remove renderingInWorldInterface signals
|
2015-09-18 09:49:57 -07:00 |
|
David Rowe
|
c9d799f5e0
|
Auto refresh entities list upon display of Entities tab
|
2015-08-27 13:32:00 -07:00 |
|
David Rowe
|
9d3d104ec3
|
Add Desktop object to JavaScript with width and height properties
|
2015-08-25 16:13:36 -07:00 |
|
Brad Hefta-Gaub
|
13a9dc4df2
|
cleanup controller interface, add getActionNames() and getDeviceNames()
|
2015-08-24 15:35:55 -07:00 |
|
David Rowe
|
bb2c48e3ed
|
Add size and position properties, methods, and events to WebWindow
|
2015-08-14 14:42:32 -07:00 |
|
Brad Hefta-Gaub
|
b726769f15
|
Merge pull request #5402 from highfidelity/plugins
New plugins architecture
|
2015-08-11 11:11:27 -07:00 |
|
David Rowe
|
90637272c5
|
Add WebWindow setPosition() method
|
2015-08-07 17:38:41 -07:00 |
|
Sam Gondelman
|
54f64b62eb
|
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
|
2015-08-06 14:45:26 -07:00 |
|
Bradley Austin Davis
|
7e60aee1bf
|
Merge branch 'master' into plugins
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
|
2015-08-06 11:03:37 -07:00 |
|
Sam Gondelman
|
113c4ea28b
|
exposing palm velocity and angular velocity to js
|
2015-08-05 12:17:15 -07:00 |
|
SamGondelman
|
52be44d621
|
uninitialized value
|
2015-08-04 14:50:38 -07:00 |
|
Zander Otavka
|
e5b8701215
|
Add toggle event for address bar.
|
2015-07-31 11:26:04 -07:00 |
|
Zander Otavka
|
c77a91eb63
|
Expose address bar toggling to scripts.
|
2015-07-31 11:26:04 -07:00 |
|
Brad Davis
|
f0d0979ade
|
Fix UI element placement
|
2015-07-29 09:19:09 -07:00 |
|
Bradley Austin Davis
|
3c6416d6b8
|
Merge branch 'master' into plugins
|
2015-07-27 10:09:02 -04:00 |
|
David Rowe
|
3893add148
|
Fix setting WebWindow's width and height
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
|
2015-07-24 10:43:24 -07:00 |
|
Bradley Austin Davis
|
a60e669d3d
|
Merge branch 'master' into plugins
|
2015-07-24 13:38:18 -04:00 |
|
David Rowe
|
c1e1caa709
|
Add ability to update title of WebWindow after it's created
|
2015-07-23 21:59:19 -07:00 |
|
Bradley Austin Davis
|
408bb082d7
|
Merge fixes, OSX compile fixes
|
2015-07-22 13:24:47 -04:00 |
|
SamGondelman
|
4d3b08b5e3
|
modified sword.js to work with vive controllers
|
2015-07-20 14:52:49 -07:00 |
|
Anthony J. Thibault
|
56e7af081e
|
input plugin architecture, fixed sixense
|
2015-07-15 18:50:44 -07:00 |
|
Sam Gondelman
|
81efd99ae4
|
merge with hifi/plugins
|
2015-07-02 10:13:28 -07:00 |
|
Bradley Austin Davis
|
54bbc841e2
|
Working on mac compilability
|
2015-07-01 23:03:33 -07:00 |
|
Brad Davis
|
e421141ec5
|
experimenting with input plugins
|
2015-06-30 09:52:54 -07:00 |
|
Ryan Huffman
|
4df1bea4ec
|
Merge pull request #5167 from SamGondelman/hmdControls
hmdControls.js for movement when wearing an HMD
|
2015-06-24 14:40:31 -07:00 |
|
Brad Davis
|
3231bbba5a
|
Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
interface/src/Application.cpp
|
2015-06-22 09:44:16 -07:00 |
|
bwent
|
c315bcec24
|
Expose mouseDoublePressEvents to js
|
2015-06-19 15:52:27 -07:00 |
|
Sam Gondelman
|
aab8161fa4
|
remove unused function
|
2015-06-18 18:57:04 -07:00 |
|
Brad Davis
|
48b27acc79
|
Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
|
2015-06-18 18:17:59 -07:00 |
|
Sam Gondelman
|
f752534f7c
|
actionEvent signal, captureActions, began work on hmdControls.js
|
2015-06-18 09:52:36 -07:00 |
|
Brad Davis
|
ae1c9603b9
|
Merge remote-tracking branch 'upstream/master' into overlay
|
2015-06-17 15:13:04 -07:00 |
|
Sam Gondelman
|
0157997126
|
fix findDevice
|
2015-06-17 14:42:11 -07:00 |
|
Sam Gondelman
|
17322645f2
|
added mouselook script, reticle and icons need changes
|
2015-06-17 11:17:38 -07:00 |
|
Brad Davis
|
00d8fe75ab
|
Breaking up overlay into rendering and compositing classes
|
2015-06-13 17:36:08 -07:00 |
|
Sam Gondelman
|
b8b61e7c62
|
integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js
|
2015-06-11 15:51:21 -07:00 |
|
Brad Hefta-Gaub
|
24fda9a733
|
Merge pull request #5085 from SamGondelman/master
Exposing Input Key Binding To JavaScript
|
2015-06-11 14:41:34 -07:00 |
|
David Rowe
|
01b1e9c4ed
|
Signal domain changes for those handled by ICE as well as not
|
2015-06-09 12:33:14 -07:00 |
|
Sam Gondelman
|
0769593ca8
|
added getters/setters for Inputs and InputChannels
|
2015-06-09 10:20:36 -07:00 |
|
Sam Gondelman
|
984d449bf9
|
exposed input key bindings to js to enable key remapping
|
2015-06-04 16:29:58 -07:00 |
|
Bradley Austin Davis
|
fc825f6632
|
Fixing the loading of local HTML so it works on both OSX and win32
|
2015-05-13 09:46:24 -07:00 |
|
Brad Davis
|
8c4f802dbf
|
Merge remote-tracking branch 'upstream/master' into web-entity
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
|
2015-05-12 15:56:02 -07:00 |
|
ZappoMan
|
73428ec12d
|
add support to not displace very large clipboards on import
|
2015-05-11 14:21:58 -07:00 |
|