Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 04:55:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
44373 commits 71 branches 56 tags 1.2 GiB
Commit graph

44373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Triplelexx
aae3555b63 update TouchscreenDevice 
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
 2016-06-27 21:01:06 +01:00
Triplelexx
90cd335bda missed a brace 2016-06-24 10:48:25 +01:00
Triplelexx
8928854820 lost change 2016-06-24 05:20:47 +01:00
Triplelexx
6542604d13 resolve conflicts with TouchscreenDevice 
updated to master
 2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4 
support btBvhTriangleMeshShape for static mesh entities
 2016-06-23 12:17:32 -07:00
Andrew Meadows
1d8d1240ca remove override to avoid new Jenkins OSX warnings 2016-06-23 10:38:46 -07:00
Howard Stearns
64771428ec Merge pull request #8068 from highfidelity/vive-ui 
Vive UI Snapshot
 2016-06-23 10:27:30 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
Andrew Meadows
e5b89ebd17 bump version number 2016-06-22 15:33:44 -07:00
Andrew Meadows
8009d23f70 more STATIC_MESH and dynamic overlap prevention 2016-06-22 15:20:45 -07:00
howard-stearns
dc34181032 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 13:04:21 -07:00
howard-stearns
d3735322a5 Whitespace. 2016-06-22 13:03:13 -07:00
Brad Hefta-Gaub
a48cce2975 Merge pull request #8084 from huffman/feat/user-actions 
Add client-side session id generation and new user activities
 2016-06-22 12:36:18 -07:00
Ryan Huffman
9ff742c97c Fix typo 2016-06-22 12:09:12 -07:00
Ryan Huffman
2233b5ba64 Add user activity tracking for OculusLegacyDisplayPlugin 2016-06-22 11:57:41 -07:00
Howard Stearns
af0335496e Merge pull request #8120 from howard-stearns/aim-reticle-at-head 
aim reticle at head
 2016-06-22 10:45:49 -07:00
howard-stearns
e4dbb5e61a Make mouse reticle be perpendicular to head. 2016-06-22 09:57:38 -07:00
Andrew Meadows
e88b264864 revert compound hull shape generation 2016-06-22 09:30:44 -07:00
Stephen Birarda
18e4c3b94c Merge pull request #8119 from zzmp/fix/domain-hours-metadata-format 
reformat operating hours to [[open,close]]
 2016-06-22 09:30:12 -07:00
Ryan Huffman
2621add8e3 Fix nearby_avatars not tracking 2016-06-22 09:17:28 -07:00
Ryan Huffman
847685d224 Add tracking of away.js 2016-06-22 09:06:59 -07:00
Ryan Huffman
23f57367e3 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-22 08:55:22 -07:00
Ryan Huffman
890de1bfea Add went-to user activity back in 2016-06-22 08:54:58 -07:00
Ryan Huffman
1be30ccce9 Fix enabled_edit firing on disable 2016-06-22 08:24:50 -07:00
Ryan Huffman
a7f30ced29 Fix infinite recursion in PluginManager 2016-06-21 21:39:40 -07:00
Clément Brisset
dfc84b5e6d Merge pull request #8117 from Atlante45/neuron 
Fix CMake 3.5 issue
 2016-06-21 17:47:24 -07:00
Clément Brisset
fbc5f28e6e Merge pull request #8115 from SamGondelman/updateBuildOSX 
Update BUILD_OSX.md instructions for OpenSSL and Qt paths
 2016-06-21 17:47:05 -07:00
Howard Stearns
a1844d8c19 Fix plugin include. (How did this build for me locally?) 2016-06-21 17:36:41 -07:00
Atlante45
89c50ab3df Update neuron archive in cmakelists 2016-06-21 17:23:08 -07:00
Zach Pomerantz
e03974181a reformat operating hours to [[open,close]] 2016-06-21 17:19:37 -07:00
howard-stearns
223f9bda2e gratuitous change to force things. 2016-06-21 17:03:49 -07:00
howard-stearns
baa9139881 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 17:02:23 -07:00
Howard Stearns
c600b65f45 Merge pull request #8114 from jherico/vive-keyboard 
Don't trigger keyboard on revealing the overlay layer
 2016-06-21 17:00:36 -07:00
SamGondelman
db8190ad49 fix typo 2016-06-21 16:56:00 -07:00
howard-stearns
d6095d1f11 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 16:52:22 -07:00
Howard Stearns
3879312968 Merge pull request #8116 from ZappoMan/cleanupPlugins 
remove dead refereince to PluginContainer.h from space mouse
 2016-06-21 16:51:06 -07:00
Ryan Huffman
4e52521f8c Update UserActivityLogger device blacklist 2016-06-21 16:43:16 -07:00
Ryan Huffman
310adb0f45 Update spacemouse deviceConnected implementation 2016-06-21 16:42:39 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
da71fcb57f Update connected device detection implementation 2016-06-21 16:37:58 -07:00
Brad Hefta-Gaub
d9e8026cd6 Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion 
fix setting velocity of inactive kinematic RigidBody
 2016-06-21 16:32:04 -07:00
Brad Hefta-Gaub
f2f7e21eaf remove dead refereince to PluginContainer.h from space mouse 2016-06-21 16:17:43 -07:00
Brad Davis
f3bad3a63b Don't trigger keyboard on revealing the overlay layer 2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
SamGondelman
9a17f5b439 update homebrew instructions 2016-06-21 14:12:27 -07:00
Andrew Meadows
702e83ba6a prevent incompatible entity properties combos 2016-06-21 14:03:21 -07:00
Andrew Meadows
4c9ec7ca43 protect physics against bad entity properties 2016-06-21 13:55:11 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00