Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44177 commits 2 branches 0 tags 1.1 GiB
Commit graph

44177 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
284fcc8a0b better check for oculus display in oculus legacy plugin because the sdk is buggy 2016-06-23 13:50:17 -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
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
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
SamGondelman
db8190ad49 fix typo 2016-06-21 16:56:00 -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
SamGondelman
9a17f5b439 update homebrew instructions 2016-06-21 14:12:27 -07:00
Brad Hefta-Gaub
5878927bd0 Merge pull request #8050 from ZappoMan/cleanupPlugins 
Cleanup plugins
 2016-06-21 13:53:22 -07:00
Brad Hefta-Gaub
c18f5e19f5 Merge pull request #8090 from zzmp/doc/metadata-script 
add example script for metadata from metaverse
 2016-06-21 13:42:10 -07:00
Ryan Huffman
0ea9c5c26d Fix getMemoryInfo not returning false on non-Windows 2016-06-21 13:32:17 -07:00
Ryan Huffman
251e2137d3 Remove old use of connectedDevice 2016-06-21 13:31:10 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -07:00
Zach Pomerantz
c8ead2ad04 conform to coding braces standard 2016-06-21 13:28:15 -07:00
Brad Hefta-Gaub
5dcf5031a3 Merge pull request #8111 from zzmp/feat/domain-hours-metadata 
add operating hours to domain
 2016-06-21 13:14:13 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Zach Pomerantz
c784fa42e9 log failure to fetch metadata 2016-06-21 11:34:23 -07:00
Brad Davis
ec87e2fe90 Merge pull request #8107 from zzmp/fix/metadata-tags-hosts-restrictions 
fix metadata tags, hosts, restriction
 2016-06-21 11:33:32 -07:00
Zach Pomerantz
52170eb12e use refs for domain metadata parsing 2016-06-21 11:21:20 -07:00
Ryan Huffman
6d753e317b Fix more osx warning 2016-06-21 10:51:31 -07:00
Andrew Meadows
31706a3909 force activate kinmatic objects when necessary 2016-06-21 10:38:44 -07:00
samcake
117a39d52a Merge pull request #8103 from SamGondelman/compileShaderFix 
Reduce GLShader::compileShader log spam
 2016-06-21 10:30:05 -07:00
Ryan Huffman
a77dea9048 Fix osx warning 2016-06-21 10:30:05 -07:00
Zach Pomerantz
807596596f fix badging, parsing of operating hours 2016-06-21 00:18:38 -07:00
Zach Pomerantz
7fa7abdb1d add operating hours to domain-server settings/UI 2016-06-20 22:58:20 -07:00
Ryan Huffman
cee897d6d3 Fix osx warning 2016-06-20 16:44:07 -07:00
Zach Pomerantz
4e0aeea2b8 add time offset to domain-server UI 2016-06-20 16:19:19 -07:00
Ryan Huffman
154ccb8932 Add glVersionToInteger to GLHelpers 2016-06-20 16:10:07 -07:00
Ryan Huffman
ab057010d6 Add changed display mode tracking 2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd Cleanup nearby avatar tracking 2016-06-20 16:09:17 -07:00
Ryan Huffman
3aac0cc4fb Update fps useractivity with more general stats 2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a Add more values to launch UserActivity 2016-06-20 16:02:14 -07:00
Ryan Huffman
0393777b03 Add getMemoryInfo helper function 2016-06-20 16:01:44 -07:00