Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-08 10:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44397 commits 25 branches 28 tags 1.2 GiB
Commit graph

44397 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
dc07368dc9 Hide users list when logged out 2016-06-25 14:23:35 +12:00
David Rowe
0b6797acc3 Fix "show me" and "visible to" in users window not being remembered 2016-06-25 13:48:43 +12:00
David Rowe
8b0f59c9cf Fix users window minimized state not being remembered 2016-06-25 13:12:16 +12:00
David Rowe
1c1d81ae25 Fix missing users.js menu item 2016-06-25 12:18:03 +12:00
David Rowe
8a5369fcb1 Undo hide users.js when logged out 2016-06-25 12:03:36 +12:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd 
Automatically enter first person when in HMD mode
 2016-06-24 15:58:38 -07:00
Ken Cooke
36ebe4a4f6 Merge pull request #8125 from ZappoMan/simplifyResamplerUse 
cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler
 2016-06-24 15:43:04 -07:00
Brad Hefta-Gaub
2e8f6c2cc6 Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject 
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
 2016-06-24 14:08:29 -07:00
Zander Otavka
dd023e16fd Tabs -> spaces 2016-06-24 13:16:24 -07:00
Howard Stearns
c4398c3950 Merge pull request #8129 from ZappoMan/reduceLogSpam 
reduce log spam in Vive plugins
 2016-06-24 13:00:13 -07:00
Howard Stearns
86efb3d8bd Merge pull request #8131 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 #8130 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 #8122 from SamGondelman/macHydrasFix 
Removed Mac Hydra support
 2016-06-24 12:21:13 -07:00
Brad Hefta-Gaub
cea4b27b4d Merge pull request #8128 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 #8098 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
Zander Otavka
0c56af7ae8 Add default script to enter first person for HMD 2016-06-24 11:57:50 -07:00
Zander Otavka
d45694836f Add signal for display mode change in HMD 2016-06-24 11:57:12 -07:00
Brad Davis
a095da31fd Fix initial visibility of QML windows from scripts 2016-06-24 11:48:55 -07:00
Brad Hefta-Gaub
39ff03cfb5 reduce log spam in Vive plugins 2016-06-24 10:53:46 -07:00
Zander Otavka
41d38ab630 Revert "Automatically enter first person when in HMD mode" 
This reverts commit 3c9f3f3927.
 2016-06-24 10:16:40 -07:00
Zander Otavka
88ad570024 Revert "Uses spaces, not tabs" 
This reverts commit 7e5b9db13a.
 2016-06-24 10:16:26 -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
Seth Alves
2fd38c1585 when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree 2016-06-23 13:10:15 -07: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
Brad Hefta-Gaub
6111e4952a fix comments 2016-06-23 10:59:26 -07:00
Andrew Meadows
1d8d1240ca remove override to avoid new Jenkins OSX warnings 2016-06-23 10:38:46 -07:00
Seth Alves
03b55e6a64 Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-23 10:33:31 -07:00
Brad Hefta-Gaub
c0be9aec6a cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler 2016-06-23 10:28:29 -07:00
Howard Stearns
64771428ec Merge pull request #8068 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
Zander Otavka
7e5b9db13a Uses spaces, not tabs 2016-06-22 16:50:47 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -07:00
Zander Otavka
3c9f3f3927 Automatically enter first person when in HMD mode 2016-06-22 16:22:14 -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 #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
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