Stephen Birarda
d932ba74fd
remove the avatar kill packet from Interface
2015-11-12 17:58:12 -08:00
Stephen Birarda
6b2987eef8
handle domain server node removal in NodeList
2015-11-12 17:47:51 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
AlessandroSigna
fdd4a55057
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 12:47:04 -08:00
AlessandroSigna
6d3a79af83
changed the behaviour of Standard.LY input
2015-11-06 12:46:08 -08:00
Atlante45
c53c0ec53f
Fix double delete on shutdown
2015-11-06 11:13:10 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
Anthony J. Thibault
69f1cfbcb9
Fixes for Mac build and crash on startup
...
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.
In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized. To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
2015-11-04 12:04:34 -08:00
EdgarPironti
2a84cadd5d
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 18:22:29 -08:00
Anthony J. Thibault
31f361d49c
Moved fps timing to beginning of paintGL
...
This should improve accuracy.
However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
2015-11-03 15:51:18 -08:00
Anthony J. Thibault
c139b62217
fps calculation now based on moving average
...
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
2015-11-03 11:19:49 -08:00
EdgarPironti
603405ad61
Do not merge - Spacemouse
2015-11-02 23:29:15 -08:00
Anthony J. Thibault
0c12bb5a4e
Remove idleTimer and call idle directly from paintGL.
2015-11-02 18:47:18 -08:00
Brad Hefta-Gaub
9c23f2551d
Merge pull request #6207 from jherico/pluginSupport
...
Support for runtime plugins (DLLs)
2015-11-01 14:57:13 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
e899229cde
tweaks to how VrMenu is shown
2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
05dea847be
add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu
2015-10-31 15:47:40 -07:00
samcake
f72146c35d
FIxing the mac build
2015-10-29 14:17:52 -07:00
samcake
d73eafddd1
COmfort mode working with the COntroller system observing the menu state
2015-10-29 13:48:16 -07:00
samcake
e902e5e97a
Introduce the concept of loading the default Mapping
2015-10-29 13:05:29 -07:00
Brad Davis
c4e82a85d9
Remove DeviceProxy in favor of InputDevice
2015-10-29 09:32:56 -07:00
Brad Davis
570b4a32da
Merge pull request #6206 from samcake/controllers
...
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
samcake
bbc6d9f5e7
Fixing typo and review comments
2015-10-28 12:52:21 -07:00
samcake
b37a6f689a
Fixing typo and review comments
2015-10-28 12:51:22 -07:00
samcake
fc15c7cd98
Adding the ApplicationStateDevice to the APplication class and add one entry ythere
2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
731fab6ffc
Merge pull request #6196 from jherico/gl
...
Move GL utilities to their own library
2015-10-28 12:10:52 -07:00
samcake
57aa89d14f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 09:24:24 -07:00
samcake
92ca658aae
Trying to get a state controller to work
2015-10-28 09:23:20 -07:00
samcake
6ec87086bc
Adding the state controller
2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
19743c1f39
gak, build busters and more CR feedback
2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
133d48ebee
CR feedback
2015-10-27 15:53:48 -07:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
Brad Hefta-Gaub
5a42991e0c
first pass at cleaning up MyAvatars use of PalmData
2015-10-27 13:51:42 -07:00
Andrew Meadows
a1f1e50431
split CharacterController btw phys and interface
2015-10-27 13:15:38 -07:00
samcake
87cf3b237b
Supporting a InHMD action and using it to enable COmfort mode
2015-10-27 09:59:22 -07:00
Brad Davis
e8be92cab8
Adding input action event
2015-10-23 13:36:06 -07:00
Brad Davis
afcec347ff
Wiring yaw action to avatar
2015-10-21 21:35:19 -07:00
Brad Davis
044a28212d
Wiring step yaw to the avatar
2015-10-21 20:44:38 -07:00
Brad Davis
a124d3b433
Moving to InputEndpoint, fixing build problem
2015-10-20 22:00:16 -07:00
samcake
da55011c2a
Trying to merge
2015-10-20 16:38:41 -07:00
Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
a8e707ced2
Correcting update order to fix mouse
2015-10-18 22:46:14 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
samcake
f0034844e7
Actions working from the Controller layer
2015-10-16 12:24:12 -07:00
Brad Davis
80c962a4cc
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-15 12:27:53 -07:00
Andrew Meadows
2ae62de84e
Merge pull request #6026 from birarda/qt-polling-env
...
set bearer poll timeout env for wlan scan in Qt 5.5
2015-10-15 09:58:32 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
