Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 12:12:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19866 commits 76 branches 59 tags 1.2 GiB
Commit graph

30 commits

Author SHA1 Message Date
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
9348888ae5 map PrioVR to new JoystickScriptingInterface 2014-09-23 17:42:48 -07:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Andrzej Kapolka
b1cfafdbe7 Missed a spot in the TextRenderer conversion. 2014-09-10 23:09:03 -07:00
Andrzej Kapolka
1ef9126482 Migrating to device-independent coordinates. 2014-09-08 13:59:19 -07:00
Andrzej Kapolka
7f6b3d3649 Dimension fixes for Retina displays. 2014-09-05 16:44:45 -07:00
Andrew Meadows
6ffa09f9e6 modified scope of devices stats 2014-07-09 13:58:54 -07:00
Andrew Meadows
c689d826f4 fix for broken windows build with PrioVR libs 
The Model API changed but this code path was not updated.
 2014-06-05 15:48:18 -07:00
Andrew Meadows
30d936c15b getJointPosition -> getJointPositionInWorldFrame 2014-06-04 10:52:10 -07:00
barnold1953
21fb18a92e Fixed SkeletonModel compilation errors with PrioVR 2014-05-28 10:24:50 -07:00
Andrew Meadows
d1a8c18d10 simplified hand index constants 2014-05-27 16:32:29 -07:00
Andrzej Kapolka
956c5d2eb6 More joystick fixes. 2014-05-16 14:24:49 -07:00
Andrzej Kapolka
4314e42116 Merge branch 'priority' of https://github.com/ey6es/hifi into priority 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/PrioVR.h
	interface/src/scripting/ControllerScriptingInterface.cpp
 2014-05-16 12:16:40 -07:00
Andrzej Kapolka
a7234fd8d3 Stuff the joystick and position bits into the palms. 2014-05-16 12:10:21 -07:00
Andrzej Kapolka
c29708f22c Basic joystick integration. 2014-05-15 19:18:19 -07:00
Andrzej Kapolka
946e2b5743 Avoid unused variable warnings in Xcode. 2014-05-15 17:15:25 -07:00
Andrzej Kapolka
8ee2642f0e Fixed compile error. 2014-05-15 12:10:59 -07:00
Andrzej Kapolka
c12f436a7c Try smoothing the PrioVR input over a couple of frames. 2014-05-15 11:47:11 -07:00
Andrzej Kapolka
f28ba72f75 When PrioVR is connected but head rotation is unavailable, use Faceshift 
rotation.
 2014-05-15 11:37:58 -07:00
Andrzej Kapolka
95c05a720d Tabs -> spaces. 2014-05-14 13:48:03 -07:00
Andrzej Kapolka
cf230d1cc3 PrioVR tweaks. 2014-05-14 13:36:26 -07:00
Andrzej Kapolka
eceb600de7 More work on PrioVR integration. 2014-05-13 14:44:24 -07:00
Andrzej Kapolka
0321821b55 More work on PrioVR integration. 2014-05-13 11:38:24 -07:00
Andrzej Kapolka
6c58bec550 Untabbed. 2014-05-12 17:32:06 -07:00
Andrzej Kapolka
52a3c70bf5 Updates to PrioVR interface. 2014-05-12 17:11:02 -07:00
Andrzej Kapolka
e0486b2654 Starting on PrioVR integration. 2014-05-12 15:25:25 -07:00