Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 07:45:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
44373 commits 71 branches 56 tags 1.2 GiB
Commit graph

44373 commits

Author SHA1 Message Date
Howard Stearns
86efb3d8bd Merge pull request from hyperlogic/bug-fix/grab-script-search-ray-distance 
Fix for grab script search ray length
 2016-06-24 12:47:31 -07:00
samcake
61f5088ef3 Merge pull request from jherico/qml_window_visibility 
Fix initial visibility of QML windows from scripts
 2016-06-24 12:42:17 -07:00
Brad Hefta-Gaub
1c19d61035 Merge pull request from SamGondelman/macHydrasFix 
Removed Mac Hydra support
 2016-06-24 12:21:13 -07:00
Brad Hefta-Gaub
cea4b27b4d Merge pull request from zzmp/feat/heartbeat-build-version 
add build version to heartbeat
 2016-06-24 12:20:16 -07:00
Brad Hefta-Gaub
4510bb1674 Merge pull request from zzmp/feat/temp-domain-heartbeats 
add heartbeats to metaverse for temporary domains
 2016-06-24 12:08:37 -07:00
Anthony J. Thibault
8bf72f28da Fix for grab script search ray length 2016-06-24 12:06:02 -07:00
Brad Davis
a095da31fd Fix initial visibility of QML windows from scripts 2016-06-24 11:48:55 -07:00
Zach Pomerantz
1fcd7aa0c4 add build version to heartbeat 2016-06-23 19:55:16 -07:00
Zach Pomerantz
b1b378a91f add back access token to domain-server 2016-06-23 19:38:41 -07:00
Zach Pomerantz
13310923c4 reset to temp domain after logout 2016-06-23 19:38:23 -07:00
Zach Pomerantz
1de1c632af use private_description instead of description for domain settings 2016-06-23 17:16:42 -07:00
Brad Hefta-Gaub
da74114b32 Merge pull request 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 from highfidelity/vive-ui 
Vive UI Snapshot
 2016-06-23 10:27:30 -07:00
SamGondelman
645ae3c21e remove tabs 2016-06-22 17:02:02 -07:00
SamGondelman
a9ed0b1c83 completely destroyed sixense on macs 2016-06-22 16:56:50 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -07:00
SamGondelman
f495f5e3b5 removed mac hydra support 2016-06-22 16:05:55 -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 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
Zach Pomerantz
4a30d549ad force temp domain reset on 404 too (401 already) 2016-06-22 12:04:26 -07:00
Zach Pomerantz
a6115cba6e update temporary domains to use api_key 2016-06-22 12:04:26 -07:00
Zach Pomerantz
eebf8e91c6 add api_key to domains/public_key updates 2016-06-22 12:02:35 -07:00
Zach Pomerantz
3a36b0a2e5 add temporary domain info to account info 2016-06-22 12:02:35 -07:00
Zach Pomerantz
b6b73af2b4 Clean up domain-server setup 2016-06-22 12:02:35 -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 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 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 from Atlante45/neuron 
Fix CMake 3.5 issue
 2016-06-21 17:47:24 -07:00
Clément Brisset
fbc5f28e6e Merge pull request 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 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