Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 02:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34222 commits 75 branches 59 tags 1.2 GiB
Commit graph

14600 commits

Author SHA1 Message Date
Clément Brisset
c63fc8557c More baseball test code 2015-11-03 11:14:59 -08:00
Clément Brisset
40ce2416e8 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:13:57 -08:00
Ryan Huffman
03a338dfe6 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-03 11:13:56 -08:00
Stephen Birarda
8cd41b9383 resolve conflicts on merge with huffman/baseball 2015-11-03 11:13:15 -08:00
Ryan Huffman
55789fed99 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:11:26 -08:00
Ryan Huffman
67b43cafc1 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:10:47 -08:00
Ryan Huffman
ccb25f4b63 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:10:45 -08:00
Ryan Huffman
afffe7f5c6 Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-03 11:10:14 -08:00
Atlante45
f2ff0b40f7 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 11:06:19 -08:00
Clément Brisset
31d92fd90a Baseball test code 2015-11-03 11:00:35 -08:00
James B. Pollack
be33b40ced Merge pull request #6287 from jherico/homer 
Removing iviewhmd due to broken production builds
 2015-11-02 23:56:26 -08:00
Brad Davis
eeabc9b093 Removing iviewhmd due to broken production builds 2015-11-02 23:49:03 -08:00
Brad Davis
764ecba2a8 Adding diagnostics to track down the 'black rectangles of death' 2015-11-02 21:55:35 -08:00
Brad Davis
699a13b2a7 Merge pull request #6275 from ZappoMan/mappingTweaks 
Mapping tweaks to match Controllers spec
 2015-11-02 16:06:08 -08:00
Seth Alves
310a5c9bfb don't initialize SMI sdk unless we need it 2015-11-02 13:42:12 -08:00
Brad Hefta-Gaub
d359aa3b65 more tweaks 2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub
46bedf7667 more tweaks to hydra mappings 2015-11-02 13:35:49 -08:00
Anthony J. Thibault
2236573a9d Merge branch 'master' into tony/anim-sync-blend 2015-11-02 12:18:11 -08:00
Stephen Birarda
017cee6961 make shouldRenderLocally do the right thing 2015-11-02 11:59:09 -08:00
U-GAPOS\andrew
a77f888f15 more correct HMD offset correction velocity 2015-11-02 11:29:17 -08:00
U-GAPOS\andrew
a545d770d8 fix bug preventing avatar motion in 2D mode 2015-11-02 11:07:43 -08:00
Andrew Meadows
9799693135 remove extra whitespace 2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52 route HMD-following through the physics simulation 2015-11-02 11:07:40 -08:00
Brad Hefta-Gaub
b00f572e1a add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag 2015-11-02 09:21:15 -08:00
Anthony J. Thibault
e3e759248f Merge branch 'master' into tony/anim-sync-blend 2015-11-02 08:37:10 -08:00
Brad Hefta-Gaub
70b9aa5ff1 remove right click context menu until we can make it work with camera move better 2015-11-02 07:42:52 -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
77816d818a make RY map to jump 2015-10-31 16:00:22 -07: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
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
Anthony J. Thibault
085282db4f Crash fix for AvatarManager when iterating over _avatarHash 
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID().  When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d) will *insert*
an empty smart_ptr into the hash.
 2015-10-30 16:13:04 -07:00
Brad Hefta-Gaub
22324eb281 more tweaking of keyboard input routes 2015-10-30 14:55:33 -07:00
Andrew Meadows
f652e983a9 flag kinematic objs when changed in stepSimulation() 2015-10-30 14:53:29 -07:00
Brad Hefta-Gaub
ce7fed2292 fix json 2015-10-30 13:16:31 -07:00
Brad Hefta-Gaub
8839458d54 Merge pull request #6242 from highfidelity/controllers 
New Controller interfaces/api
 2015-10-30 12:47:51 -07:00
Seth Alves
93503d0a21 make kinematic grab set entities kinematic in bullet and update entity position 2015-10-30 11:03:13 -07:00
Anthony Thibault
fcfb44207f Merge pull request #6097 from howard-stearns/expose-anim-vars 
Expose animation vars to Javascript
 2015-10-30 10:50:42 -07:00
Brad Hefta-Gaub
b2f27054f4 Merge pull request #6239 from AlessandroSigna/controllers 
ViveController - input mapping
 2015-10-30 10:39:26 -07:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Brad Hefta-Gaub
70f3156328 make sure CompositeEndpoints properly report readability more axis based keyboard inputs 2015-10-29 22:37:12 -07:00
Brad Hefta-Gaub
8a03383adc use makeAxis for some keyboard support 2015-10-29 22:19:33 -07:00
AlessandroSigna
01d3805148 ViveController - mapping of buttons 2015-10-29 18:44:43 -07:00
Anthony J. Thibault
047614b2eb New left and right grab animations. 2015-10-29 16:18:39 -07:00
Brad Hefta-Gaub
b070306c2c tweak comfort mode filters 2015-10-29 15:53:17 -07:00
Brad Hefta-Gaub
c962697b18 Merge pull request #6230 from samcake/controllers 
Controllers : Comfort mode is working through the stanadrd mapping
 2015-10-29 14:59:42 -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